[WK2] Move some tiled backing store/viewport functions from Qt to generic WebKit2...
authorhugo.lima@openbossa.org <hugo.lima@openbossa.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 2 Oct 2012 22:09:06 +0000 (22:09 +0000)
committerhugo.lima@openbossa.org <hugo.lima@openbossa.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 2 Oct 2012 22:09:06 +0000 (22:09 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@130216 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/WebPageProxy.cpp
Source/WebKit2/UIProcess/qt/WebPageProxyQt.cpp
Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Source/WebKit2/WebProcess/WebPage/WebPage.h
Source/WebKit2/WebProcess/WebPage/WebPage.messages.in
Source/WebKit2/WebProcess/WebPage/qt/WebPageQt.cpp

index 193e74a..bb3700a 100644 (file)
@@ -1,3 +1,24 @@
+2012-10-02  Hugo Parente Lima  <hugo.lima@openbossa.org>
+
+        [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:
+
 2012-10-02  Anders Carlsson  <andersca@apple.com>
 
         Build fixes.
index 9cb7b1d..ea268bb 100644 (file)
@@ -945,6 +945,14 @@ void WebPageProxy::setViewportSize(const IntSize& size)
 
     m_process->send(Messages::WebPage::SetViewportSize(size), m_pageID);
 }
+
+void WebPageProxy::commitPageTransitionViewport()
+{
+    if (!isValid())
+        return;
+
+    process()->send(Messages::WebPage::CommitPageTransitionViewport(), m_pageID);
+}
 #endif
 
 #if ENABLE(DRAG_SUPPORT)
index dfa3f1c..e5a7829 100644 (file)
@@ -60,14 +60,6 @@ void WebPageProxy::loadRecentSearches(const String&, Vector<String>&)
     notImplemented();
 }
 
-void WebPageProxy::commitPageTransitionViewport()
-{
-    if (!isValid())
-        return;
-
-    process()->send(Messages::WebPage::CommitPageTransitionViewport(), m_pageID);
-}
-
 void WebPageProxy::setComposition(const String& text, Vector<CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd)
 {
     // FIXME: We need to find out how to proper handle the crashes case.
index 3d39db2..5c4f6e8 100644 (file)
@@ -3185,6 +3185,13 @@ bool WebPage::canHandleRequest(const WebCore::ResourceRequest& request)
     return platformCanHandleRequest(request);
 }
 
+#if USE(TILED_BACKING_STORE)
+void WebPage::commitPageTransitionViewport()
+{
+    m_drawingArea->setLayerTreeStateIsFrozen(false);
+}
+#endif
+
 #if PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
 void WebPage::handleAlternativeTextUIResult(const String& result)
 {
index 9d4dd46..e24c655 100644 (file)
@@ -417,8 +417,11 @@ public:
     void setThemePath(const String&);
 #endif
 
-#if PLATFORM(QT)
+#if USE(TILED_BACKING_STORE)
     void commitPageTransitionViewport();
+#endif
+
+#if PLATFORM(QT)
     void setComposition(const String& text, Vector<WebCore::CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd);
     void confirmComposition(const String& text, int64_t selectionStart, int64_t selectionLength);
     void cancelComposition();
index d97ad31..f11e97a 100644 (file)
@@ -243,8 +243,11 @@ messages -> WebPage {
     SetThemePath(WTF::String themePath)
 #endif
 
-#if PLATFORM(QT)
+#if USE(TILED_BACKING_STORE)
     CommitPageTransitionViewport()
+#endif
+
+#if PLATFORM(QT)
     SetComposition(WTF::String text, WTF::Vector<WebCore::CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd)
     ConfirmComposition(WTF::String text, int64_t selectionStart, int64_t selectionLength)
     CancelComposition()
index 08b5021..76fb074 100644 (file)
@@ -308,11 +308,6 @@ PassRefPtr<SharedBuffer> WebPage::cachedResponseDataForURL(const KURL&)
     return 0;
 }
 
-void WebPage::commitPageTransitionViewport()
-{
-    m_drawingArea->setLayerTreeStateIsFrozen(false);
-}
-
 static Frame* targetFrameForEditing(WebPage* page)
 {
     Frame* targetFrame = page->corePage()->focusController()->focusedOrMainFrame();