Diff
Modified: trunk/Source/WebKit2/ChangeLog (173165 => 173166)
--- trunk/Source/WebKit2/ChangeLog 2014-09-02 00:12:06 UTC (rev 173165)
+++ trunk/Source/WebKit2/ChangeLog 2014-09-02 02:05:04 UTC (rev 173166)
@@ -1,3 +1,40 @@
+2014-09-01 Ryuan Choi <[email protected]>
+
+ Build break on the EFL port since r173163
+ https://bugs.webkit.org/show_bug.cgi?id=136443
+
+ Unreviewed build fix.
+
+ * UIProcess/BackingStore.cpp:
+ (WebKit::BackingStore::BackingStore):
+ * UIProcess/BackingStore.h:
+ * UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp:
+ (WebKit::CoordinatedDrawingAreaProxy::CoordinatedDrawingAreaProxy):
+ (WebKit::CoordinatedDrawingAreaProxy::updateViewport):
+ (WebKit::CoordinatedDrawingAreaProxy::contentsRect):
+ (WebKit::CoordinatedDrawingAreaProxy::update):
+ (WebKit::CoordinatedDrawingAreaProxy::didUpdateBackingStoreState):
+ (WebKit::CoordinatedDrawingAreaProxy::incorporateUpdate):
+ (WebKit::CoordinatedDrawingAreaProxy::sendUpdateBackingStoreState):
+ (WebKit::CoordinatedDrawingAreaProxy::waitForAndDispatchDidUpdateBackingStoreState):
+ (WebKit::CoordinatedDrawingAreaProxy::enterAcceleratedCompositingMode):
+ (WebKit::CoordinatedDrawingAreaProxy::exitAcceleratedCompositingMode):
+ (WebKit::CoordinatedDrawingAreaProxy::updateAcceleratedCompositingMode):
+ * UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h:
+ (WebKit::CoordinatedDrawingAreaProxy::page):
+ * UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp:
+ (WebKit::CoordinatedLayerTreeHostProxy::CoordinatedLayerTreeHostProxy):
+ (WebKit::CoordinatedLayerTreeHostProxy::~CoordinatedLayerTreeHostProxy):
+ (WebKit::CoordinatedLayerTreeHostProxy::commitCoordinatedGraphicsState):
+ (WebKit::CoordinatedLayerTreeHostProxy::setVisibleContentsRect):
+ (WebKit::CoordinatedLayerTreeHostProxy::renderNextFrame):
+ (WebKit::CoordinatedLayerTreeHostProxy::purgeBackingStores):
+ (WebKit::CoordinatedLayerTreeHostProxy::commitScrollOffset):
+ * UIProcess/CoordinatedGraphics/WebView.cpp:
+ (WebKit::WebView::createDrawingAreaProxy):
+ * UIProcess/cairo/BackingStoreCairo.cpp:
+ (WebKit::BackingStore::incorporateUpdate):
+
2014-09-01 Tim Horton <[email protected]>
Remove two unused WebKit2 PDF-related preferences
Modified: trunk/Source/WebKit2/UIProcess/BackingStore.cpp (173165 => 173166)
--- trunk/Source/WebKit2/UIProcess/BackingStore.cpp 2014-09-02 00:12:06 UTC (rev 173165)
+++ trunk/Source/WebKit2/UIProcess/BackingStore.cpp 2014-09-02 02:05:04 UTC (rev 173166)
@@ -33,7 +33,7 @@
namespace WebKit {
-BackingStore::BackingStore(const IntSize& size, float deviceScaleFactor, WebPageProxy* webPageProxy)
+BackingStore::BackingStore(const IntSize& size, float deviceScaleFactor, WebPageProxy& webPageProxy)
: m_size(size)
, m_deviceScaleFactor(deviceScaleFactor)
, m_webPageProxy(webPageProxy)
Modified: trunk/Source/WebKit2/UIProcess/BackingStore.h (173165 => 173166)
--- trunk/Source/WebKit2/UIProcess/BackingStore.h 2014-09-02 00:12:06 UTC (rev 173165)
+++ trunk/Source/WebKit2/UIProcess/BackingStore.h 2014-09-02 02:05:04 UTC (rev 173166)
@@ -45,7 +45,7 @@
WTF_MAKE_NONCOPYABLE(BackingStore);
public:
- BackingStore(const WebCore::IntSize&, float deviceScaleFactor, WebPageProxy*);
+ BackingStore(const WebCore::IntSize&, float deviceScaleFactor, WebPageProxy&);
~BackingStore();
const WebCore::IntSize& size() const { return m_size; }
@@ -64,7 +64,7 @@
WebCore::IntSize m_size;
float m_deviceScaleFactor;
- WebPageProxy* m_webPageProxy;
+ WebPageProxy& m_webPageProxy;
#if USE(CAIRO)
OwnPtr<WebCore::WidgetBackingStore> m_backingStore;
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp (173165 => 173166)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp 2014-09-02 00:12:06 UTC (rev 173165)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp 2014-09-02 02:05:04 UTC (rev 173166)
@@ -44,7 +44,7 @@
namespace WebKit {
-CoordinatedDrawingAreaProxy::CoordinatedDrawingAreaProxy(WebPageProxy* webPageProxy)
+CoordinatedDrawingAreaProxy::CoordinatedDrawingAreaProxy(WebPageProxy& webPageProxy)
: DrawingAreaProxy(DrawingAreaTypeCoordinated, webPageProxy)
, m_currentBackingStoreStateID(0)
, m_nextBackingStoreStateID(0)
@@ -54,7 +54,7 @@
, m_discardBackingStoreTimer(RunLoop::current(), this, &CoordinatedDrawingAreaProxy::discardBackingStore)
{
// Construct the proxy early to allow messages to be sent to the web process while AC is entered there.
- if (webPageProxy->pageGroup().preferences().forceCompositingMode())
+ if (webPageProxy.pageGroup().preferences().forceCompositingMode())
m_coordinatedLayerTreeHostProxy = adoptPtr(new CoordinatedLayerTreeHostProxy(this));
}
@@ -110,12 +110,12 @@
void CoordinatedDrawingAreaProxy::updateViewport()
{
- m_webPageProxy->setViewNeedsDisplay(viewportVisibleRect());
+ m_webPageProxy.setViewNeedsDisplay(viewportVisibleRect());
}
WebCore::IntRect CoordinatedDrawingAreaProxy::contentsRect() const
{
- return IntRect(IntPoint::zero(), m_webPageProxy->viewSize());
+ return IntRect(IntPoint::zero(), m_webPageProxy.viewSize());
}
void CoordinatedDrawingAreaProxy::sizeDidChange()
@@ -162,7 +162,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 CoordinatedDrawingAreaProxy::didUpdateBackingStoreState(uint64_t backingStoreStateID, const UpdateInfo& updateInfo, const LayerTreeContext& layerTreeContext)
@@ -174,7 +174,7 @@
m_isWaitingForDidUpdateBackingStoreState = false;
// Stop the responsiveness timer that was started in sendUpdateBackingStoreState.
- m_webPageProxy->process().responsivenessTimer()->stop();
+ m_webPageProxy.process().responsivenessTimer()->stop();
if (layerTreeContext != m_layerTreeContext) {
if (!m_layerTreeContext.isEmpty()) {
@@ -248,17 +248,17 @@
bool shouldScroll = !updateInfo.scrollRect.isEmpty();
if (shouldScroll)
- m_webPageProxy->scrollView(updateInfo.scrollRect, updateInfo.scrollOffset);
+ m_webPageProxy.scrollView(updateInfo.scrollRect, updateInfo.scrollOffset);
- if (shouldScroll && !m_webPageProxy->canScrollView())
- m_webPageProxy->setViewNeedsDisplay(IntRect(IntPoint(), m_webPageProxy->viewSize()));
+ if (shouldScroll && !m_webPageProxy.canScrollView())
+ m_webPageProxy.setViewNeedsDisplay(IntRect(IntPoint(), m_webPageProxy.viewSize()));
else {
for (size_t i = 0; i < updateInfo.updateRects.size(); ++i)
- m_webPageProxy->setViewNeedsDisplay(updateInfo.updateRects[i]);
+ m_webPageProxy.setViewNeedsDisplay(updateInfo.updateRects[i]);
}
if (shouldScroll)
- m_webPageProxy->displayView();
+ m_webPageProxy.displayView();
}
void CoordinatedDrawingAreaProxy::backingStoreStateDidChange(RespondImmediatelyOrNot respondImmediatelyOrNot)
@@ -271,24 +271,24 @@
{
ASSERT(m_currentBackingStoreStateID < m_nextBackingStoreStateID);
- if (!m_webPageProxy->isValid())
+ if (!m_webPageProxy.isValid())
return;
if (m_isWaitingForDidUpdateBackingStoreState)
return;
- if (m_webPageProxy->viewSize().isEmpty() && !m_webPageProxy->useFixedLayout())
+ if (m_webPageProxy.viewSize().isEmpty() && !m_webPageProxy.useFixedLayout())
return;
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 (m_isWaitingForDidUpdateBackingStoreState && !m_layerTreeContext.isEmpty()) {
@@ -302,9 +302,9 @@
{
ASSERT(m_isWaitingForDidUpdateBackingStoreState);
- if (!m_webPageProxy->isValid())
+ if (!m_webPageProxy.isValid())
return;
- if (m_webPageProxy->process().state() == WebProcessProxy::State::Launching)
+ if (m_webPageProxy.process().state() == WebProcessProxy::State::Launching)
return;
// FIXME: waitForAndDispatchImmediately will always return the oldest DidUpdateBackingStoreState message that
@@ -313,7 +313,7 @@
// choose the most recent one, or the one that is closest to our current size.
// The timeout, in seconds, we use when waiting for a DidUpdateBackingStoreState message when we're asked to paint.
- m_webPageProxy->process().connection()->waitForAndDispatchImmediately<Messages::DrawingAreaProxy::DidUpdateBackingStoreState>(m_webPageProxy->pageID(), std::chrono::milliseconds(500));
+ m_webPageProxy.process().connection()->waitForAndDispatchImmediately<Messages::DrawingAreaProxy::DidUpdateBackingStoreState>(m_webPageProxy.pageID(), std::chrono::milliseconds(500));
}
void CoordinatedDrawingAreaProxy::enterAcceleratedCompositingMode(const LayerTreeContext& layerTreeContext)
@@ -322,7 +322,7 @@
m_backingStore = nullptr;
m_layerTreeContext = layerTreeContext;
- m_webPageProxy->enterAcceleratedCompositingMode(layerTreeContext);
+ m_webPageProxy.enterAcceleratedCompositingMode(layerTreeContext);
if (!m_coordinatedLayerTreeHostProxy)
m_coordinatedLayerTreeHostProxy = adoptPtr(new CoordinatedLayerTreeHostProxy(this));
}
@@ -338,7 +338,7 @@
ASSERT(isInAcceleratedCompositingMode());
m_layerTreeContext = LayerTreeContext();
- m_webPageProxy->exitAcceleratedCompositingMode();
+ m_webPageProxy.exitAcceleratedCompositingMode();
}
void CoordinatedDrawingAreaProxy::updateAcceleratedCompositingMode(const LayerTreeContext& layerTreeContext)
@@ -346,7 +346,7 @@
ASSERT(isInAcceleratedCompositingMode());
m_layerTreeContext = layerTreeContext;
- m_webPageProxy->updateAcceleratedCompositingMode(layerTreeContext);
+ m_webPageProxy.updateAcceleratedCompositingMode(layerTreeContext);
}
void CoordinatedDrawingAreaProxy::discardBackingStoreSoon()
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h (173165 => 173166)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h 2014-09-02 00:12:06 UTC (rev 173165)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h 2014-09-02 02:05:04 UTC (rev 173166)
@@ -45,7 +45,7 @@
class CoordinatedDrawingAreaProxy : public DrawingAreaProxy {
public:
- explicit CoordinatedDrawingAreaProxy(WebPageProxy*);
+ explicit CoordinatedDrawingAreaProxy(WebPageProxy&);
virtual ~CoordinatedDrawingAreaProxy();
void paint(BackingStore::PlatformGraphicsContext, const WebCore::IntRect&, WebCore::Region& unpaintedRegion);
@@ -63,7 +63,7 @@
WebCore::IntRect contentsRect() const;
void updateViewport();
- WebPageProxy* page() { return m_webPageProxy; }
+ WebPageProxy& page() { return m_webPageProxy; }
private:
// DrawingAreaProxy
virtual void sizeDidChange();
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp (173165 => 173166)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp 2014-09-02 00:12:06 UTC (rev 173165)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp 2014-09-02 02:05:04 UTC (rev 173166)
@@ -38,12 +38,12 @@
: m_drawingAreaProxy(drawingAreaProxy)
, 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()
{
- 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();
}
@@ -66,7 +66,7 @@
updateViewport();
#if USE(TILED_BACKING_STORE)
- m_drawingAreaProxy->page()->didRenderFrame(graphicsState.contentsSize, graphicsState.coveredRect);
+ m_drawingAreaProxy->page().didRenderFrame(graphicsState.contentsSize, graphicsState.coveredRect);
#endif
}
@@ -82,19 +82,19 @@
if (rect == m_lastSentVisibleRect && trajectoryVector == m_lastSentTrajectoryVector)
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_lastSentTrajectoryVector = trajectoryVector;
}
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()
{
- 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)
@@ -107,7 +107,7 @@
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());
}
}
Modified: trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp (173165 => 173166)
--- trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2014-09-02 00:12:06 UTC (rev 173165)
+++ trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp 2014-09-02 02:05:04 UTC (rev 173166)
@@ -286,7 +286,7 @@
std::unique_ptr<DrawingAreaProxy> WebView::createDrawingAreaProxy()
{
- return std::make_unique<CoordinatedDrawingAreaProxy>(page());
+ return std::make_unique<CoordinatedDrawingAreaProxy>(*m_page);
}
void WebView::setViewNeedsDisplay(const WebCore::IntRect& area)
Modified: trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp (173165 => 173166)
--- trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp 2014-09-02 00:12:06 UTC (rev 173165)
+++ trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp 2014-09-02 02:05:04 UTC (rev 173166)
@@ -73,9 +73,9 @@
{
if (!m_backingStore)
#if PLATFORM(EFL)
- m_backingStore = WidgetBackingStoreCairo::create(EwkView::toEvasObject(toAPI(m_webPageProxy)), size(), deviceScaleFactor());
+ m_backingStore = WidgetBackingStoreCairo::create(EwkView::toEvasObject(toAPI(&m_webPageProxy)), size(), deviceScaleFactor());
#else
- m_backingStore = createBackingStoreForGTK(m_webPageProxy->viewWidget(), size(), deviceScaleFactor());
+ m_backingStore = createBackingStoreForGTK(m_webPageProxy.viewWidget(), size(), deviceScaleFactor());
#endif
scroll(updateInfo.scrollRect, updateInfo.scrollOffset);
