[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[aroben at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit bc69d2e5c57e8621eaf03aca11a60a372900ad98
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 17 20:00:50 2009 +0000

    Don't include all JSC headers everywhere
    
    https://bugs.webkit.org/show_bug.cgi?id=32663
    
    Patch by Benjamin Otte <otte at gnome.org> on 2009-12-17
    Reviewed by Adam Roben.
    
    WebCore:
    
    PlatformString.h included almost all of JSC via runtime/Identifier.h.
    This patch gets rid of this include by forward-declaring the required
    classes instead.
    This reduces the build size of the object files on a Gtk debug build
    by 10%. The resulting libwebkit.so gets 5% smaller.
    
    No new tests as it's just a build improvement.
    
    * platform/gtk/LocalizedStringsGtk.cpp:
    include math.h here (it used to be pulled by JSC)
    * platform/text/PlatformString.h:
    * platform/text/String.cpp:
    
    WebKit/win:
    
    * WebCoreLocalizedStrings.cpp: Added now-needed #include of
    MathExtras.h.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52275 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dff36b3..e406d53 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2009-12-17  Benjamin Otte  <otte at gnome.org>
+
+        Reviewed by Adam Roben.
+
+        Don't include all JSC headers everywhere
+        https://bugs.webkit.org/show_bug.cgi?id=32663
+
+        PlatformString.h included almost all of JSC via runtime/Identifier.h.
+        This patch gets rid of this include by forward-declaring the required
+        classes instead.
+        This reduces the build size of the object files on a Gtk debug build
+        by 10%. The resulting libwebkit.so gets 5% smaller.
+
+        No new tests as it's just a build improvement.
+
+        * platform/gtk/LocalizedStringsGtk.cpp:
+        include math.h here (it used to be pulled by JSC)
+        * platform/text/PlatformString.h:
+        * platform/text/String.cpp:
+
 2009-12-17  Evan Martin  <evan at chromium.org>
 
         Reviewed by Xan Lopez.
diff --git a/WebCore/platform/gtk/LocalizedStringsGtk.cpp b/WebCore/platform/gtk/LocalizedStringsGtk.cpp
index 5809e47..2d8dfc4 100644
--- a/WebCore/platform/gtk/LocalizedStringsGtk.cpp
+++ b/WebCore/platform/gtk/LocalizedStringsGtk.cpp
@@ -38,6 +38,7 @@
 
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
+#include <math.h>
 
 namespace WebCore {
 
diff --git a/WebCore/platform/text/PlatformString.h b/WebCore/platform/text/PlatformString.h
index 247536a..c988c1d 100644
--- a/WebCore/platform/text/PlatformString.h
+++ b/WebCore/platform/text/PlatformString.h
@@ -31,15 +31,9 @@
 #include <objc/objc.h>
 #endif
 
-#if USE(JSC)
-#include <runtime/Identifier.h>
-#else
-// runtime/Identifier.h brings in a variety of wtf headers.  We explicitly
-// include them in the case of non-JSC builds to keep things consistent.
 #include <wtf/HashMap.h>
 #include <wtf/HashSet.h>
 #include <wtf/OwnPtr.h>
-#endif
 
 #if PLATFORM(CF)
 typedef const struct __CFString * CFStringRef;
@@ -60,6 +54,13 @@ class wxString;
 class BString;
 #endif
 
+#if USE(JSC)
+namespace JSC {
+class Identifier;
+class UString;
+}
+#endif
+
 namespace WebCore {
 
 class CString;
diff --git a/WebCore/platform/text/String.cpp b/WebCore/platform/text/String.cpp
index 24659a4..8342b0b 100644
--- a/WebCore/platform/text/String.cpp
+++ b/WebCore/platform/text/String.cpp
@@ -37,6 +37,8 @@
 #include <wtf/unicode/UTF8.h>
 
 #if USE(JSC)
+#include <runtime/Identifier.h>
+
 using JSC::Identifier;
 using JSC::UString;
 #endif
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 434fc87..7f1756e 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-17  Benjamin Otte  <otte at gnome.org>
+
+        Reviewed by Adam Roben.
+
+        Don't include all JSC headers everywhere
+        https://bugs.webkit.org/show_bug.cgi?id=32663
+
+        * WebCoreLocalizedStrings.cpp: Added now-needed #include of
+        MathExtras.h.
+
 2009-12-17  Adam Roben  <aroben at apple.com>
 
         Remove WebKit.sln's Debug_All and Debug_Internal configurations
diff --git a/WebKit/win/WebCoreLocalizedStrings.cpp b/WebKit/win/WebCoreLocalizedStrings.cpp
index 9ee22db..020e9a7 100644
--- a/WebKit/win/WebCoreLocalizedStrings.cpp
+++ b/WebKit/win/WebCoreLocalizedStrings.cpp
@@ -28,6 +28,7 @@
 #include <WebCore/IntSize.h>
 #include <WebCore/LocalizedStrings.h>
 #include <WebCore/PlatformString.h>
+#include <wtf/MathExtras.h>
 #include <wtf/RetainPtr.h>
 
 using namespace WebCore;

-- 
WebKit Debian packaging