[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
ddkilzer at apple.com
ddkilzer at apple.com
Wed Dec 22 14:54:18 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit cd2726d2dc121a105dd254971cab8c3dd7b43435
Author: ddkilzer at apple.com <ddkilzer at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Sat Oct 23 23:21:19 2010 +0000
2010-10-23 David Kilzer <ddkilzer at apple.com>
<http://webkit.org/b/48186> Remove unneeded WebHTMLRepresentationInternal.h header
Reviewed by Sam Weinig.
The only method defined in WebHTMLRepresentationInternal.h is
also defined in WebHTMLRepresentation.h, so use that instead.
* WebKit.xcodeproj/project.pbxproj: Removed references to
WebHTMLRepresentationInternal.h.
2010-10-23 David Kilzer <ddkilzer at apple.com>
<http://webkit.org/b/48186> Remove unneeded WebHTMLRepresentationInternal.h header
Reviewed by Sam Weinig.
The only method defined in WebHTMLRepresentationInternal.h is
also defined in WebHTMLRepresentation.h, so use that instead.
* WebView/WebHTMLRepresentationInternal.h: Removed.
2010-10-23 David Kilzer <ddkilzer at apple.com>
<http://webkit.org/b/48186> Remove unneeded WebHTMLRepresentationInternal.h header
Reviewed by Sam Weinig.
The only method defined in WebHTMLRepresentationInternal.h is
also defined in WebHTMLRepresentation.h, so use that instead.
* DumpRenderTree/mac/InternalHeaders/WebKit/WebHTMLRepresentationInternal.h: Removed.
* DumpRenderTree/mac/WebArchiveDumpSupport.mm: Switched to use
WebHTMLRepresentation.h.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70403 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3c91150..be05800 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-23 David Kilzer <ddkilzer at apple.com>
+
+ <http://webkit.org/b/48186> Remove unneeded WebHTMLRepresentationInternal.h header
+
+ Reviewed by Sam Weinig.
+
+ The only method defined in WebHTMLRepresentationInternal.h is
+ also defined in WebHTMLRepresentation.h, so use that instead.
+
+ * WebKit.xcodeproj/project.pbxproj: Removed references to
+ WebHTMLRepresentationInternal.h.
+
2010-10-21 David Kilzer <ddkilzer at apple.com>
<http://webkit.org/b/48047> Fix warnings found by check-Xcode-source-file-types
diff --git a/WebKit/WebKit.xcodeproj/project.pbxproj b/WebKit/WebKit.xcodeproj/project.pbxproj
index 5b37ce2..be3caeb 100644
--- a/WebKit/WebKit.xcodeproj/project.pbxproj
+++ b/WebKit/WebKit.xcodeproj/project.pbxproj
@@ -87,7 +87,6 @@
37D1DCA91065928C0068F7EF /* WebJSPDFDoc.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37D1DCA71065928C0068F7EF /* WebJSPDFDoc.mm */; };
41F4484F10338E8C0030E55E /* WebWorkersPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 41F4484D10338E8C0030E55E /* WebWorkersPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
41F4485010338E8C0030E55E /* WebWorkersPrivate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 41F4484E10338E8C0030E55E /* WebWorkersPrivate.mm */; };
- 441793A60E34EE150055E1AE /* WebHTMLRepresentationInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 441793A50E34EE150055E1AE /* WebHTMLRepresentationInternal.h */; };
44BB8B141241A022001E3A22 /* WebArchiveInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 44BB8B131241A022001E3A22 /* WebArchiveInternal.h */; };
4BF99F900AE050BC00815C2B /* WebEditorClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 4BF99F8E0AE050BC00815C2B /* WebEditorClient.h */; settings = {ATTRIBUTES = (); }; };
4BF99F910AE050BC00815C2B /* WebEditorClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4BF99F8F0AE050BC00815C2B /* WebEditorClient.mm */; };
@@ -485,7 +484,6 @@
39446080020F50ED0ECA1767 /* WebHistoryItem.mm */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebHistoryItem.mm; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
41F4484D10338E8C0030E55E /* WebWorkersPrivate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebWorkersPrivate.h; path = mac/Workers/WebWorkersPrivate.h; sourceTree = "<group>"; };
41F4484E10338E8C0030E55E /* WebWorkersPrivate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebWorkersPrivate.mm; path = mac/Workers/WebWorkersPrivate.mm; sourceTree = "<group>"; };
- 441793A50E34EE150055E1AE /* WebHTMLRepresentationInternal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebHTMLRepresentationInternal.h; sourceTree = "<group>"; };
449098B90F8F82DF0076A327 /* FeatureDefines.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = FeatureDefines.xcconfig; sourceTree = "<group>"; };
44BB8B131241A022001E3A22 /* WebArchiveInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebArchiveInternal.h; sourceTree = "<group>"; };
4BF99F8E0AE050BC00815C2B /* WebEditorClient.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = WebEditorClient.h; sourceTree = "<group>"; };
@@ -1253,7 +1251,6 @@
children = (
35081D9202B6D4D80ACA2ACA /* WebHTMLRepresentation.h */,
35081D9302B6D4D80ACA2ACA /* WebHTMLRepresentation.mm */,
- 441793A50E34EE150055E1AE /* WebHTMLRepresentationInternal.h */,
F5A55DC702BAA2E8018635CC /* WebHTMLRepresentationPrivate.h */,
35081D9402B6D4D80ACA2ACA /* WebHTMLView.h */,
35081D9502B6D4D80ACA2ACA /* WebHTMLView.mm */,
@@ -1495,7 +1492,6 @@
939810140824BF01008DF038 /* WebHistoryPrivate.h in Headers */,
1AAF5FBF0EDE3A92008D883D /* WebHostedNetscapePluginView.h in Headers */,
939810550824BF01008DF038 /* WebHTMLRepresentation.h in Headers */,
- 441793A60E34EE150055E1AE /* WebHTMLRepresentationInternal.h in Headers */,
939810560824BF01008DF038 /* WebHTMLRepresentationPrivate.h in Headers */,
939810570824BF01008DF038 /* WebHTMLView.h in Headers */,
939810A10824BF01008DF038 /* WebHTMLViewInternal.h in Headers */,
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index e33dbb3..5f4902e 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-23 David Kilzer <ddkilzer at apple.com>
+
+ <http://webkit.org/b/48186> Remove unneeded WebHTMLRepresentationInternal.h header
+
+ Reviewed by Sam Weinig.
+
+ The only method defined in WebHTMLRepresentationInternal.h is
+ also defined in WebHTMLRepresentation.h, so use that instead.
+
+ * WebView/WebHTMLRepresentationInternal.h: Removed.
+
2010-10-23 Alexey Proskuryakov <ap at apple.com>
Reviewed by Anders Carlsson.
diff --git a/WebKit/mac/WebView/WebHTMLRepresentationInternal.h b/WebKit/mac/WebView/WebHTMLRepresentationInternal.h
deleted file mode 100644
index d42b400..0000000
--- a/WebKit/mac/WebView/WebHTMLRepresentationInternal.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright (C) 2008 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
- * its contributors may be used to endorse or promote products derived
- * from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL APPLE OR ITS CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#import <WebKit/WebHTMLRepresentationPrivate.h>
-
- at interface WebHTMLRepresentation (WebInternal)
-+ (NSArray *)supportedNonImageMIMETypes;
- at end
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index d2dd6cd..67a1cee 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-23 David Kilzer <ddkilzer at apple.com>
+
+ <http://webkit.org/b/48186> Remove unneeded WebHTMLRepresentationInternal.h header
+
+ Reviewed by Sam Weinig.
+
+ The only method defined in WebHTMLRepresentationInternal.h is
+ also defined in WebHTMLRepresentation.h, so use that instead.
+
+ * DumpRenderTree/mac/InternalHeaders/WebKit/WebHTMLRepresentationInternal.h: Removed.
+ * DumpRenderTree/mac/WebArchiveDumpSupport.mm: Switched to use
+ WebHTMLRepresentation.h.
+
2010-10-23 Sheriff Bot <webkit.review.bot at gmail.com>
Unreviewed, rolling out r70367.
diff --git a/WebKitTools/DumpRenderTree/mac/InternalHeaders/WebKit/WebHTMLRepresentationInternal.h b/WebKitTools/DumpRenderTree/mac/InternalHeaders/WebKit/WebHTMLRepresentationInternal.h
deleted file mode 100644
index b3d421d..0000000
--- a/WebKitTools/DumpRenderTree/mac/InternalHeaders/WebKit/WebHTMLRepresentationInternal.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../../../WebKit/mac/WebView/WebHTMLRepresentationInternal.h"
diff --git a/WebKitTools/DumpRenderTree/mac/WebArchiveDumpSupport.mm b/WebKitTools/DumpRenderTree/mac/WebArchiveDumpSupport.mm
index 7c52c6a..6d8e17a 100644
--- a/WebKitTools/DumpRenderTree/mac/WebArchiveDumpSupport.mm
+++ b/WebKitTools/DumpRenderTree/mac/WebArchiveDumpSupport.mm
@@ -27,7 +27,7 @@
#import <Foundation/Foundation.h>
#import <WebKit/WebArchive.h>
-#import <WebKit/WebHTMLRepresentationInternal.h>
+#import <WebKit/WebHTMLRepresentation.h>
static void convertMIMEType(NSMutableString *mimeType)
{
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list