[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

barraclough at apple.com barraclough at apple.com
Wed Dec 22 11:51:33 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 5200f3f9c7b941192f90871ff4387362f4bea3d0
Author: barraclough at apple.com <barraclough at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 10 01:37:23 2010 +0000

    Speculative chromium build fix II.
    
    * src/AssertMatchingEnums.cpp:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65027 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index ec975ec..26e221b 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,5 +1,11 @@
 2010-08-09  Gavin Barraclough  <barraclough at apple.com>
 
+        Speculative chromium build fix II.
+
+        * src/AssertMatchingEnums.cpp:
+
+2010-08-09  Gavin Barraclough  <barraclough at apple.com>
+
         Speculative chromium build fix.
 
         * public/WebCString.h:
diff --git a/WebKit/chromium/src/AssertMatchingEnums.cpp b/WebKit/chromium/src/AssertMatchingEnums.cpp
index 093ac11..bcd7931 100644
--- a/WebKit/chromium/src/AssertMatchingEnums.cpp
+++ b/WebKit/chromium/src/AssertMatchingEnums.cpp
@@ -69,6 +69,12 @@
 #define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, webcore_name) \
     COMPILE_ASSERT(int(WebKit::webkit_name) == int(WebCore::webcore_name), mismatching_enums)
 
+// These constants are in WTF, bring them into WebCore so the ASSERT still works for them!
+namespace WebCore {
+    using WTF::TextCaseSensitive;
+    using WTF::TextCaseInsensitive;
+};
+
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleUnknown, UnknownRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleButton, ButtonRole);
 COMPILE_ASSERT_MATCHING_ENUM(WebAccessibilityRoleRadioButton, RadioButtonRole);

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list