[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

aroben at apple.com aroben at apple.com
Thu Apr 8 00:42:26 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit b86c1d42eb20d62fb705a1713fb0c1528309387d
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 18 18:00:52 2009 +0000

    Build fixes
    
    WebCore: Chromium build fix
    
    * platform/chromium/PopupMenuChromium.cpp: Added #include.
    
    WebKit/chromium: Chromium build fix
    
    * src/ChromiumBridge.cpp:
    * src/WebPluginContainerImpl.cpp:
    * src/WebViewImpl.cpp:
    Added #includes.
    
    WebKit/qt: Qt build fix
    
    * Api/qwebpage.cpp: Added #include.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52321 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index cbb77c4..0546a15 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,12 @@
 
         Chromium build fix
 
+        * platform/chromium/PopupMenuChromium.cpp: Added #include.
+
+2009-12-18  Adam Roben  <aroben at apple.com>
+
+        Chromium build fix
+
         * html/HTMLLinkElement.cpp: Added #include.
 
 2009-12-18  Adam Roben  <aroben at apple.com>
diff --git a/WebCore/platform/chromium/PopupMenuChromium.cpp b/WebCore/platform/chromium/PopupMenuChromium.cpp
index 8de3a48..1e3b9f9 100644
--- a/WebCore/platform/chromium/PopupMenuChromium.cpp
+++ b/WebCore/platform/chromium/PopupMenuChromium.cpp
@@ -32,6 +32,7 @@
 #include "PopupMenuChromium.h"
 
 #include "CharacterNames.h"
+#include "Chrome.h"
 #include "ChromeClientChromium.h"
 #include "Font.h"
 #include "FontSelector.h"
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index e12b183..dbcc98e 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,12 @@
+2009-12-18  Adam Roben  <aroben at apple.com>
+
+        Chromium build fix
+
+        * src/ChromiumBridge.cpp:
+        * src/WebPluginContainerImpl.cpp:
+        * src/WebViewImpl.cpp:
+        Added #includes.
+
 2009-12-17  Eric Seidel  <eric at webkit.org>
 
         No review, rolling out r52291.
diff --git a/WebKit/chromium/src/ChromiumBridge.cpp b/WebKit/chromium/src/ChromiumBridge.cpp
index 93d92ba..39a155f 100644
--- a/WebKit/chromium/src/ChromiumBridge.cpp
+++ b/WebKit/chromium/src/ChromiumBridge.cpp
@@ -33,6 +33,7 @@
 
 #include <googleurl/src/url_util.h>
 
+#include "Chrome.h"
 #include "ChromeClientImpl.h"
 #include "WebClipboard.h"
 #include "WebCookie.h"
diff --git a/WebKit/chromium/src/WebPluginContainerImpl.cpp b/WebKit/chromium/src/WebPluginContainerImpl.cpp
index 43f3cef..d668dd7 100644
--- a/WebKit/chromium/src/WebPluginContainerImpl.cpp
+++ b/WebKit/chromium/src/WebPluginContainerImpl.cpp
@@ -31,6 +31,7 @@
 #include "config.h"
 #include "WebPluginContainerImpl.h"
 
+#include "Chrome.h"
 #include "ChromeClientImpl.h"
 #include "WebCursorInfo.h"
 #include "WebDataSourceImpl.h"
diff --git a/WebKit/chromium/src/WebViewImpl.cpp b/WebKit/chromium/src/WebViewImpl.cpp
index 87a150a..34866b5 100644
--- a/WebKit/chromium/src/WebViewImpl.cpp
+++ b/WebKit/chromium/src/WebViewImpl.cpp
@@ -33,6 +33,7 @@
 
 #include "AutocompletePopupMenuClient.h"
 #include "AXObjectCache.h"
+#include "Chrome.h"
 #include "ContextMenu.h"
 #include "ContextMenuController.h"
 #include "ContextMenuItem.h"
diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp
index c752a81..6296484 100644
--- a/WebKit/qt/Api/qwebpage.cpp
+++ b/WebKit/qt/Api/qwebpage.cpp
@@ -33,6 +33,7 @@
 #include "qwebkitversion.h"
 
 #include "Chrome.h"
+#include "ContextMenuController.h"
 #include "Frame.h"
 #include "FrameTree.h"
 #include "FrameLoader.h"
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 7573107..1ca742f 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -2,6 +2,12 @@
 
         Qt build fix
 
+        * Api/qwebpage.cpp: Added #include.
+
+2009-12-18  Adam Roben  <aroben at apple.com>
+
+        Qt build fix
+
         * Api/qwebpage.cpp:
         Added #includes.
 

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list