Title: [205004] trunk/Source
- Revision
- 205004
- Author
- [email protected]
- Date
- 2016-08-25 23:55:50 -0700 (Thu, 25 Aug 2016)
Log Message
Unreviewed. Fix GTK+ build after r204986 and r204996.
Source/WebCore:
* page/DOMWindow.idl:
Source/WebKit2:
* Platform/IPC/unix/ConnectionUnix.cpp:
(IPC::Connection::willSendSyncMessage):
(IPC::Connection::didReceiveSyncReply):
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::drawPagesForPrinting):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (205003 => 205004)
--- trunk/Source/WebCore/ChangeLog 2016-08-26 05:33:58 UTC (rev 205003)
+++ trunk/Source/WebCore/ChangeLog 2016-08-26 06:55:50 UTC (rev 205004)
@@ -1,3 +1,9 @@
+2016-08-25 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix GTK+ build after r204986 and r204996.
+
+ * page/DOMWindow.idl:
+
2016-08-25 Wenson Hsieh <[email protected]>
Dragging against the end of the inline media scrubber causes the media scrubber to hide
Modified: trunk/Source/WebCore/page/DOMWindow.idl (205003 => 205004)
--- trunk/Source/WebCore/page/DOMWindow.idl 2016-08-26 05:33:58 UTC (rev 205003)
+++ trunk/Source/WebCore/page/DOMWindow.idl 2016-08-26 06:55:50 UTC (rev 205004)
@@ -147,8 +147,10 @@
// DOM Level 2 Style Interface
[NewObject] CSSStyleDeclaration getComputedStyle(Element element, optional DOMString? pseudoElement = null);
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
// FIXME: Drop this overload once <rdar://problem/28016778> has been fixed.
[NewObject, RaisesException] CSSStyleDeclaration getComputedStyle(Document document, optional DOMString? pseudoElement = null);
+#endif
// WebKit extensions
#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
Modified: trunk/Source/WebKit2/ChangeLog (205003 => 205004)
--- trunk/Source/WebKit2/ChangeLog 2016-08-26 05:33:58 UTC (rev 205003)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-26 06:55:50 UTC (rev 205004)
@@ -1,3 +1,13 @@
+2016-08-25 Carlos Garcia Campos <[email protected]>
+
+ Unreviewed. Fix GTK+ build after r204986 and r204996.
+
+ * Platform/IPC/unix/ConnectionUnix.cpp:
+ (IPC::Connection::willSendSyncMessage):
+ (IPC::Connection::didReceiveSyncReply):
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::drawPagesForPrinting):
+
2016-08-25 Anders Carlsson <[email protected]>
Replace all IPC message send flags with OptionSet
Modified: trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp (205003 => 205004)
--- trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp 2016-08-26 05:33:58 UTC (rev 205003)
+++ trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp 2016-08-26 06:55:50 UTC (rev 205004)
@@ -543,15 +543,13 @@
SocketPair socketPair = { sockets[0], sockets[1] };
return socketPair;
}
-
-void Connection::willSendSyncMessage(unsigned flags)
+
+void Connection::willSendSyncMessage(OptionSet<SendSyncOption>)
{
- UNUSED_PARAM(flags);
}
-
-void Connection::didReceiveSyncReply(unsigned flags)
+
+void Connection::didReceiveSyncReply(OptionSet<SendSyncOption>)
{
- UNUSED_PARAM(flags);
}
} // namespace IPC
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (205003 => 205004)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-08-26 05:33:58 UTC (rev 205003)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-08-26 06:55:50 UTC (rev 205004)
@@ -5860,7 +5860,7 @@
uint64_t callbackID = callback->callbackID();
m_callbacks.put(callback);
m_isInPrintingMode = true;
- m_process->send(Messages::WebPage::DrawPagesForPrinting(frame->frameID(), printInfo, callbackID), m_pageID, printingSendOptions(m_isPerformingDOMPrintOperation)));
+ m_process->send(Messages::WebPage::DrawPagesForPrinting(frame->frameID(), printInfo, callbackID), m_pageID, printingSendOptions(m_isPerformingDOMPrintOperation));
}
#endif
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
