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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@159913 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent bd8a6183
2013-12-01 ChangSeok Oh <changseok.oh@collabora.com>
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 <sam@webkit.org> 2013-12-01 Sam Weinig <sam@webkit.org>
Give UserMessageEncoders WebProcessProxy reference (like the decoders already have) Give UserMessageEncoders WebProcessProxy reference (like the decoders already have)
......
...@@ -115,7 +115,7 @@ void DrawingAreaProxyImpl::deviceScaleFactorDidChange() ...@@ -115,7 +115,7 @@ void DrawingAreaProxyImpl::deviceScaleFactorDidChange()
void DrawingAreaProxyImpl::layerHostingModeDidChange() 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) void DrawingAreaProxyImpl::setBackingStoreIsDiscardable(bool isBackingStoreDiscardable)
...@@ -144,7 +144,7 @@ void DrawingAreaProxyImpl::update(uint64_t backingStoreStateID, const UpdateInfo ...@@ -144,7 +144,7 @@ void DrawingAreaProxyImpl::update(uint64_t backingStoreStateID, const UpdateInfo
// FIXME: Handle the case where the view is hidden. // FIXME: Handle the case where the view is hidden.
incorporateUpdate(updateInfo); 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) void DrawingAreaProxyImpl::didUpdateBackingStoreState(uint64_t backingStoreStateID, const UpdateInfo& updateInfo, const LayerTreeContext& layerTreeContext)
...@@ -156,7 +156,7 @@ void DrawingAreaProxyImpl::didUpdateBackingStoreState(uint64_t backingStoreState ...@@ -156,7 +156,7 @@ void DrawingAreaProxyImpl::didUpdateBackingStoreState(uint64_t backingStoreState
m_isWaitingForDidUpdateBackingStoreState = false; m_isWaitingForDidUpdateBackingStoreState = false;
// Stop the responsiveness timer that was started in sendUpdateBackingStoreState. // Stop the responsiveness timer that was started in sendUpdateBackingStoreState.
m_webPageProxy->process()->responsivenessTimer()->stop(); m_webPageProxy->process().responsivenessTimer()->stop();
#if USE(ACCELERATED_COMPOSITING) #if USE(ACCELERATED_COMPOSITING)
if (layerTreeContext != m_layerTreeContext) { if (layerTreeContext != m_layerTreeContext) {
...@@ -280,13 +280,13 @@ void DrawingAreaProxyImpl::sendUpdateBackingStoreState(RespondImmediatelyOrNot r ...@@ -280,13 +280,13 @@ void DrawingAreaProxyImpl::sendUpdateBackingStoreState(RespondImmediatelyOrNot r
m_isWaitingForDidUpdateBackingStoreState = respondImmediatelyOrNot == RespondImmediately; 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(); m_scrollOffset = IntSize();
if (m_isWaitingForDidUpdateBackingStoreState) { if (m_isWaitingForDidUpdateBackingStoreState) {
// Start the responsiveness timer. We will stop it when we hear back from the WebProcess // Start the responsiveness timer. We will stop it when we hear back from the WebProcess
// in didUpdateBackingStoreState. // in didUpdateBackingStoreState.
m_webPageProxy->process()->responsivenessTimer()->start(); m_webPageProxy->process().responsivenessTimer()->start();
} }
#if USE(ACCELERATED_COMPOSITING) #if USE(ACCELERATED_COMPOSITING)
...@@ -304,7 +304,7 @@ void DrawingAreaProxyImpl::waitForAndDispatchDidUpdateBackingStoreState() ...@@ -304,7 +304,7 @@ void DrawingAreaProxyImpl::waitForAndDispatchDidUpdateBackingStoreState()
if (!m_webPageProxy->isValid()) if (!m_webPageProxy->isValid())
return; return;
if (m_webPageProxy->process()->isLaunching()) if (m_webPageProxy->process().isLaunching())
return; return;
#if USE(ACCELERATED_COMPOSITING) #if USE(ACCELERATED_COMPOSITING)
...@@ -315,7 +315,7 @@ void DrawingAreaProxyImpl::waitForAndDispatchDidUpdateBackingStoreState() ...@@ -315,7 +315,7 @@ void DrawingAreaProxyImpl::waitForAndDispatchDidUpdateBackingStoreState()
// The timeout, in seconds, we use when waiting for a DidUpdateBackingStoreState message when we're asked to paint. // The timeout, in seconds, we use when waiting for a DidUpdateBackingStoreState message when we're asked to paint.
static const double didUpdateBackingStoreStateTimeout = 0.5; 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 #endif
} }
......
...@@ -35,7 +35,7 @@ namespace WebKit { ...@@ -35,7 +35,7 @@ namespace WebKit {
void WebFullScreenManagerProxy::invalidate() 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; m_webView = 0;
} }
......
...@@ -61,7 +61,7 @@ WebPageProxy* WebInspectorProxy::platformCreateInspectorPage() ...@@ -61,7 +61,7 @@ WebPageProxy* WebInspectorProxy::platformCreateInspectorPage()
{ {
ASSERT(m_page); ASSERT(m_page);
ASSERT(!m_inspectorView); 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)); g_object_add_weak_pointer(G_OBJECT(m_inspectorView), reinterpret_cast<void**>(&m_inspectorView));
return webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(m_inspectorView)); return webkitWebViewBaseGetPage(WEBKIT_WEB_VIEW_BASE(m_inspectorView));
} }
......
...@@ -126,7 +126,7 @@ void WebPageProxy::setInputMethodState(bool enabled) ...@@ -126,7 +126,7 @@ void WebPageProxy::setInputMethodState(bool enabled)
#if USE(TEXTURE_MAPPER_GL) #if USE(TEXTURE_MAPPER_GL)
void WebPageProxy::setAcceleratedCompositingWindowId(uint64_t nativeWindowId) void WebPageProxy::setAcceleratedCompositingWindowId(uint64_t nativeWindowId)
{ {
process()->send(Messages::WebPage::SetAcceleratedCompositingWindowId(nativeWindowId), m_pageID); process().send(Messages::WebPage::SetAcceleratedCompositingWindowId(nativeWindowId), m_pageID);
} }
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment