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

mrowe at apple.com mrowe at apple.com
Wed Dec 22 14:31:26 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit fc01893d0e1db1ccb040e51dc599236a91417026
Author: mrowe at apple.com <mrowe at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 12 12:28:56 2010 +0000

    Fix class vs struct forward declaration issues in WebKit2 observed when using clang.
    
    * Scripts/webkit2/messages.py: Add WebCore::ViewportArguments to the set of structs.
    * UIProcess/PageClient.h:
    * UIProcess/WebPageProxy.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69574 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 6706909..41adfb4 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,11 @@
+2010-10-12  Mark Rowe  <mrowe at apple.com>
+
+        Fix class vs struct forward declaration issues in WebKit2 observed when using clang.
+
+        * Scripts/webkit2/messages.py: Add WebCore::ViewportArguments to the set of structs.
+        * UIProcess/PageClient.h:
+        * UIProcess/WebPageProxy.h:
+
 2010-10-12  Juha Savolainen  <juha.savolainen at weego.fi>
 
         Reviewed by Antti Koivisto.
diff --git a/WebKit2/Scripts/webkit2/messages.py b/WebKit2/Scripts/webkit2/messages.py
index c24bf6e..8876c14 100644
--- a/WebKit2/Scripts/webkit2/messages.py
+++ b/WebKit2/Scripts/webkit2/messages.py
@@ -226,6 +226,7 @@ def message_to_struct_declaration(message):
 
 def struct_or_class(namespace, type):
     structs = frozenset([
+        'WebCore::ViewportArguments',
         'WebKit::WebPageCreationParameters',
         'WebKit::WebPreferencesStore',
         'WebKit::WebProcessCreationParameters',
diff --git a/WebKit2/UIProcess/PageClient.h b/WebKit2/UIProcess/PageClient.h
index e880a93..2f5d3cf 100644
--- a/WebKit2/UIProcess/PageClient.h
+++ b/WebKit2/UIProcess/PageClient.h
@@ -31,7 +31,7 @@
 
 namespace WebCore {
     class Cursor;
-    class ViewportArguments;
+    struct ViewportArguments;
 }
 
 namespace WebKit {
diff --git a/WebKit2/UIProcess/WebPageProxy.h b/WebKit2/UIProcess/WebPageProxy.h
index 110d0ef..51d8671 100644
--- a/WebKit2/UIProcess/WebPageProxy.h
+++ b/WebKit2/UIProcess/WebPageProxy.h
@@ -59,7 +59,7 @@ namespace WebCore {
     class Cursor;
     class FloatRect;
     class IntSize;
-    class ViewportArguments;
+    struct ViewportArguments;
 }
 
 struct WKContextStatistics;

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list