Title: [125458] trunk/Source/WebKit2
- Revision
- 125458
- Author
- [email protected]
- Date
- 2012-08-13 15:07:58 -0700 (Mon, 13 Aug 2012)
Log Message
[WK2] Move a remaining per-process message from WebContext to WebProcessProxy
https://bugs.webkit.org/show_bug.cgi?id=93883
More Windows build fix
* UIProcess/WebContext.cpp:
(WebKit::WebPage::dummy):
* UIProcess/WebContext.h: (WebContext):
* UIProcess/WebContext.messages.in:
Add a dummy sync message - the same workaround is already used in WebPage.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (125457 => 125458)
--- trunk/Source/WebKit2/ChangeLog 2012-08-13 22:04:01 UTC (rev 125457)
+++ trunk/Source/WebKit2/ChangeLog 2012-08-13 22:07:58 UTC (rev 125458)
@@ -1,3 +1,16 @@
+2012-08-13 Alexey Proskuryakov <[email protected]>
+
+ [WK2] Move a remaining per-process message from WebContext to WebProcessProxy
+ https://bugs.webkit.org/show_bug.cgi?id=93883
+
+ More Windows build fix
+
+ * UIProcess/WebContext.cpp:
+ (WebKit::WebPage::dummy):
+ * UIProcess/WebContext.h: (WebContext):
+ * UIProcess/WebContext.messages.in:
+ Add a dummy sync message - the same workaround is already used in WebPage.
+
2012-08-13 Brady Eidson <[email protected]>
With asynchronous plug-in initialization, WebProcess and PluginProcess can deadlock
Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (125457 => 125458)
--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2012-08-13 22:04:01 UTC (rev 125457)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2012-08-13 22:07:58 UTC (rev 125458)
@@ -859,6 +859,12 @@
return result;
}
+#if !PLATFORM(MAC)
+void WebPage::dummy(bool&)
+{
+}
+#endif
+
void WebContext::didGetWebCoreStatistics(const StatisticsData& statisticsData, uint64_t callbackID)
{
RefPtr<DictionaryCallback> callback = m_dictionaryCallbacks.take(callbackID);
Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (125457 => 125458)
--- trunk/Source/WebKit2/UIProcess/WebContext.h 2012-08-13 22:04:01 UTC (rev 125457)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2012-08-13 22:07:58 UTC (rev 125458)
@@ -245,6 +245,12 @@
void setPasteboardBufferForType(const String& pasteboardName, const String& pasteboardType, const SharedMemory::Handle&, uint64_t size);
#endif
+#if !PLATFORM(MAC)
+ // FIXME: This a dummy message, to avoid breaking the build for platforms that don't require
+ // any synchronous messages, and should be removed when <rdar://problem/8775115> is fixed.
+ void dummy(bool&);
+#endif
+
void didGetWebCoreStatistics(const StatisticsData&, uint64_t callbackID);
// Implemented in generated WebContextMessageReceiver.cpp
Modified: trunk/Source/WebKit2/UIProcess/WebContext.messages.in (125457 => 125458)
--- trunk/Source/WebKit2/UIProcess/WebContext.messages.in 2012-08-13 22:04:01 UTC (rev 125457)
+++ trunk/Source/WebKit2/UIProcess/WebContext.messages.in 2012-08-13 22:07:58 UTC (rev 125458)
@@ -45,4 +45,10 @@
SetPasteboardStringForType(WTF::String pasteboardName, WTF::String pasteboardType, WTF::String string)
SetPasteboardBufferForType(WTF::String pasteboardName, WTF::String pasteboardType, WebKit::SharedMemory::Handle handle, uint64_t size)
#endif
+
+#if !PLATFORM(MAC)
+ // FIXME: This a dummy message, to avoid breaking the build for platforms that don't require
+ // any synchronous messages, and should be removed when <rdar://problem/8775115> is fixed.
+ Dummy() -> (bool dummyReturn)
+#endif
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
