Unreviewed EFL Build fix attempt after r159903

* UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp:
(WebKit::CoordinatedDrawingAreaProxy::layerHostingModeDidChange):
(WebKit::CoordinatedDrawingAreaProxy::update):
(WebKit::CoordinatedDrawingAreaProxy::didUpdateBackingStoreState):
(WebKit::CoordinatedDrawingAreaProxy::sendUpdateBackingStoreState):
(WebKit::CoordinatedDrawingAreaProxy::waitForAndDispatchDidUpdateBackingStoreState):
* UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp:
(WebKit::CoordinatedLayerTreeHostProxy::CoordinatedLayerTreeHostProxy):
(WebKit::CoordinatedLayerTreeHostProxy::~CoordinatedLayerTreeHostProxy):
(WebKit::CoordinatedLayerTreeHostProxy::setVisibleContentsRect):
(WebKit::CoordinatedLayerTreeHostProxy::renderNextFrame):
(WebKit::CoordinatedLayerTreeHostProxy::purgeBackingStores):
(WebKit::CoordinatedLayerTreeHostProxy::commitScrollOffset):
* UIProcess/WebTextChecker.cpp:
(WebKit::WebTextChecker::checkSpelling):
(WebKit::WebTextChecker::changeSpellingToWord):
* UIProcess/WebTextChecker.h:
* UIProcess/WebVibrationProxy.cpp:
(WebKit::WebVibrationProxy::WebVibrationProxy):
(WebKit::WebVibrationProxy::~WebVibrationProxy):
* UIProcess/efl/WebFullScreenManagerProxyEfl.cpp:
(WebKit::WebFullScreenManagerProxy::invalidate):
* UIProcess/efl/WebInspectorProxyEfl.cpp:
(WebKit::WebInspectorProxy::platformCreateInspectorPage):
* UIProcess/efl/WebPageProxyEfl.cpp:
(WebKit::WebPageProxy::setThemePath):
(WebKit::WebPageProxy::confirmComposition):
(WebKit::WebPageProxy::setComposition):
(WebKit::WebPageProxy::cancelComposition):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@159905 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 1928d0e3
2013-12-01 Ryuan Choi <ryuan.choi@samsung.com>
Unreviewed EFL Build fix attempt after r159903
* UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp:
(WebKit::CoordinatedDrawingAreaProxy::layerHostingModeDidChange):
(WebKit::CoordinatedDrawingAreaProxy::update):
(WebKit::CoordinatedDrawingAreaProxy::didUpdateBackingStoreState):
(WebKit::CoordinatedDrawingAreaProxy::sendUpdateBackingStoreState):
(WebKit::CoordinatedDrawingAreaProxy::waitForAndDispatchDidUpdateBackingStoreState):
* UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp:
(WebKit::CoordinatedLayerTreeHostProxy::CoordinatedLayerTreeHostProxy):
(WebKit::CoordinatedLayerTreeHostProxy::~CoordinatedLayerTreeHostProxy):
(WebKit::CoordinatedLayerTreeHostProxy::setVisibleContentsRect):
(WebKit::CoordinatedLayerTreeHostProxy::renderNextFrame):
(WebKit::CoordinatedLayerTreeHostProxy::purgeBackingStores):
(WebKit::CoordinatedLayerTreeHostProxy::commitScrollOffset):
* UIProcess/WebTextChecker.cpp:
(WebKit::WebTextChecker::checkSpelling):
(WebKit::WebTextChecker::changeSpellingToWord):
* UIProcess/WebTextChecker.h:
* UIProcess/WebVibrationProxy.cpp:
(WebKit::WebVibrationProxy::WebVibrationProxy):
(WebKit::WebVibrationProxy::~WebVibrationProxy):
* UIProcess/efl/WebFullScreenManagerProxyEfl.cpp:
(WebKit::WebFullScreenManagerProxy::invalidate):
* UIProcess/efl/WebInspectorProxyEfl.cpp:
(WebKit::WebInspectorProxy::platformCreateInspectorPage):
* UIProcess/efl/WebPageProxyEfl.cpp:
(WebKit::WebPageProxy::setThemePath):
(WebKit::WebPageProxy::confirmComposition):
(WebKit::WebPageProxy::setComposition):
(WebKit::WebPageProxy::cancelComposition):
2013-12-01 Sam Weinig <sam@webkit.org> 2013-12-01 Sam Weinig <sam@webkit.org>
Fix the iOS build. Fix the iOS build.
......
...@@ -132,7 +132,7 @@ void CoordinatedDrawingAreaProxy::deviceScaleFactorDidChange() ...@@ -132,7 +132,7 @@ void CoordinatedDrawingAreaProxy::deviceScaleFactorDidChange()
void CoordinatedDrawingAreaProxy::layerHostingModeDidChange() void CoordinatedDrawingAreaProxy::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());
} }
#if USE(ACCELERATED_COMPOSITING) #if USE(ACCELERATED_COMPOSITING)
...@@ -171,7 +171,7 @@ void CoordinatedDrawingAreaProxy::update(uint64_t backingStoreStateID, const Upd ...@@ -171,7 +171,7 @@ void CoordinatedDrawingAreaProxy::update(uint64_t backingStoreStateID, const Upd
// 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 CoordinatedDrawingAreaProxy::didUpdateBackingStoreState(uint64_t backingStoreStateID, const UpdateInfo& updateInfo, const LayerTreeContext& layerTreeContext) void CoordinatedDrawingAreaProxy::didUpdateBackingStoreState(uint64_t backingStoreStateID, const UpdateInfo& updateInfo, const LayerTreeContext& layerTreeContext)
...@@ -183,7 +183,7 @@ void CoordinatedDrawingAreaProxy::didUpdateBackingStoreState(uint64_t backingSto ...@@ -183,7 +183,7 @@ void CoordinatedDrawingAreaProxy::didUpdateBackingStoreState(uint64_t backingSto
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) {
...@@ -307,13 +307,13 @@ void CoordinatedDrawingAreaProxy::sendUpdateBackingStoreState(RespondImmediately ...@@ -307,13 +307,13 @@ void CoordinatedDrawingAreaProxy::sendUpdateBackingStoreState(RespondImmediately
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)
...@@ -331,7 +331,7 @@ void CoordinatedDrawingAreaProxy::waitForAndDispatchDidUpdateBackingStoreState() ...@@ -331,7 +331,7 @@ void CoordinatedDrawingAreaProxy::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)
...@@ -342,7 +342,7 @@ void CoordinatedDrawingAreaProxy::waitForAndDispatchDidUpdateBackingStoreState() ...@@ -342,7 +342,7 @@ void CoordinatedDrawingAreaProxy::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
} }
......
...@@ -38,12 +38,12 @@ CoordinatedLayerTreeHostProxy::CoordinatedLayerTreeHostProxy(CoordinatedDrawingA ...@@ -38,12 +38,12 @@ CoordinatedLayerTreeHostProxy::CoordinatedLayerTreeHostProxy(CoordinatedDrawingA
: m_drawingAreaProxy(drawingAreaProxy) : m_drawingAreaProxy(drawingAreaProxy)
, m_scene(adoptRef(new CoordinatedGraphicsScene(this))) , m_scene(adoptRef(new CoordinatedGraphicsScene(this)))
{ {
m_drawingAreaProxy->page()->process()->addMessageReceiver(Messages::CoordinatedLayerTreeHostProxy::messageReceiverName(), m_drawingAreaProxy->page()->pageID(), this); m_drawingAreaProxy->page()->process().addMessageReceiver(Messages::CoordinatedLayerTreeHostProxy::messageReceiverName(), m_drawingAreaProxy->page()->pageID(), this);
} }
CoordinatedLayerTreeHostProxy::~CoordinatedLayerTreeHostProxy() CoordinatedLayerTreeHostProxy::~CoordinatedLayerTreeHostProxy()
{ {
m_drawingAreaProxy->page()->process()->removeMessageReceiver(Messages::CoordinatedLayerTreeHostProxy::messageReceiverName(), m_drawingAreaProxy->page()->pageID()); m_drawingAreaProxy->page()->process().removeMessageReceiver(Messages::CoordinatedLayerTreeHostProxy::messageReceiverName(), m_drawingAreaProxy->page()->pageID());
m_scene->detach(); m_scene->detach();
} }
...@@ -74,19 +74,19 @@ void CoordinatedLayerTreeHostProxy::setVisibleContentsRect(const FloatRect& rect ...@@ -74,19 +74,19 @@ void CoordinatedLayerTreeHostProxy::setVisibleContentsRect(const FloatRect& rect
if (rect == m_lastSentVisibleRect && trajectoryVector == m_lastSentTrajectoryVector) if (rect == m_lastSentVisibleRect && trajectoryVector == m_lastSentTrajectoryVector)
return; return;
m_drawingAreaProxy->page()->process()->send(Messages::CoordinatedLayerTreeHost::SetVisibleContentsRect(rect, trajectoryVector), m_drawingAreaProxy->page()->pageID()); m_drawingAreaProxy->page()->process().send(Messages::CoordinatedLayerTreeHost::SetVisibleContentsRect(rect, trajectoryVector), m_drawingAreaProxy->page()->pageID());
m_lastSentVisibleRect = rect; m_lastSentVisibleRect = rect;
m_lastSentTrajectoryVector = trajectoryVector; m_lastSentTrajectoryVector = trajectoryVector;
} }
void CoordinatedLayerTreeHostProxy::renderNextFrame() void CoordinatedLayerTreeHostProxy::renderNextFrame()
{ {
m_drawingAreaProxy->page()->process()->send(Messages::CoordinatedLayerTreeHost::RenderNextFrame(), m_drawingAreaProxy->page()->pageID()); m_drawingAreaProxy->page()->process().send(Messages::CoordinatedLayerTreeHost::RenderNextFrame(), m_drawingAreaProxy->page()->pageID());
} }
void CoordinatedLayerTreeHostProxy::purgeBackingStores() void CoordinatedLayerTreeHostProxy::purgeBackingStores()
{ {
m_drawingAreaProxy->page()->process()->send(Messages::CoordinatedLayerTreeHost::PurgeBackingStores(), m_drawingAreaProxy->page()->pageID()); m_drawingAreaProxy->page()->process().send(Messages::CoordinatedLayerTreeHost::PurgeBackingStores(), m_drawingAreaProxy->page()->pageID());
} }
void CoordinatedLayerTreeHostProxy::setBackgroundColor(const Color& color) void CoordinatedLayerTreeHostProxy::setBackgroundColor(const Color& color)
...@@ -96,7 +96,7 @@ void CoordinatedLayerTreeHostProxy::setBackgroundColor(const Color& color) ...@@ -96,7 +96,7 @@ void CoordinatedLayerTreeHostProxy::setBackgroundColor(const Color& color)
void CoordinatedLayerTreeHostProxy::commitScrollOffset(uint32_t layerID, const IntSize& offset) void CoordinatedLayerTreeHostProxy::commitScrollOffset(uint32_t layerID, const IntSize& offset)
{ {
m_drawingAreaProxy->page()->process()->send(Messages::CoordinatedLayerTreeHost::CommitScrollOffset(layerID, offset), m_drawingAreaProxy->page()->pageID()); m_drawingAreaProxy->page()->process().send(Messages::CoordinatedLayerTreeHost::CommitScrollOffset(layerID, offset), m_drawingAreaProxy->page()->pageID());
} }
} }
......
...@@ -67,12 +67,12 @@ void WebTextChecker::grammarCheckingEnabledStateChanged(bool enabled) ...@@ -67,12 +67,12 @@ void WebTextChecker::grammarCheckingEnabledStateChanged(bool enabled)
updateStateForAllContexts(); updateStateForAllContexts();
} }
void WebTextChecker::checkSpelling(const WebPageProxy* page, bool startBeforeSelection) void WebTextChecker::checkSpelling(WebPageProxy* page, bool startBeforeSelection)
{ {
page->advanceToNextMisspelling(startBeforeSelection); page->advanceToNextMisspelling(startBeforeSelection);
} }
void WebTextChecker::changeSpellingToWord(const WebPageProxy* page, const String& text) void WebTextChecker::changeSpellingToWord(WebPageProxy* page, const String& text)
{ {
page->changeSpellingToWord(text); page->changeSpellingToWord(text);
} }
......
...@@ -45,8 +45,8 @@ public: ...@@ -45,8 +45,8 @@ public:
void continuousSpellCheckingEnabledStateChanged(bool); void continuousSpellCheckingEnabledStateChanged(bool);
void grammarCheckingEnabledStateChanged(bool); void grammarCheckingEnabledStateChanged(bool);
void checkSpelling(const WebPageProxy*, bool startBeforeSelection); void checkSpelling(WebPageProxy*, bool startBeforeSelection);
void changeSpellingToWord(const WebPageProxy*, const String&); void changeSpellingToWord(WebPageProxy*, const String&);
private: private:
WebTextChecker(); WebTextChecker();
......
...@@ -43,12 +43,12 @@ PassRefPtr<WebVibrationProxy> WebVibrationProxy::create(WebPageProxy* page) ...@@ -43,12 +43,12 @@ PassRefPtr<WebVibrationProxy> WebVibrationProxy::create(WebPageProxy* page)
WebVibrationProxy::WebVibrationProxy(WebPageProxy* page) WebVibrationProxy::WebVibrationProxy(WebPageProxy* page)
: m_page(page) : m_page(page)
{ {
m_page->process()->context()->addMessageReceiver(Messages::WebVibrationProxy::messageReceiverName(), m_page->pageID(), this); m_page->process().context().addMessageReceiver(Messages::WebVibrationProxy::messageReceiverName(), m_page->pageID(), this);
} }
WebVibrationProxy::~WebVibrationProxy() WebVibrationProxy::~WebVibrationProxy()
{ {
m_page->process()->context()->removeMessageReceiver(Messages::WebVibrationProxy::messageReceiverName(), m_page->pageID()); m_page->process().context().removeMessageReceiver(Messages::WebVibrationProxy::messageReceiverName(), m_page->pageID());
} }
void WebVibrationProxy::invalidate() void WebVibrationProxy::invalidate()
......
...@@ -38,7 +38,7 @@ namespace WebKit { ...@@ -38,7 +38,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;
} }
......
...@@ -105,7 +105,7 @@ WebPageProxy* WebInspectorProxy::platformCreateInspectorPage() ...@@ -105,7 +105,7 @@ WebPageProxy* WebInspectorProxy::platformCreateInspectorPage()
if (!m_inspectorWindow) if (!m_inspectorWindow)
return 0; return 0;
WKContextRef wkContext = toAPI(page()->process()->context()); WKContextRef wkContext = toAPI(&page()->process().context());
WKPageGroupRef wkPageGroup = toAPI(inspectorPageGroup()); WKPageGroupRef wkPageGroup = toAPI(inspectorPageGroup());
m_inspectorView = EWKViewCreate(wkContext, wkPageGroup, ecore_evas_get(m_inspectorWindow), /* smart */ 0); m_inspectorView = EWKViewCreate(wkContext, wkPageGroup, ecore_evas_get(m_inspectorWindow), /* smart */ 0);
......
...@@ -84,7 +84,7 @@ void WebPageProxy::setThemePath(const String& themePath) ...@@ -84,7 +84,7 @@ void WebPageProxy::setThemePath(const String& themePath)
if (!isValid()) if (!isValid())
return; return;
process()->send(Messages::WebPage::SetThemePath(themePath), m_pageID, 0); process().send(Messages::WebPage::SetThemePath(themePath), m_pageID, 0);
} }
void WebPageProxy::createPluginContainer(uint64_t&) void WebPageProxy::createPluginContainer(uint64_t&)
...@@ -107,7 +107,7 @@ void WebPageProxy::confirmComposition(const String& compositionString) ...@@ -107,7 +107,7 @@ void WebPageProxy::confirmComposition(const String& compositionString)
if (!isValid()) if (!isValid())
return; return;
process()->send(Messages::WebPage::ConfirmComposition(compositionString), m_pageID, 0); process().send(Messages::WebPage::ConfirmComposition(compositionString), m_pageID, 0);
} }
void WebPageProxy::setComposition(const String& compositionString, Vector<WebCore::CompositionUnderline>& underlines, int cursorPosition) void WebPageProxy::setComposition(const String& compositionString, Vector<WebCore::CompositionUnderline>& underlines, int cursorPosition)
...@@ -115,7 +115,7 @@ void WebPageProxy::setComposition(const String& compositionString, Vector<WebCor ...@@ -115,7 +115,7 @@ void WebPageProxy::setComposition(const String& compositionString, Vector<WebCor
if (!isValid()) if (!isValid())
return; return;
process()->send(Messages::WebPage::SetComposition(compositionString, underlines, cursorPosition), m_pageID, 0); process().send(Messages::WebPage::SetComposition(compositionString, underlines, cursorPosition), m_pageID, 0);
} }
void WebPageProxy::cancelComposition() void WebPageProxy::cancelComposition()
...@@ -123,7 +123,7 @@ void WebPageProxy::cancelComposition() ...@@ -123,7 +123,7 @@ void WebPageProxy::cancelComposition()
if (!isValid()) if (!isValid())
return; return;
process()->send(Messages::WebPage::CancelComposition(), m_pageID, 0); process().send(Messages::WebPage::CancelComposition(), m_pageID, 0);
} }
void WebPageProxy::initializeUIPopupMenuClient(const WKPageUIPopupMenuClient* client) void WebPageProxy::initializeUIPopupMenuClient(const WKPageUIPopupMenuClient* client)
......
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