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

jianli at chromium.org jianli at chromium.org
Wed Dec 22 18:44:06 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 72e3793f861d5bd7b8f0626d0adae5ccbb3fb11b
Author: jianli at chromium.org <jianli at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 16 21:08:30 2010 +0000

    Unreviewed. Fixed chromium build break caused by r74207.
    
    * platform/ContextMenuItem.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74208 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e1ce28c..b2f2296 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,9 @@
+2010-12-16  Jian Li  <jianli at chromium.org>
+
+        Unreviewed. Fixed chromium build break caused by r74207.
+
+        * platform/ContextMenuItem.h:
+
 2010-12-16  Leandro Pereira  <leandro at profusion.mobi>
 
         [EFL] Unreviewed build fix.
diff --git a/WebCore/platform/ContextMenuItem.h b/WebCore/platform/ContextMenuItem.h
index 171d41c..64d9e4b 100644
--- a/WebCore/platform/ContextMenuItem.h
+++ b/WebCore/platform/ContextMenuItem.h
@@ -216,6 +216,7 @@ namespace WebCore {
         bool checked;
         bool enabled;
     };
+#else
     typedef void* PlatformMenuItemDescription;
 #endif
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list