Changeset 173166 in webkit


Ignore:
Timestamp:
Sep 1, 2014 7:05:04 PM (10 years ago)
Author:
commit-queue@webkit.org
Message:

Build break on the EFL port since r173163
​https://bugs.webkit.org/show_bug.cgi?id=136443

Unreviewed build fix.

Patch by Ryuan Choi <​ryuan.choi@gmail.com> on 2014-09-01

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

Location:
trunk/Source/WebKit2
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r173165 r173166  
     12014-09-01  Ryuan Choi  <ryuan.choi@gmail.com>
     2
     3        Build break on the EFL port since r173163
     4        https://bugs.webkit.org/show_bug.cgi?id=136443
     5
     6        Unreviewed build fix.
     7
     8        * UIProcess/BackingStore.cpp:
     9        (WebKit::BackingStore::BackingStore):
     10        * UIProcess/BackingStore.h:
     11        * UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp:
     12        (WebKit::CoordinatedDrawingAreaProxy::CoordinatedDrawingAreaProxy):
     13        (WebKit::CoordinatedDrawingAreaProxy::updateViewport):
     14        (WebKit::CoordinatedDrawingAreaProxy::contentsRect):
     15        (WebKit::CoordinatedDrawingAreaProxy::update):
     16        (WebKit::CoordinatedDrawingAreaProxy::didUpdateBackingStoreState):
     17        (WebKit::CoordinatedDrawingAreaProxy::incorporateUpdate):
     18        (WebKit::CoordinatedDrawingAreaProxy::sendUpdateBackingStoreState):
     19        (WebKit::CoordinatedDrawingAreaProxy::waitForAndDispatchDidUpdateBackingStoreState):
     20        (WebKit::CoordinatedDrawingAreaProxy::enterAcceleratedCompositingMode):
     21        (WebKit::CoordinatedDrawingAreaProxy::exitAcceleratedCompositingMode):
     22        (WebKit::CoordinatedDrawingAreaProxy::updateAcceleratedCompositingMode):
     23        * UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h:
     24        (WebKit::CoordinatedDrawingAreaProxy::page):
     25        * UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp:
     26        (WebKit::CoordinatedLayerTreeHostProxy::CoordinatedLayerTreeHostProxy):
     27        (WebKit::CoordinatedLayerTreeHostProxy::~CoordinatedLayerTreeHostProxy):
     28        (WebKit::CoordinatedLayerTreeHostProxy::commitCoordinatedGraphicsState):
     29        (WebKit::CoordinatedLayerTreeHostProxy::setVisibleContentsRect):
     30        (WebKit::CoordinatedLayerTreeHostProxy::renderNextFrame):
     31        (WebKit::CoordinatedLayerTreeHostProxy::purgeBackingStores):
     32        (WebKit::CoordinatedLayerTreeHostProxy::commitScrollOffset):
     33        * UIProcess/CoordinatedGraphics/WebView.cpp:
     34        (WebKit::WebView::createDrawingAreaProxy):
     35        * UIProcess/cairo/BackingStoreCairo.cpp:
     36        (WebKit::BackingStore::incorporateUpdate):
     37
    1382014-09-01  Tim Horton  <timothy_horton@apple.com>
    239

  • trunk/Source/WebKit2/UIProcess/BackingStore.cpp

    r156688 r173166  
    3434namespace WebKit {
    3535
    36 BackingStore::BackingStore(const IntSize& size, float deviceScaleFactor, WebPageProxy* webPageProxy)
     36BackingStore::BackingStore(const IntSize& size, float deviceScaleFactor, WebPageProxy& webPageProxy)
    3737    : m_size(size)
    3838    , m_deviceScaleFactor(deviceScaleFactor)

  • trunk/Source/WebKit2/UIProcess/BackingStore.h

    r166138 r173166  
    4646
    4747public:
    48     BackingStore(const WebCore::IntSize&, float deviceScaleFactor, WebPageProxy*);
     48    BackingStore(const WebCore::IntSize&, float deviceScaleFactor, WebPageProxy&);
    4949    ~BackingStore();
    5050
    … …  
    6565    WebCore::IntSize m_size;
    6666    float m_deviceScaleFactor;
    67     WebPageProxy* m_webPageProxy;
     67    WebPageProxy& m_webPageProxy;
    6868
    6969#if USE(CAIRO)

  • trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.cpp

    r164844 r173166  
    4545namespace WebKit {
    4646
    47 CoordinatedDrawingAreaProxy::CoordinatedDrawingAreaProxy(WebPageProxy* webPageProxy)
     47CoordinatedDrawingAreaProxy::CoordinatedDrawingAreaProxy(WebPageProxy& webPageProxy)
    4848    : DrawingAreaProxy(DrawingAreaTypeCoordinated, webPageProxy)
    4949    , m_currentBackingStoreStateID(0)
    … …  
    5555{
    5656    // Construct the proxy early to allow messages to be sent to the web process while AC is entered there.
    57     if (webPageProxy->pageGroup().preferences().forceCompositingMode())
     57    if (webPageProxy.pageGroup().preferences().forceCompositingMode())
    5858        m_coordinatedLayerTreeHostProxy = adoptPtr(new CoordinatedLayerTreeHostProxy(this));
    5959}
    … …  
    111111void CoordinatedDrawingAreaProxy::updateViewport()
    112112{
    113     m_webPageProxy->setViewNeedsDisplay(viewportVisibleRect());
     113    m_webPageProxy.setViewNeedsDisplay(viewportVisibleRect());
    114114}
    115115
    116116WebCore::IntRect CoordinatedDrawingAreaProxy::contentsRect() const
    117117{
    118     return IntRect(IntPoint::zero(), m_webPageProxy->viewSize());
     118    return IntRect(IntPoint::zero(), m_webPageProxy.viewSize());
    119119}
    120120
    … …  
    163163
    164164    incorporateUpdate(updateInfo);
    165     m_webPageProxy->process().send(Messages::DrawingArea::DidUpdate(), m_webPageProxy->pageID());
     165    m_webPageProxy.process().send(Messages::DrawingArea::DidUpdate(), m_webPageProxy.pageID());
    166166}
    167167
    … …  
    175175
    176176    // Stop the responsiveness timer that was started in sendUpdateBackingStoreState.
    177     m_webPageProxy->process().responsivenessTimer()->stop();
     177    m_webPageProxy.process().responsivenessTimer()->stop();
    178178
    179179    if (layerTreeContext != m_layerTreeContext) {
    … …  
    249249
    250250    if (shouldScroll)
    251         m_webPageProxy->scrollView(updateInfo.scrollRect, updateInfo.scrollOffset);
    252 
    253     if (shouldScroll && !m_webPageProxy->canScrollView())
    254         m_webPageProxy->setViewNeedsDisplay(IntRect(IntPoint(), m_webPageProxy->viewSize()));
     251        m_webPageProxy.scrollView(updateInfo.scrollRect, updateInfo.scrollOffset);
     252
     253    if (shouldScroll && !m_webPageProxy.canScrollView())
     254        m_webPageProxy.setViewNeedsDisplay(IntRect(IntPoint(), m_webPageProxy.viewSize()));
    255255    else {
    256256        for (size_t i = 0; i < updateInfo.updateRects.size(); ++i)
    257             m_webPageProxy->setViewNeedsDisplay(updateInfo.updateRects[i]);
     257            m_webPageProxy.setViewNeedsDisplay(updateInfo.updateRects[i]);
    258258    }
    259259
    260260    if (shouldScroll)
    261         m_webPageProxy->displayView();
     261        m_webPageProxy.displayView();
    262262}
    263263
    … …  
    272272    ASSERT(m_currentBackingStoreStateID < m_nextBackingStoreStateID);
    273273
    274     if (!m_webPageProxy->isValid())
     274    if (!m_webPageProxy.isValid())
    275275        return;
    276276
    … …  
    278278        return;
    279279
    280     if (m_webPageProxy->viewSize().isEmpty() && !m_webPageProxy->useFixedLayout())
     280    if (m_webPageProxy.viewSize().isEmpty() && !m_webPageProxy.useFixedLayout())
    281281        return;
    282282
    283283    m_isWaitingForDidUpdateBackingStoreState = respondImmediatelyOrNot == RespondImmediately;
    284284
    285     m_webPageProxy->process().send(Messages::DrawingArea::UpdateBackingStoreState(m_nextBackingStoreStateID, respondImmediatelyOrNot == RespondImmediately, m_webPageProxy->deviceScaleFactor(), m_size, m_scrollOffset), m_webPageProxy->pageID());
     285    m_webPageProxy.process().send(Messages::DrawingArea::UpdateBackingStoreState(m_nextBackingStoreStateID, respondImmediatelyOrNot == RespondImmediately, m_webPageProxy.deviceScaleFactor(), m_size, m_scrollOffset), m_webPageProxy.pageID());
    286286    m_scrollOffset = IntSize();
    287287
    … …  
    289289        // Start the responsiveness timer. We will stop it when we hear back from the WebProcess
    290290        // in didUpdateBackingStoreState.
    291         m_webPageProxy->process().responsivenessTimer()->start();
     291        m_webPageProxy.process().responsivenessTimer()->start();
    292292    }
    293293
    … …  
    303303    ASSERT(m_isWaitingForDidUpdateBackingStoreState);
    304304
    305     if (!m_webPageProxy->isValid())
    306         return;
    307     if (m_webPageProxy->process().state() == WebProcessProxy::State::Launching)
     305    if (!m_webPageProxy.isValid())
     306        return;
     307    if (m_webPageProxy.process().state() == WebProcessProxy::State::Launching)
    308308        return;
    309309
    … …  
    314314
    315315    // The timeout, in seconds, we use when waiting for a DidUpdateBackingStoreState message when we're asked to paint.
    316     m_webPageProxy->process().connection()->waitForAndDispatchImmediately<Messages::DrawingAreaProxy::DidUpdateBackingStoreState>(m_webPageProxy->pageID(), std::chrono::milliseconds(500));
     316    m_webPageProxy.process().connection()->waitForAndDispatchImmediately<Messages::DrawingAreaProxy::DidUpdateBackingStoreState>(m_webPageProxy.pageID(), std::chrono::milliseconds(500));
    317317}
    318318
    … …  
    323323    m_backingStore = nullptr;
    324324    m_layerTreeContext = layerTreeContext;
    325     m_webPageProxy->enterAcceleratedCompositingMode(layerTreeContext);
     325    m_webPageProxy.enterAcceleratedCompositingMode(layerTreeContext);
    326326    if (!m_coordinatedLayerTreeHostProxy)
    327327        m_coordinatedLayerTreeHostProxy = adoptPtr(new CoordinatedLayerTreeHostProxy(this));
    … …  
    339339
    340340    m_layerTreeContext = LayerTreeContext();
    341     m_webPageProxy->exitAcceleratedCompositingMode();
     341    m_webPageProxy.exitAcceleratedCompositingMode();
    342342}
    343343
    … …  
    347347
    348348    m_layerTreeContext = layerTreeContext;
    349     m_webPageProxy->updateAcceleratedCompositingMode(layerTreeContext);
     349    m_webPageProxy.updateAcceleratedCompositingMode(layerTreeContext);
    350350}
    351351

  • trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedDrawingAreaProxy.h

    r163079 r173166  
    4646class CoordinatedDrawingAreaProxy : public DrawingAreaProxy {
    4747public:
    48     explicit CoordinatedDrawingAreaProxy(WebPageProxy*);
     48    explicit CoordinatedDrawingAreaProxy(WebPageProxy&);
    4949    virtual ~CoordinatedDrawingAreaProxy();
    5050
    … …  
    6464    void updateViewport();
    6565
    66     WebPageProxy* page() { return m_webPageProxy; }
     66    WebPageProxy& page() { return m_webPageProxy; }
    6767private:
    6868    // DrawingAreaProxy

  • trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp

    r170774 r173166  
    3939    , m_scene(adoptRef(new CoordinatedGraphicsScene(this)))
    4040{
    41     m_drawingAreaProxy->page()->process().addMessageReceiver(Messages::CoordinatedLayerTreeHostProxy::messageReceiverName(), m_drawingAreaProxy->page()->pageID(), *this);
     41    m_drawingAreaProxy->page().process().addMessageReceiver(Messages::CoordinatedLayerTreeHostProxy::messageReceiverName(), m_drawingAreaProxy->page().pageID(), *this);
    4242}
    4343
    4444CoordinatedLayerTreeHostProxy::~CoordinatedLayerTreeHostProxy()
    4545{
    46     m_drawingAreaProxy->page()->process().removeMessageReceiver(Messages::CoordinatedLayerTreeHostProxy::messageReceiverName(), m_drawingAreaProxy->page()->pageID());
     46    m_drawingAreaProxy->page().process().removeMessageReceiver(Messages::CoordinatedLayerTreeHostProxy::messageReceiverName(), m_drawingAreaProxy->page().pageID());
    4747    m_scene->detach();
    4848}
    … …  
    6767    updateViewport();
    6868#if USE(TILED_BACKING_STORE)
    69     m_drawingAreaProxy->page()->didRenderFrame(graphicsState.contentsSize, graphicsState.coveredRect);
     69    m_drawingAreaProxy->page().didRenderFrame(graphicsState.contentsSize, graphicsState.coveredRect);
    7070#endif
    7171}
    … …  
    8383        return;
    8484
    85     m_drawingAreaProxy->page()->process().send(Messages::CoordinatedLayerTreeHost::SetVisibleContentsRect(rect, trajectoryVector), m_drawingAreaProxy->page()->pageID());
     85    m_drawingAreaProxy->page().process().send(Messages::CoordinatedLayerTreeHost::SetVisibleContentsRect(rect, trajectoryVector), m_drawingAreaProxy->page().pageID());
    8686    m_lastSentVisibleRect = rect;
    8787    m_lastSentTrajectoryVector = trajectoryVector;
    … …  
    9090void CoordinatedLayerTreeHostProxy::renderNextFrame()
    9191{
    92     m_drawingAreaProxy->page()->process().send(Messages::CoordinatedLayerTreeHost::RenderNextFrame(), m_drawingAreaProxy->page()->pageID());
     92    m_drawingAreaProxy->page().process().send(Messages::CoordinatedLayerTreeHost::RenderNextFrame(), m_drawingAreaProxy->page().pageID());
    9393}
    9494
    9595void CoordinatedLayerTreeHostProxy::purgeBackingStores()
    9696{
    97     m_drawingAreaProxy->page()->process().send(Messages::CoordinatedLayerTreeHost::PurgeBackingStores(), m_drawingAreaProxy->page()->pageID());
     97    m_drawingAreaProxy->page().process().send(Messages::CoordinatedLayerTreeHost::PurgeBackingStores(), m_drawingAreaProxy->page().pageID());
    9898}
    9999
    … …  
    108108void CoordinatedLayerTreeHostProxy::commitScrollOffset(uint32_t layerID, const IntSize& offset)
    109109{
    110     m_drawingAreaProxy->page()->process().send(Messages::CoordinatedLayerTreeHost::CommitScrollOffset(layerID, offset), m_drawingAreaProxy->page()->pageID());
     110    m_drawingAreaProxy->page().process().send(Messages::CoordinatedLayerTreeHost::CommitScrollOffset(layerID, offset), m_drawingAreaProxy->page().pageID());
    111111}
    112112

  • trunk/Source/WebKit2/UIProcess/CoordinatedGraphics/WebView.cpp

    r170774 r173166  
    287287std::unique_ptr<DrawingAreaProxy> WebView::createDrawingAreaProxy()
    288288{
    289     return std::make_unique<CoordinatedDrawingAreaProxy>(page());
     289    return std::make_unique<CoordinatedDrawingAreaProxy>(*m_page);
    290290}
    291291

  • trunk/Source/WebKit2/UIProcess/cairo/BackingStoreCairo.cpp

    r169445 r173166  
    7474    if (!m_backingStore)
    7575#if PLATFORM(EFL)
    76         m_backingStore = WidgetBackingStoreCairo::create(EwkView::toEvasObject(toAPI(m_webPageProxy)), size(), deviceScaleFactor());
     76        m_backingStore = WidgetBackingStoreCairo::create(EwkView::toEvasObject(toAPI(&m_webPageProxy)), size(), deviceScaleFactor());
    7777#else
    78         m_backingStore = createBackingStoreForGTK(m_webPageProxy->viewWidget(), size(), deviceScaleFactor());
     78        m_backingStore = createBackingStoreForGTK(m_webPageProxy.viewWidget(), size(), deviceScaleFactor());
    7979#endif
    8080
Note: See TracChangeset for help on using the changeset viewer.