Changeset 130216 in webkit


Ignore:
Timestamp:
Oct 2, 2012, 3:09:06 PM (13 years ago)
Author:
Hugo Parente Lima
Message:

[WK2] Move some tiled backing store/viewport functions from Qt to generic WebKit2 sources
​https://bugs.webkit.org/show_bug.cgi?id=98199

Reviewed by Noam Rosenthal.

Move commitPageTransitionViewport from Qt to WebKit2.

  • UIProcess/WebPageProxy.cpp:

(WebKit):
(WebKit::WebPageProxy::commitPageTransitionViewport):

  • UIProcess/qt/WebPageProxyQt.cpp:
  • WebProcess/WebPage/WebPage.cpp:

(WebKit):
(WebKit::WebPage::commitPageTransitionViewport):

  • WebProcess/WebPage/WebPage.h:

(WebPage):

  • WebProcess/WebPage/WebPage.messages.in:
  • WebProcess/WebPage/qt/WebPageQt.cpp:
Location:
trunk/Source/WebKit2
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r130215 r130216  
     12012-10-02  Hugo Parente Lima  <hugo.lima@openbossa.org>
     2
     3        [WK2] Move some tiled backing store/viewport functions from Qt to generic WebKit2 sources
     4        https://bugs.webkit.org/show_bug.cgi?id=98199
     5
     6        Reviewed by Noam Rosenthal.
     7
     8        Move commitPageTransitionViewport from Qt to WebKit2.
     9
     10        * UIProcess/WebPageProxy.cpp:
     11        (WebKit):
     12        (WebKit::WebPageProxy::commitPageTransitionViewport):
     13        * UIProcess/qt/WebPageProxyQt.cpp:
     14        * WebProcess/WebPage/WebPage.cpp:
     15        (WebKit):
     16        (WebKit::WebPage::commitPageTransitionViewport):
     17        * WebProcess/WebPage/WebPage.h:
     18        (WebPage):
     19        * WebProcess/WebPage/WebPage.messages.in:
     20        * WebProcess/WebPage/qt/WebPageQt.cpp:
     21
    1222012-10-02  Anders Carlsson  <andersca@apple.com>
    223

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

    r130214 r130216  
    946946    m_process->send(Messages::WebPage::SetViewportSize(size), m_pageID);
    947947}
     948
     949void WebPageProxy::commitPageTransitionViewport()
     950{
     951    if (!isValid())
     952        return;
     953
     954    process()->send(Messages::WebPage::CommitPageTransitionViewport(), m_pageID);
     955}
    948956#endif
    949957

  • trunk/Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp

    r130033 r130216  
    5959{
    6060    notImplemented();
    61 }
    62 
    63 void WebPageProxy::commitPageTransitionViewport()
    64 {
    65     if (!isValid())
    66         return;
    67 
    68     process()->send(Messages::WebPage::CommitPageTransitionViewport(), m_pageID);
    6961}
    7062

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

    r130029 r130216  
    31863186}
    31873187
     3188#if USE(TILED_BACKING_STORE)
     3189void WebPage::commitPageTransitionViewport()
     3190{
     3191    m_drawingArea->setLayerTreeStateIsFrozen(false);
     3192}
     3193#endif
     3194
    31883195#if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
    31893196void WebPage::handleAlternativeTextUIResult(const String& result)

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

    r130029 r130216  
    418418#endif
    419419
     420#if USE(TILED_BACKING_STORE)
     421    void commitPageTransitionViewport();
     422#endif
     423
    420424#if PLATFORM(QT)
    421     void commitPageTransitionViewport();
    422425    void setComposition(const String& text, Vector<WebCore::CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd);
    423426    void confirmComposition(const String& text, int64_t selectionStart, int64_t selectionLength);

  • trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in

    r130029 r130216  
    244244#endif
    245245
     246#if USE(TILED_BACKING_STORE)
     247    CommitPageTransitionViewport()
     248#endif
     249
    246250#if PLATFORM(QT)
    247     CommitPageTransitionViewport()
    248251    SetComposition(WTF::String text, WTF::Vector<WebCore::CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd)
    249252    ConfirmComposition(WTF::String text, int64_t selectionStart, int64_t selectionLength)

  • trunk/Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp

    r130029 r130216  
    309309}
    310310
    311 void WebPage::commitPageTransitionViewport()
    312 {
    313     m_drawingArea->setLayerTreeStateIsFrozen(false);
    314 }
    315 
    316311static Frame* targetFrameForEditing(WebPage* page)
    317312{
Note: See TracChangeset for help on using the changeset viewer.