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

enrica at apple.com enrica at apple.com
Wed Dec 22 18:26:07 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 5d91b21ef6c7a46d063821bac427e07230c558a9
Author: enrica at apple.com <enrica at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 10 22:30:23 2010 +0000

    Windows build fix. Unreviewed.
    
    Adding a dummy synchronous message for platforms
    that don't have any.
    
    * WebProcess/WebPage/WebPage.cpp:
    (WebKit::WebPage::dummy):
    * WebProcess/WebPage/WebPage.h:
    * WebProcess/WebPage/WebPage.messages.in:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73803 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index d8c89df..7bd38af 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2010-12-10  Enrica Casucci  <enrica at apple.com>
+
+        Windows build fix. Unreviewed.
+
+        Adding a dummy synchronous message for platforms
+        that don't have any.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::dummy):
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebPage/WebPage.messages.in:
+
 2010-12-09  Brian Weinstein  <bweinstein at apple.com>
 
         Reviewed by Adam Roben.
diff --git a/WebKit2/WebProcess/WebPage/WebPage.cpp b/WebKit2/WebProcess/WebPage/WebPage.cpp
index 6518d85..fb49bce 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.cpp
+++ b/WebKit2/WebProcess/WebPage/WebPage.cpp
@@ -182,6 +182,10 @@ WebPage::~WebPage()
 #endif
 }
 
+void WebPage::dummy(bool&)
+{
+}
+
 CoreIPC::Connection* WebPage::connection() const
 {
     return WebProcess::shared().connection();
diff --git a/WebKit2/WebProcess/WebPage/WebPage.h b/WebKit2/WebProcess/WebPage/WebPage.h
index 5caa340..fc307d0 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.h
+++ b/WebKit2/WebProcess/WebPage/WebPage.h
@@ -245,7 +245,8 @@ public:
     void firstRectForCharacterRange(uint64_t location, uint64_t length, WebCore::IntRect& resultRect);
     static void convertRangeToPlatformRange(WebCore::Frame* frame, WebCore::Range *range, uint64_t& location, uint64_t& length);
 #endif
-    
+    void dummy(bool&);
+
 private:
     WebPage(uint64_t pageID, const WebPageCreationParameters&);
 
diff --git a/WebKit2/WebProcess/WebPage/WebPage.messages.in b/WebKit2/WebProcess/WebPage/WebPage.messages.in
index 8014cea..6657211 100644
--- a/WebKit2/WebProcess/WebPage/WebPage.messages.in
+++ b/WebKit2/WebProcess/WebPage/WebPage.messages.in
@@ -100,7 +100,9 @@ messages -> WebPage {
     CharacterIndexForPoint(WebCore::IntPoint point) -> (uint64_t result)
     FirstRectForCharacterRange(uint64_t location, uint64_t length) -> (WebCore::IntRect resultRect)
 #endif
-
+	// This is a dummy message to avoid breaking the build for platforms that don't require 
+	// synchronous messages.
+	Dummy() -> (bool dummyReturn)
 #if PLATFORM(QT)
     FindZoomableAreaForPoint(WebCore::IntPoint point)
 #endif

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list