[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
mrowe at apple.com
mrowe at apple.com
Thu Apr 8 02:13:12 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit d48fd2e52a4e89bb66fbe4b325ce55a15a38d966
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Mar 8 01:52:22 2010 +0000
Remove unnecessary includes from header files, adding them to the handful of implementation files that need them.
Rubber-stamped by Cameron Zwarich.
WebCore:
* bindings/objc/DOM.mm:
* loader/CachedImage.h:
* loader/EmptyClients.h:
* platform/graphics/GlyphPageTreeNode.cpp:
* platform/text/CString.h:
* platform/text/String.cpp:
* platform/text/mac/TextCodecMac.cpp:
* svg/graphics/SVGResourceFilter.h:
* svg/graphics/filters/SVGFEImage.h:
WebKit/mac:
* Misc/WebNSPasteboardExtras.mm:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55639 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0a37b65..b12f2e6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,5 +1,21 @@
2010-03-07 Mark Rowe <mrowe at apple.com>
+ Rubber-stamped by Cameron Zwarich.
+
+ Remove unnecessary includes from header files, adding them to the handful of implementation files that need them.
+
+ * bindings/objc/DOM.mm:
+ * loader/CachedImage.h:
+ * loader/EmptyClients.h:
+ * platform/graphics/GlyphPageTreeNode.cpp:
+ * platform/text/CString.h:
+ * platform/text/String.cpp:
+ * platform/text/mac/TextCodecMac.cpp:
+ * svg/graphics/SVGResourceFilter.h:
+ * svg/graphics/filters/SVGFEImage.h:
+
+2010-03-07 Mark Rowe <mrowe at apple.com>
+
Completely remove two files that were deleted in r55635 from the Xcode project.
* WebCore.xcodeproj/project.pbxproj:
diff --git a/WebCore/bindings/objc/DOM.mm b/WebCore/bindings/objc/DOM.mm
index 907961f..378efe2 100644
--- a/WebCore/bindings/objc/DOM.mm
+++ b/WebCore/bindings/objc/DOM.mm
@@ -37,6 +37,7 @@
#import "Frame.h"
#import "HTMLElement.h"
#import "HTMLNames.h"
+#import "Image.h"
#import "NodeFilter.h"
#import "RenderImage.h"
#import "WebScriptObjectPrivate.h"
diff --git a/WebCore/loader/CachedImage.h b/WebCore/loader/CachedImage.h
index 2aa35ac..cda03a2 100644
--- a/WebCore/loader/CachedImage.h
+++ b/WebCore/loader/CachedImage.h
@@ -25,7 +25,6 @@
#include "CachedResource.h"
#include "ImageObserver.h"
-#include "Image.h"
#include "IntRect.h"
#include "Timer.h"
#include <wtf/Vector.h>
diff --git a/WebCore/loader/EmptyClients.h b/WebCore/loader/EmptyClients.h
index 2f9a267..433ad56 100644
--- a/WebCore/loader/EmptyClients.h
+++ b/WebCore/loader/EmptyClients.h
@@ -36,12 +36,10 @@
#include "EditorClient.h"
#include "FloatRect.h"
#include "FocusDirection.h"
-#include "FormState.h"
#include "FrameLoaderClient.h"
#include "InspectorClient.h"
#include "PluginHalterClient.h"
#include "ResourceError.h"
-#include "SharedBuffer.h"
/*
This file holds empty Client stubs for use by WebCore.
diff --git a/WebCore/platform/graphics/GlyphPageTreeNode.cpp b/WebCore/platform/graphics/GlyphPageTreeNode.cpp
index b19cbca..99df92b 100644
--- a/WebCore/platform/graphics/GlyphPageTreeNode.cpp
+++ b/WebCore/platform/graphics/GlyphPageTreeNode.cpp
@@ -31,6 +31,7 @@
#include "CString.h"
#include "CharacterNames.h"
+#include "PlatformString.h"
#include "SegmentedFontData.h"
#include "SimpleFontData.h"
#include <stdio.h>
diff --git a/WebCore/platform/text/CString.h b/WebCore/platform/text/CString.h
index b9030d6..48e5c69 100644
--- a/WebCore/platform/text/CString.h
+++ b/WebCore/platform/text/CString.h
@@ -20,14 +20,12 @@
* 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.
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef CString_h
#define CString_h
-#include "SharedBuffer.h"
-
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/Vector.h>
@@ -38,7 +36,7 @@ namespace WebCore {
public:
const char* data() { return m_vector.data(); }
size_t length() { return m_vector.size(); }
-
+
private:
friend class CString;
diff --git a/WebCore/platform/text/String.cpp b/WebCore/platform/text/String.cpp
index 04b04ab..4f4e385 100644
--- a/WebCore/platform/text/String.cpp
+++ b/WebCore/platform/text/String.cpp
@@ -24,17 +24,18 @@
#include "CString.h"
#include "FloatConversion.h"
+#include "SharedBuffer.h"
#include "StringBuffer.h"
#include "TextBreakIterator.h"
#include "TextEncoding.h"
-#include <wtf/dtoa.h>
#include <limits>
#include <stdarg.h>
#include <wtf/ASCIICType.h>
#include <wtf/StringExtras.h>
#include <wtf/Vector.h>
-#include <wtf/unicode/Unicode.h>
+#include <wtf/dtoa.h>
#include <wtf/unicode/UTF8.h>
+#include <wtf/unicode/Unicode.h>
#if USE(JSC)
#include <runtime/Identifier.h>
diff --git a/WebCore/platform/text/mac/TextCodecMac.cpp b/WebCore/platform/text/mac/TextCodecMac.cpp
index a1750c9..7a1ad62 100644
--- a/WebCore/platform/text/mac/TextCodecMac.cpp
+++ b/WebCore/platform/text/mac/TextCodecMac.cpp
@@ -34,6 +34,7 @@
#include "ThreadGlobalData.h"
#include <wtf/Assertions.h>
#include <wtf/PassOwnPtr.h>
+#include <wtf/RetainPtr.h>
#include <wtf/Threading.h>
using namespace std;
diff --git a/WebCore/svg/graphics/SVGResourceFilter.h b/WebCore/svg/graphics/SVGResourceFilter.h
index ee8627c..f0db92b 100644
--- a/WebCore/svg/graphics/SVGResourceFilter.h
+++ b/WebCore/svg/graphics/SVGResourceFilter.h
@@ -26,8 +26,6 @@
#if ENABLE(SVG) && ENABLE(FILTERS)
#include "SVGResource.h"
-#include "Image.h"
-#include "ImageBuffer.h"
#include "FloatRect.h"
#include "RenderObject.h"
#include "SVGFilterPrimitiveStandardAttributes.h"
diff --git a/WebCore/svg/graphics/filters/SVGFEImage.h b/WebCore/svg/graphics/filters/SVGFEImage.h
index 0883aad..01e9522 100644
--- a/WebCore/svg/graphics/filters/SVGFEImage.h
+++ b/WebCore/svg/graphics/filters/SVGFEImage.h
@@ -24,9 +24,7 @@
#define SVGFEImage_h
#if ENABLE(SVG) && ENABLE(FILTERS)
-#include "Image.h"
#include "FilterEffect.h"
-#include "Filter.h"
#include "SVGPreserveAspectRatio.h"
namespace WebCore {
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index ff920ab..45e0cb2 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-07 Mark Rowe <mrowe at apple.com>
+
+ Rubber-stamped by Cameron Zwarich.
+
+ Remove unnecessary includes from header files, adding them to the handful of implementation files that need them.
+
+ * Misc/WebNSPasteboardExtras.mm:
+
2010-03-04 Mark Rowe <mrowe at apple.com>
Reviewed by Sam Weinig.
diff --git a/WebKit/mac/Misc/WebNSPasteboardExtras.mm b/WebKit/mac/Misc/WebNSPasteboardExtras.mm
index 3cc1c7c..8cebeb6 100644
--- a/WebKit/mac/Misc/WebNSPasteboardExtras.mm
+++ b/WebKit/mac/Misc/WebNSPasteboardExtras.mm
@@ -37,14 +37,15 @@
#import "WebURLsWithTitles.h"
#import "WebViewPrivate.h"
#import <WebCore/Element.h>
+#import <WebCore/Image.h>
#import <WebCore/MIMETypeRegistry.h>
#import <WebCore/RenderImage.h>
#import <WebKit/DOMExtensions.h>
#import <WebKit/DOMPrivate.h>
+#import <WebKitSystemInterface.h>
#import <wtf/Assertions.h>
-#import <wtf/StdLibExtras.h>
#import <wtf/RetainPtr.h>
-#import <WebKitSystemInterface.h>
+#import <wtf/StdLibExtras.h>
@interface NSFilePromiseDragSource : NSObject
- initWithSource:(id)draggingSource;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list