Modified: trunk/Source/WebKit2/ChangeLog (159912 => 159913)
--- trunk/Source/WebKit2/ChangeLog 2013-12-02 05:44:16 UTC (rev 159912)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-02 07:48:48 UTC (rev 159913)
@@ -1,3 +1,20 @@
+2013-12-01 ChangSeok Oh <[email protected]>
+
+ Unreviewed Gtk port Build fix after r159903
+
+ * UIProcess/DrawingAreaProxyImpl.cpp:
+ (WebKit::DrawingAreaProxyImpl::layerHostingModeDidChange):
+ (WebKit::DrawingAreaProxyImpl::update):
+ (WebKit::DrawingAreaProxyImpl::didUpdateBackingStoreState):
+ (WebKit::DrawingAreaProxyImpl::sendUpdateBackingStoreState):
+ (WebKit::DrawingAreaProxyImpl::waitForAndDispatchDidUpdateBackingStoreState):
+ * UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp:
+ (WebKit::WebFullScreenManagerProxy::invalidate):
+ * UIProcess/gtk/WebInspectorProxyGtk.cpp:
+ (WebKit::WebInspectorProxy::platformCreateInspectorPage):
+ * UIProcess/gtk/WebPageProxyGtk.cpp:
+ (WebKit::WebPageProxy::setAcceleratedCompositingWindowId):
+
2013-12-01 Sam Weinig <[email protected]>
Give UserMessageEncoders WebProcessProxy reference (like the decoders already have)
Modified: trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp (159912 => 159913)
--- trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp 2013-12-02 05:44:16 UTC (rev 159912)
+++ trunk/Source/WebKit2/UIProcess/DrawingAreaProxyImpl.cpp 2013-12-02 07:48:48 UTC (rev 159913)
@@ -115,7 +115,7 @@
void DrawingAreaProxyImpl::layerHostingModeDidChange()
{
- m_webPageProxy->process()->send(Messages::DrawingArea::SetLayerHostingMode(m_webPageProxy->layerHostingMode()), m_webPageProxy->pageID());
+ m_webPageProxy->process().send(Messages::DrawingArea::SetLayerHostingMode(m_webPageProxy->layerHostingMode()), m_webPageProxy->pageID());
}
void DrawingAreaProxyImpl::setBackingStoreIsDiscardable(bool isBackingStoreDiscardable)
@@ -144,7 +144,7 @@
// FIXME: Handle the case where the view is hidden.
incorporateUpdate(updateInfo);
- m_webPageProxy->process()->send(Messages::DrawingArea::DidUpdate(), m_webPageProxy->pageID());
+ m_webPageProxy->process().send(Messages::DrawingArea::DidUpdate(), m_webPageProxy->pageID());
}
void DrawingAreaProxyImpl::didUpdateBackingStoreState(uint64_t backingStoreStateID, const UpdateInfo& updateInfo, const LayerTreeContext& layerTreeContext)
@@ -156,7 +156,7 @@
m_isWaitingForDidUpdateBackingStoreState = false;
// Stop the responsiveness timer that was started in sendUpdateBackingStoreState.
- m_webPageProxy->process()->responsivenessTimer()->stop();
+ m_webPageProxy->process().responsivenessTimer()->stop();
#if USE(ACCELERATED_COMPOSITING)
if (layerTreeContext != m_layerTreeContext) {
@@ -280,13 +280,13 @@
m_isWaitingForDidUpdateBackingStoreState = respondImmediatelyOrNot == RespondImmediately;
- m_webPageProxy->process()->send(Messages::DrawingArea::UpdateBackingStoreState(m_nextBackingStoreStateID, respondImmediatelyOrNot == RespondImmediately, m_webPageProxy->deviceScaleFactor(), m_size, m_scrollOffset), m_webPageProxy->pageID());
+ m_webPageProxy->process().send(Messages::DrawingArea::UpdateBackingStoreState(m_nextBackingStoreStateID, respondImmediatelyOrNot == RespondImmediately, m_webPageProxy->deviceScaleFactor(), m_size, m_scrollOffset), m_webPageProxy->pageID());
m_scrollOffset = IntSize();
if (m_isWaitingForDidUpdateBackingStoreState) {
// Start the responsiveness timer. We will stop it when we hear back from the WebProcess
// in didUpdateBackingStoreState.
- m_webPageProxy->process()->responsivenessTimer()->start();
+ m_webPageProxy->process().responsivenessTimer()->start();
}
#if USE(ACCELERATED_COMPOSITING)
@@ -304,7 +304,7 @@
if (!m_webPageProxy->isValid())
return;
- if (m_webPageProxy->process()->isLaunching())
+ if (m_webPageProxy->process().isLaunching())
return;
#if USE(ACCELERATED_COMPOSITING)
@@ -315,7 +315,7 @@
// The timeout, in seconds, we use when waiting for a DidUpdateBackingStoreState message when we're asked to paint.
static const double didUpdateBackingStoreStateTimeout = 0.5;
- m_webPageProxy->process()->connection()->waitForAndDispatchImmediately<Messages::DrawingAreaProxy::DidUpdateBackingStoreState>(m_webPageProxy->pageID(), didUpdateBackingStoreStateTimeout);
+ m_webPageProxy->process().connection()->waitForAndDispatchImmediately<Messages::DrawingAreaProxy::DidUpdateBackingStoreState>(m_webPageProxy->pageID(), didUpdateBackingStoreStateTimeout);
#endif
}
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp (159912 => 159913)
--- trunk/Source/WebKit2/UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp 2013-12-02 05:44:16 UTC (rev 159912)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebFullScreenManagerProxyGtk.cpp 2013-12-02 07:48:48 UTC (rev 159913)
@@ -35,7 +35,7 @@
void WebFullScreenManagerProxy::invalidate()
{
- m_page->process()->removeMessageReceiver(Messages::WebFullScreenManagerProxy::messageReceiverName(), m_page->pageID());
+ m_page->process().removeMessageReceiver(Messages::WebFullScreenManagerProxy::messageReceiverName(), m_page->pageID());
m_webView = 0;
}
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp (159912 => 159913)
--- trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp 2013-12-02 05:44:16 UTC (rev 159912)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp 2013-12-02 07:48:48 UTC (rev 159913)
@@ -61,7 +61,7 @@
{
ASSERT(m_page);
ASSERT(!m_inspectorView);
- m_inspectorView = GTK_WIDGET(webkitWebViewBaseCreate(page()->process()->context(), inspectorPageGroup()));
+ m_inspectorView = GTK_WIDGET(webkitWebViewBaseCreate(&page()->process().context(), inspectorPageGroup()));
g_object_add_weak_pointer(G_OBJECT(m_inspectorView), reinterpret_cast<void**>(&m_inspectorView));
return webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(m_inspectorView));
}
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp (159912 => 159913)
--- trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp 2013-12-02 05:44:16 UTC (rev 159912)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebPageProxyGtk.cpp 2013-12-02 07:48:48 UTC (rev 159913)
@@ -126,7 +126,7 @@
#if USE(TEXTURE_MAPPER_GL)
void WebPageProxy::setAcceleratedCompositingWindowId(uint64_t nativeWindowId)
{
- process()->send(Messages::WebPage::SetAcceleratedCompositingWindowId(nativeWindowId), m_pageID);
+ process().send(Messages::WebPage::SetAcceleratedCompositingWindowId(nativeWindowId), m_pageID);
}
#endif
