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

jianli at chromium.org jianli at chromium.org
Wed Dec 22 11:53:23 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit c8b26eb5f425bc58c95c8e0c7c4baee49fb4ea58
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 10 19:59:16 2010 +0000

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

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index 812bedb..113629b 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,9 @@
+2010-08-10  Jian Li  <jianli at chromium.org>
+
+        Another chromium build fix.
+
+        * src/AssertMatchingEnums.cpp:
+
 2010-08-10  Gavin Barraclough  <barraclough at apple.com>
 
         Rubber stamped by Sam Weinig.
diff --git a/WebKit/chromium/src/AssertMatchingEnums.cpp b/WebKit/chromium/src/AssertMatchingEnums.cpp
index bcd7931..b93d4bb 100644
--- a/WebKit/chromium/src/AssertMatchingEnums.cpp
+++ b/WebKit/chromium/src/AssertMatchingEnums.cpp
@@ -45,7 +45,6 @@
 #include "PasteboardPrivate.h"
 #include "PlatformCursor.h"
 #include "Settings.h"
-#include "StringImpl.h"
 #include "TextAffinity.h"
 #include "UserContentTypes.h"
 #include "UserScriptTypes.h"
@@ -65,6 +64,7 @@
 #include "WebTextCaseSensitivity.h"
 #include "WebView.h"
 #include <wtf/Assertions.h>
+#include <wtf/text/StringImpl.h>
 
 #define COMPILE_ASSERT_MATCHING_ENUM(webkit_name, webcore_name) \
     COMPILE_ASSERT(int(WebKit::webkit_name) == int(WebCore::webcore_name), mismatching_enums)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list