[CoordinatedGraphics] Merge TILED_BACKING_STORE guard with COORDINATED_GRAPHICS
authorryuan.choi@navercorp.com <ryuan.choi@navercorp.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 29 Apr 2015 05:05:48 +0000 (05:05 +0000)
committerryuan.choi@navercorp.com <ryuan.choi@navercorp.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 29 Apr 2015 05:05:48 +0000 (05:05 +0000)
https://bugs.webkit.org/show_bug.cgi?id=143001

Reviewed by Gyuyoung Kim.

.:

* Source/cmake/OptionsEfl.cmake: Removed TILED_BACKING_STORE definition.
* Source/cmake/OptionsGTK.cmake: Ditto.

Source/WebCore:

TiledBackingStore has only been used by Coordinated Graphics since Qt and WebKit1/Efl were dropped.
So, this patch replaces USE(TILED_BACKING_STORE) with USE(COORDINATED_GRAPHICS) to merge the features.

In addition, this moves TiledBackingStore and related files from platform to platform/texmap/coordinated
where other coordinated graphics files are located.

* CMakeLists.txt: Move TiledBackingStore.cpp because this is not common file.
* PlatformEfl.cmake:
* PlatformGTK.cmake:
* WebCore.vcxproj/WebCore.vcxproj: Follow new location of TiledBackingStore* files.
* WebCore.vcxproj/WebCore.vcxproj.filters:
* loader/EmptyClients.h:
* page/Chrome.cpp:
* page/Chrome.h:
* page/ChromeClient.h:
* page/Frame.cpp:
(WebCore::Frame::createView):
* page/FrameView.cpp:
(WebCore::FrameView::requestScrollPositionUpdate):
* page/FrameView.h:
* page/Page.cpp:
(WebCore::Page::setPageScaleFactor):
* platform/HostWindow.h:
* platform/ScrollView.cpp:
(WebCore::ScrollView::unscaledVisibleContentSizeIncludingObscuredArea):
(WebCore::ScrollView::unscaledUnobscuredVisibleContentSize):
(WebCore::ScrollView::visibleContentRectInternal):
(WebCore::ScrollView::scrollTo):
* platform/ScrollView.h:
* platform/graphics/cairo/TileCairo.h: Removed because it is dead code since r169328
* platform/graphics/texmap/coordinated/Tile.h: Renamed from Source/WebCore/platform/graphics/Tile.h.
* platform/graphics/texmap/coordinated/TiledBackingStore.cpp: Renamed from Source/WebCore/platform/graphics/TiledBackingStore.cpp.
* platform/graphics/texmap/coordinated/TiledBackingStore.h: Renamed from Source/WebCore/platform/graphics/TiledBackingStore.h.
* platform/graphics/texmap/coordinated/TiledBackingStoreBackend.h: Renamed from Source/WebCore/platform/graphics/TiledBackingStoreBackend.h.
* platform/graphics/texmap/coordinated/TiledBackingStoreClient.h: Renamed from Source/WebCore/platform/graphics/TiledBackingStoreClient.h.

Source/WebKit/win:

* WebCoreSupport/WebChromeClient.h:
(WebChromeClient::delegatedScrollRequested):
Deleted because WIN does not use Coordinated Graphics.

Source/WebKit2:

* UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp:
(WebKit::CoordinatedLayerTreeHostProxy::commitCoordinatedGraphicsState):
* WebProcess/WebCoreSupport/WebChromeClient.cpp:
(WebKit::WebChromeClient::dispatchViewportPropertiesDidChange):
* WebProcess/WebCoreSupport/WebChromeClient.h:
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::dispatchDidLayout):
(WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::setSize):
(WebKit::WebPage::setUseFixedLayout):
(WebKit::WebPage::canHandleUserEvents):
* WebProcess/WebPage/WebPage.h:

Tools:

* WebKitTestRunner/TestController.cpp:
(WTR::shouldUseFixedLayout):

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

37 files changed:
ChangeLog
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/PlatformEfl.cmake
Source/WebCore/PlatformGTK.cmake
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
Source/WebCore/loader/EmptyClients.h
Source/WebCore/page/Chrome.cpp
Source/WebCore/page/Chrome.h
Source/WebCore/page/ChromeClient.h
Source/WebCore/page/Frame.cpp
Source/WebCore/page/FrameView.cpp
Source/WebCore/page/FrameView.h
Source/WebCore/page/Page.cpp
Source/WebCore/platform/HostWindow.h
Source/WebCore/platform/ScrollView.cpp
Source/WebCore/platform/ScrollView.h
Source/WebCore/platform/graphics/cairo/TileCairo.h [deleted file]
Source/WebCore/platform/graphics/texmap/coordinated/Tile.h [moved from Source/WebCore/platform/graphics/Tile.h with 98% similarity]
Source/WebCore/platform/graphics/texmap/coordinated/TiledBackingStore.cpp [moved from Source/WebCore/platform/graphics/TiledBackingStore.cpp with 98% similarity]
Source/WebCore/platform/graphics/texmap/coordinated/TiledBackingStore.h [moved from Source/WebCore/platform/graphics/TiledBackingStore.h with 95% similarity]
Source/WebCore/platform/graphics/texmap/coordinated/TiledBackingStoreBackend.h [moved from Source/WebCore/platform/graphics/TiledBackingStoreBackend.h with 97% similarity]
Source/WebCore/platform/graphics/texmap/coordinated/TiledBackingStoreClient.h [moved from Source/WebCore/platform/graphics/TiledBackingStoreClient.h with 95% similarity]
Source/WebKit/win/ChangeLog
Source/WebKit/win/WebCoreSupport/WebChromeClient.h
Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.h
Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
Source/WebKit2/WebProcess/WebPage/WebPage.cpp
Source/WebKit2/WebProcess/WebPage/WebPage.h
Source/cmake/OptionsEfl.cmake
Source/cmake/OptionsGTK.cmake
Tools/ChangeLog
Tools/WebKitTestRunner/TestController.cpp

index e541098..d3c4e51 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-04-28  Ryuan Choi  <ryuan.choi@navercorp.com>
+
+        [CoordinatedGraphics] Merge TILED_BACKING_STORE guard with COORDINATED_GRAPHICS
+        https://bugs.webkit.org/show_bug.cgi?id=143001
+
+        Reviewed by Gyuyoung Kim.
+
+        * Source/cmake/OptionsEfl.cmake: Removed TILED_BACKING_STORE definition.
+        * Source/cmake/OptionsGTK.cmake: Ditto.
+
 2015-04-28  Michael Catanzaro  <mcatanzaro@igalia.com>
 
         Unreviewed, fix typo in previous commit
index 7c8485c..3952674 100644 (file)
@@ -2157,7 +2157,6 @@ set(WebCore_SOURCES
     platform/graphics/StringTruncator.cpp
     platform/graphics/SurrogatePairAwareTextIterator.cpp
     platform/graphics/TextRun.cpp
-    platform/graphics/TiledBackingStore.cpp
     platform/graphics/WidthIterator.cpp
 
     platform/graphics/cpu/arm/filters/FELightingNEON.cpp
index 09fe48a..05410a1 100644 (file)
@@ -1,3 +1,46 @@
+2015-04-28  Ryuan Choi  <ryuan.choi@navercorp.com>
+
+        [CoordinatedGraphics] Merge TILED_BACKING_STORE guard with COORDINATED_GRAPHICS
+        https://bugs.webkit.org/show_bug.cgi?id=143001
+
+        Reviewed by Gyuyoung Kim.
+
+        TiledBackingStore has only been used by Coordinated Graphics since Qt and WebKit1/Efl were dropped.
+        So, this patch replaces USE(TILED_BACKING_STORE) with USE(COORDINATED_GRAPHICS) to merge the features.
+
+        In addition, this moves TiledBackingStore and related files from platform to platform/texmap/coordinated
+        where other coordinated graphics files are located.
+
+        * CMakeLists.txt: Move TiledBackingStore.cpp because this is not common file.
+        * PlatformEfl.cmake:
+        * PlatformGTK.cmake:
+        * WebCore.vcxproj/WebCore.vcxproj: Follow new location of TiledBackingStore* files.
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * loader/EmptyClients.h:
+        * page/Chrome.cpp:
+        * page/Chrome.h:
+        * page/ChromeClient.h:
+        * page/Frame.cpp:
+        (WebCore::Frame::createView):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::requestScrollPositionUpdate):
+        * page/FrameView.h:
+        * page/Page.cpp:
+        (WebCore::Page::setPageScaleFactor):
+        * platform/HostWindow.h:
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::unscaledVisibleContentSizeIncludingObscuredArea):
+        (WebCore::ScrollView::unscaledUnobscuredVisibleContentSize):
+        (WebCore::ScrollView::visibleContentRectInternal):
+        (WebCore::ScrollView::scrollTo):
+        * platform/ScrollView.h:
+        * platform/graphics/cairo/TileCairo.h: Removed because it is dead code since r169328
+        * platform/graphics/texmap/coordinated/Tile.h: Renamed from Source/WebCore/platform/graphics/Tile.h.
+        * platform/graphics/texmap/coordinated/TiledBackingStore.cpp: Renamed from Source/WebCore/platform/graphics/TiledBackingStore.cpp.
+        * platform/graphics/texmap/coordinated/TiledBackingStore.h: Renamed from Source/WebCore/platform/graphics/TiledBackingStore.h.
+        * platform/graphics/texmap/coordinated/TiledBackingStoreBackend.h: Renamed from Source/WebCore/platform/graphics/TiledBackingStoreBackend.h.
+        * platform/graphics/texmap/coordinated/TiledBackingStoreClient.h: Renamed from Source/WebCore/platform/graphics/TiledBackingStoreClient.h.
+
 2015-04-28  Brent Fulgham  <bfulgham@apple.com>
 
         REGRESSION(180076): [Mac, iOS] Correct possible null dereference in printing code
index cf7d718..0b91499 100644 (file)
@@ -192,6 +192,7 @@ list(APPEND WebCore_SOURCES
     platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp
     platform/graphics/texmap/coordinated/CoordinatedSurface.cpp
     platform/graphics/texmap/coordinated/CoordinatedTile.cpp
+    platform/graphics/texmap/coordinated/TiledBackingStore.cpp
     platform/graphics/texmap/coordinated/UpdateAtlas.cpp
 
     platform/image-decoders/ImageDecoder.cpp
index a692f9b..f306a9b 100644 (file)
@@ -398,13 +398,13 @@ if (ENABLE_THREADED_COMPOSITOR)
         page/scrolling/ScrollingThread.cpp
         page/scrolling/ScrollingTreeNode.cpp
         page/scrolling/ScrollingTreeScrollingNode.cpp
-        platform/graphics/TiledBackingStore.cpp
         platform/graphics/texmap/coordinated/AreaAllocator.cpp
         platform/graphics/texmap/coordinated/CompositingCoordinator.cpp
         platform/graphics/texmap/coordinated/CoordinatedGraphicsLayer.cpp
         platform/graphics/texmap/coordinated/CoordinatedImageBacking.cpp
         platform/graphics/texmap/coordinated/CoordinatedSurface.cpp
         platform/graphics/texmap/coordinated/CoordinatedTile.cpp
+        platform/graphics/texmap/coordinated/TiledBackingStore.cpp
         platform/graphics/texmap/coordinated/UpdateAtlas.cpp
     )
 endif ()
index af4d20d..fb7e543 100644 (file)
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
     </ClCompile>
-    <ClCompile Include="..\platform\graphics\TiledBackingStore.cpp" />
+    <ClCompile Include="..\platform\graphics\texmap\coordinated\TiledBackingStore.cpp" />
     <ClCompile Include="..\platform\graphics\win\GraphicsContext3DWin.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
     <ClInclude Include="..\platform\graphics\texmap\TextureMapperTile.h" />
     <ClInclude Include="..\platform\graphics\texmap\TextureMapperTiledBackingStore.h" />
     <ClInclude Include="..\platform\graphics\TiledBacking.h" />
-    <ClInclude Include="..\platform\graphics\TiledBackingStore.h" />
-    <ClInclude Include="..\platform\graphics\TiledBackingStoreBackend.h" />
-    <ClInclude Include="..\platform\graphics\TiledBackingStoreClient.h" />
+    <ClInclude Include="..\platform\graphics\texmap\coordinated\TiledBackingStore.h" />
+    <ClInclude Include="..\platform\graphics\texmap\coordinated\TiledBackingStoreBackend.h" />
+    <ClInclude Include="..\platform\graphics\texmap\coordinated\TiledBackingStoreClient.h" />
     <ClInclude Include="..\platform\graphics\TrackBasePrivate.h" />
     <ClInclude Include="..\platform\graphics\VideoTrackPrivate.h" />
     <ClInclude Include="..\platform\graphics\win\MediaPlayerPrivateMediaFoundation.h" />
index 96bda4d..f51a964 100644 (file)
     <ClCompile Include="..\platform\graphics\GraphicsLayerTransform.cpp">
       <Filter>platform\graphics</Filter>
     </ClCompile>
-    <ClCompile Include="..\platform\graphics\TiledBackingStore.cpp">
-      <Filter>platform\graphics</Filter>
+    <ClCompile Include="..\platform\graphics\texmap\coordinated\TiledBackingStore.cpp">
+      <Filter>platform\graphics\texmap\coordinated</Filter>
     </ClCompile>
     <ClCompile Include="..\page\scrolling\ScrollingStateFixedNode.cpp">
       <Filter>page\scrolling</Filter>
     <ClInclude Include="..\platform\graphics\TiledBacking.h">
       <Filter>platform\graphics</Filter>
     </ClInclude>
-    <ClInclude Include="..\platform\graphics\TiledBackingStore.h">
-      <Filter>platform\graphics</Filter>
+    <ClInclude Include="..\platform\graphics\texmap\coordinated\TiledBackingStore.h">
+      <Filter>platform\graphics\texmap\coordinated</Filter>
     </ClInclude>
-    <ClInclude Include="..\platform\graphics\TiledBackingStoreBackend.h">
-      <Filter>platform\graphics</Filter>
+    <ClInclude Include="..\platform\graphics\texmap\coordinated\TiledBackingStoreBackend.h">
+      <Filter>platform\graphics\texmap\coordinated</Filter>
     </ClInclude>
-    <ClInclude Include="..\platform\graphics\TiledBackingStoreClient.h">
-      <Filter>platform\graphics</Filter>
+    <ClInclude Include="..\platform\graphics\texmap\coordinated\TiledBackingStoreClient.h">
+      <Filter>platform\graphics\texmap\coordinated</Filter>
     </ClInclude>
     <ClInclude Include="..\page\scrolling\ScrollingStateFixedNode.h">
       <Filter>page\scrolling</Filter>
index 1dfe2a2..87d14a7 100644 (file)
@@ -132,7 +132,7 @@ public:
     virtual void invalidateContentsAndRootView(const IntRect&) override { }
     virtual void invalidateContentsForSlowScroll(const IntRect&) override { }
     virtual void scroll(const IntSize&, const IntRect&, const IntRect&) override { }
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
     virtual void delegatedScrollRequested(const IntPoint&) { }
 #endif
 #if ENABLE(REQUEST_ANIMATION_FRAME) && !USE(REQUEST_ANIMATION_FRAME_TIMER)
index 13e6d05..be285fd 100644 (file)
@@ -97,7 +97,7 @@ void Chrome::scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, con
     InspectorInstrumentation::didScroll(m_page);
 }
 
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
 void Chrome::delegatedScrollRequested(const IntPoint& scrollPoint)
 {
     m_client.delegatedScrollRequested(scrollPoint);
index 98ab745..b157262 100644 (file)
@@ -74,7 +74,7 @@ public:
     virtual void invalidateContentsAndRootView(const IntRect&) override;
     virtual void invalidateContentsForSlowScroll(const IntRect&) override;
     virtual void scroll(const IntSize&, const IntRect&, const IntRect&) override;
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
     virtual void delegatedScrollRequested(const IntPoint& scrollPoint) override;
 #endif
     virtual IntPoint screenToRootView(const IntPoint&) const override;
index 536959f..5284dd4 100644 (file)
@@ -162,7 +162,7 @@ public:
     virtual void invalidateContentsAndRootView(const IntRect&) = 0;
     virtual void invalidateContentsForSlowScroll(const IntRect&) = 0;
     virtual void scroll(const IntSize&, const IntRect&, const IntRect&) = 0;
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
     virtual void delegatedScrollRequested(const IntPoint&) = 0;
 #endif
     virtual IntPoint screenToRootView(const IntPoint&) const = 0;
@@ -344,7 +344,7 @@ public:
     virtual void setRootFullScreenLayer(GraphicsLayer*) { }
 #endif
 
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
     virtual IntRect visibleRectForTiledBackingStore() const { return IntRect(); }
 #endif
 
index 4219cf7..e591cf4 100644 (file)
@@ -895,7 +895,7 @@ void Frame::createView(const IntSize& viewportSize, const Color& backgroundColor
     if (isMainFrame) {
         frameView = FrameView::create(*this, viewportSize);
         frameView->setFixedLayoutSize(fixedLayoutSize);
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
         frameView->setFixedVisibleContentRect(fixedVisibleContentRect);
 #else
         UNUSED_PARAM(fixedVisibleContentRect);
index 8e42a60..1b1a9a5 100644 (file)
@@ -92,7 +92,7 @@
 #include <wtf/Ref.h>
 #include <wtf/TemporaryChange.h>
 
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
 #include "TiledBackingStore.h"
 #endif
 
@@ -2054,7 +2054,7 @@ void FrameView::delegatesScrollingDidChange()
         clearBackingStores();
 }
 
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
 void FrameView::setFixedVisibleContentRect(const IntRect& visibleContentRect)
 {
     bool visibleContentSizeDidChange = false;
@@ -2237,7 +2237,7 @@ bool FrameView::requestScrollPositionUpdate(const IntPoint& position)
         tiledBacking->prepopulateRect(FloatRect(position, visibleContentRect().size()));
 #endif
 
-#if ENABLE(ASYNC_SCROLLING) || USE(TILED_BACKING_STORE)
+#if ENABLE(ASYNC_SCROLLING) || USE(COORDINATED_GRAPHICS)
     if (Page* page = frame().page()) {
         if (ScrollingCoordinator* scrollingCoordinator = page->scrollingCoordinator())
             return scrollingCoordinator->requestScrollPositionUpdate(*this, position);
index 06a7229..9c89220 100644 (file)
@@ -233,7 +233,7 @@ public:
 
     virtual float visibleContentScaleFactor() const override;
 
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
     virtual void setFixedVisibleContentRect(const IntRect&) override;
 #endif
     WEBCORE_EXPORT virtual void setScrollPosition(const IntPoint&) override;
index 5f0b813..d699eaa 100644 (file)
@@ -778,7 +778,7 @@ void Page::setPageScaleFactor(float scale, const IntPoint& origin, bool inStable
 
             if (!view->delegatesScrolling())
                 view->setScrollPosition(origin);
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
             else
                 view->requestScrollPositionUpdate(origin);
 #endif
@@ -815,7 +815,7 @@ void Page::setPageScaleFactor(float scale, const IntPoint& origin, bool inStable
 
         if (!view->delegatesScrolling())
             view->setScrollPosition(origin);
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
         else
             view->requestScrollPositionUpdate(origin);
 #endif
index 380a15c..082928b 100644 (file)
@@ -50,7 +50,7 @@ public:
     // Requests the host invalidate the contents, not the root view. This is the slow path for scrolling.
     virtual void invalidateContentsForSlowScroll(const IntRect& updateRect) = 0;
 
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
     // Requests the host to do the actual scrolling. This is only used in combination with a tiled backing store.
     virtual void delegatedScrollRequested(const IntPoint& scrollPoint) = 0;
 #endif
index cd0e13b..67ea7d2 100644 (file)
@@ -271,7 +271,7 @@ IntSize ScrollView::unscaledVisibleContentSizeIncludingObscuredArea(VisibleConte
     if (platformWidget())
         return platformVisibleContentSizeIncludingObscuredArea(scrollbarInclusion == IncludeScrollbars);
 
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
     if (!m_fixedVisibleContentRect.isEmpty())
         return m_fixedVisibleContentRect.size();
 #endif
@@ -296,7 +296,7 @@ IntSize ScrollView::unscaledUnobscuredVisibleContentSize(VisibleContentRectInclu
     if (platformWidget())
         return platformVisibleContentSize(scrollbarInclusion == IncludeScrollbars);
 
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
     if (!m_fixedVisibleContentRect.isEmpty())
         return visibleContentSize;
 #endif
@@ -322,7 +322,7 @@ IntRect ScrollView::visibleContentRectInternal(VisibleContentRectIncludesScrollb
     if (platformWidget())
         return platformVisibleContentRect(scrollbarInclusion == IncludeScrollbars);
 
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
     if (!m_fixedVisibleContentRect.isEmpty())
         return m_fixedVisibleContentRect;
 #endif
@@ -503,7 +503,7 @@ void ScrollView::scrollTo(const IntSize& newOffset)
     if (scrollbarsSuppressed())
         return;
 
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
     if (delegatesScrolling()) {
         requestScrollPositionUpdate(IntPoint(newOffset));
         return;
index 28e8676..fcfe373 100644 (file)
@@ -172,7 +172,7 @@ public:
     // which usually will happen when panning, pinching and rotation ends, or when scale or position are changed manually.
     virtual IntSize visibleSize() const override { return visibleContentRect(LegacyIOSDocumentVisibleRect).size(); }
 
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
     virtual void setFixedVisibleContentRect(const IntRect& visibleContentRect) { m_fixedVisibleContentRect = visibleContentRect; }
     IntRect fixedVisibleContentRect() const { return m_fixedVisibleContentRect; }
 #endif
diff --git a/Source/WebCore/platform/graphics/cairo/TileCairo.h b/Source/WebCore/platform/graphics/cairo/TileCairo.h
deleted file mode 100644 (file)
index c72ffb2..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2011 Samsung Electronics
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef TileCairo_h
-#define TileCairo_h
-
-#if USE(TILED_BACKING_STORE) && USE(CAIRO)
-
-#include "IntPoint.h"
-#include "IntRect.h"
-#include "RefPtrCairo.h"
-#include "Tile.h"
-#include <cairo.h>
-#include <wtf/PassRefPtr.h>
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-class TiledBackingStore;
-
-class TileCairo : public Tile {
-public:
-    static PassRefPtr<Tile> create(TiledBackingStore* backingStore, const Coordinate& tileCoordinate)
-    {
-        return adoptRef(new TileCairo(backingStore, tileCoordinate));
-    }
-    virtual ~TileCairo();
-
-    virtual bool isDirty() const;
-    virtual void invalidate(const IntRect&);
-    virtual Vector<IntRect> updateBackBuffer();
-    virtual void swapBackBufferToFront();
-    virtual bool isReadyToPaint() const;
-    virtual void paint(GraphicsContext*, const IntRect&);
-
-    virtual const Tile::Coordinate& coordinate() const { return m_coordinate; }
-    virtual const IntRect& rect() const { return m_rect; }
-    virtual void resize(const WebCore::IntSize&);
-
-protected:
-    TileCairo(TiledBackingStore*, const Coordinate&);
-
-    TiledBackingStore* m_backingStore;
-    Coordinate m_coordinate;
-    IntRect m_rect;
-
-    RefPtr<cairo_surface_t> m_buffer;
-    RefPtr<cairo_region_t> m_dirtyRegion;
-};
-
-} // namespace WebCore
-
-#endif // USE(TILED_BACKING_STORE) && USE(CAIRO)
-
-#endif // TileCairo_h
@@ -20,7 +20,7 @@
 #ifndef Tile_h
 #define Tile_h
 
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
 
 #include "IntPoint.h"
 #include "IntPointHash.h"
@@ -20,7 +20,7 @@
 #include "config.h"
 #include "TiledBackingStore.h"
 
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
 
 #include "GraphicsContext.h"
 #include "TiledBackingStoreClient.h"
@@ -344,8 +344,7 @@ void TiledBackingStore::computeCoverAndKeepRect(const IntRect& visibleRect, IntR
 
             // Unite the visible rect with a "ghost" of the visible rect moved in the direction of the trajectory vector.
             coverRect = visibleRect;
-            coverRect.move(coverRect.width() * m_trajectoryVector.x() * trajectoryVectorMultiplier,
-                           coverRect.height() * m_trajectoryVector.y() * trajectoryVectorMultiplier);
+            coverRect.move(coverRect.width() * m_trajectoryVector.x() * trajectoryVectorMultiplier, coverRect.height() * m_trajectoryVector.y() * trajectoryVectorMultiplier);
 
             coverRect.unite(visibleRect);
         }
@@ -444,9 +443,9 @@ IntRect TiledBackingStore::mapFromContents(const IntRect& rect) const
 IntRect TiledBackingStore::tileRectForCoordinate(const Tile::Coordinate& coordinate) const
 {
     IntRect rect(coordinate.x() * m_tileSize.width(),
-                 coordinate.y() * m_tileSize.height(),
-                 m_tileSize.width(),
-                 m_tileSize.height());
+        coordinate.y() * m_tileSize.height(),
+        m_tileSize.width(),
+        m_tileSize.height());
 
     rect.intersect(m_rect);
     return rect;
@@ -20,7 +20,7 @@
 #ifndef TiledBackingStore_h
 #define TiledBackingStore_h
 
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
 
 #include "FloatPoint.h"
 #include "IntPoint.h"
@@ -81,8 +81,8 @@ private:
     void setKeepRect(const IntRect&);
 
     PassRefPtr<Tile> tileAt(const Tile::Coordinate&) const;
-    void setTile(const Tile::Coordinate& coordinate, PassRefPtr<Tile> tile);
-    void removeTile(const Tile::Coordinate& coordinate);
+    void setTile(const Tile::Coordinate&, PassRefPtr<Tile>);
+    void removeTile(const Tile::Coordinate&);
 
     IntRect visibleRect() const;
 
@@ -22,7 +22,7 @@
 
 namespace WebCore {
 
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
 
 class Color;
 class GraphicsContext;
@@ -39,8 +39,6 @@ public:
     virtual Color tiledBackingStoreBackgroundColor() const = 0;
 };
 
-#else
-class TiledBackingStoreClient {};
 #endif
 
 }
index e116f98..0eef39a 100644 (file)
@@ -1,3 +1,14 @@
+2015-04-28  Ryuan Choi  <ryuan.choi@navercorp.com>
+
+        [CoordinatedGraphics] Merge TILED_BACKING_STORE guard with COORDINATED_GRAPHICS
+        https://bugs.webkit.org/show_bug.cgi?id=143001
+
+        Reviewed by Gyuyoung Kim.
+
+        * WebCoreSupport/WebChromeClient.h:
+        (WebChromeClient::delegatedScrollRequested):
+        Deleted because WIN does not use Coordinated Graphics.
+
 2015-04-28  Joseph Pecoraro  <pecoraro@apple.com>
 
         Fix common typo "targetting" => "targeting"
index 19bb4a8..b0d8c88 100644 (file)
@@ -134,10 +134,6 @@ public:
     // to do an eager layout before the drawing.
     virtual void scheduleCompositingLayerFlush();
 
-#if USE(TILED_BACKING_STORE)
-    virtual void delegatedScrollRequested(const WebCore::IntPoint&) { }
-#endif
-
 #if PLATFORM(WIN) && USE(AVFOUNDATION)
     virtual WebCore::GraphicsDeviceAdapter* graphicsDeviceAdapter() const override;
 #endif
index f7fe38a..24e283a 100644 (file)
@@ -1,3 +1,24 @@
+2015-04-28  Ryuan Choi  <ryuan.choi@navercorp.com>
+
+        [CoordinatedGraphics] Merge TILED_BACKING_STORE guard with COORDINATED_GRAPHICS
+        https://bugs.webkit.org/show_bug.cgi?id=143001
+
+        Reviewed by Gyuyoung Kim.
+
+        * UIProcess/CoordinatedGraphics/CoordinatedLayerTreeHostProxy.cpp:
+        (WebKit::CoordinatedLayerTreeHostProxy::commitCoordinatedGraphicsState):
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::dispatchViewportPropertiesDidChange):
+        * WebProcess/WebCoreSupport/WebChromeClient.h:
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::dispatchDidLayout):
+        (WebKit::WebFrameLoaderClient::transitionToCommittedForNewPage):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::setSize):
+        (WebKit::WebPage::setUseFixedLayout):
+        (WebKit::WebPage::canHandleUserEvents):
+        * WebProcess/WebPage/WebPage.h:
+
 2015-04-28  Timothy Horton  <timothy_horton@apple.com>
 
         [TextIndicator] Yellow highlight takes too long to fade out on scroll
index 9c71f91..ca51bd3 100644 (file)
@@ -65,7 +65,7 @@ void CoordinatedLayerTreeHostProxy::commitCoordinatedGraphicsState(const Coordin
     });
 
     updateViewport();
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
     m_drawingAreaProxy->page().didRenderFrame(graphicsState.contentsSize, graphicsState.coveredRect);
 #endif
 }
index 17a1ce7..9017e29 100644 (file)
@@ -475,7 +475,7 @@ void WebChromeClient::scroll(const IntSize& scrollDelta, const IntRect& scrollRe
     m_page->drawingArea()->scroll(intersection(scrollRect, clipRect), scrollDelta);
 }
 
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
 void WebChromeClient::delegatedScrollRequested(const IntPoint& scrollOffset)
 {
     m_page->pageDidRequestScroll(scrollOffset);
@@ -962,7 +962,7 @@ void WebChromeClient::dispatchViewportPropertiesDidChange(const ViewportArgument
 #if PLATFORM(IOS)
     m_page->viewportPropertiesDidChange(viewportArguments);
 #endif
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
     if (!m_page->useFixedLayout())
         return;
 
index 1e596cb..0918b96 100644 (file)
@@ -112,7 +112,7 @@ private:
     virtual void invalidateContentsAndRootView(const WebCore::IntRect&) override;
     virtual void invalidateContentsForSlowScroll(const WebCore::IntRect&) override;
     virtual void scroll(const WebCore::IntSize& scrollDelta, const WebCore::IntRect& scrollRect, const WebCore::IntRect& clipRect) override;
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
     virtual void delegatedScrollRequested(const WebCore::IntPoint& scrollOffset) override;
 #endif
     virtual WebCore::IntPoint screenToRootView(const WebCore::IntPoint&) const override;
index 9a474e0..64238bf 100644 (file)
@@ -585,7 +585,7 @@ void WebFrameLoaderClient::dispatchDidLayout(LayoutMilestones milestones)
         }
 #endif
 
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
         // Make sure viewport properties are dispatched on the main frame by the time the first layout happens.
         ASSERT(!webPage->useFixedLayout() || m_frame != m_frame->page()->mainWebFrame() || m_frame->coreFrame()->document()->didDispatchViewportPropertiesChanged());
 #endif
@@ -1261,7 +1261,7 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage()
     bool shouldHideScrollbars = shouldDisableScrolling;
     IntRect fixedVisibleContentRect;
 
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
     if (m_frame->coreFrame()->view())
         fixedVisibleContentRect = m_frame->coreFrame()->view()->fixedVisibleContentRect();
     if (shouldUseFixedLayout)
@@ -1297,7 +1297,7 @@ void WebFrameLoaderClient::transitionToCommittedForNewPage()
     if (webPage->scrollPinningBehavior() != DoNotPin)
         m_frame->coreFrame()->view()->setScrollPinningBehavior(webPage->scrollPinningBehavior());
 
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
     if (shouldUseFixedLayout) {
         m_frame->coreFrame()->view()->setDelegatesScrolling(shouldUseFixedLayout);
         m_frame->coreFrame()->view()->setPaintsEntireContents(shouldUseFixedLayout);
index d5eba04..e472ffc 100644 (file)
@@ -1210,13 +1210,13 @@ void WebPage::setSize(const WebCore::IntSize& viewSize)
     
     m_viewSize = viewSize;
 
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
     if (view->useFixedLayout())
         sendViewportAttributesChanged();
 #endif
 }
 
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
 void WebPage::setFixedVisibleContentRect(const IntRect& rect)
 {
     ASSERT(m_useFixedLayout);
@@ -1491,7 +1491,7 @@ void WebPage::setUseFixedLayout(bool fixed)
     m_page->settings().setScrollingCoordinatorEnabled(fixed);
 #endif
 
-#if USE(TILED_BACKING_STORE) && ENABLE(SMOOTH_SCROLLING)
+#if USE(COORDINATED_GRAPHICS) && ENABLE(SMOOTH_SCROLLING)
     // Delegated scrolling will be enabled when the FrameView is created if fixed layout is enabled.
     // Ensure we don't do animated scrolling in the WebProcess in that case.
     m_page->settings().setScrollAnimatorEnabled(!fixed);
@@ -1501,7 +1501,7 @@ void WebPage::setUseFixedLayout(bool fixed)
     if (!view)
         return;
 
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
     view->setDelegatesScrolling(fixed);
     view->setPaintsEntireContents(fixed);
 #endif
@@ -1785,7 +1785,7 @@ void WebPage::pageDidScroll()
     send(Messages::WebPageProxy::PageDidScroll());
 }
 
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
 void WebPage::pageDidRequestScroll(const IntPoint& point)
 {
 #if USE(COORDINATED_GRAPHICS_MULTIPROCESS)
@@ -2292,7 +2292,7 @@ void WebPage::setCanStartMediaTimerFired()
 
 inline bool WebPage::canHandleUserEvents() const
 {
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
     // Should apply only if the area was frozen by didStartPageTransition().
     return !m_drawingArea->layerTreeStateIsFrozen();
 #endif
index 05a4c67..c3156d5 100644 (file)
@@ -550,7 +550,7 @@ public:
     NotificationPermissionRequestManager* notificationPermissionRequestManager();
 
     void pageDidScroll();
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
     void pageDidRequestScroll(const WebCore::IntPoint&);
     void setFixedVisibleContentRect(const WebCore::IntRect&);
     void sendViewportAttributesChanged();
index e65a032..062c9e8 100644 (file)
@@ -230,7 +230,6 @@ endif ()
 add_definitions(-DWTF_USE_COORDINATED_GRAPHICS=1)
 add_definitions(-DWTF_USE_COORDINATED_GRAPHICS_MULTIPROCESS=1)
 add_definitions(-DWTF_USE_TEXTURE_MAPPER=1)
-add_definitions(-DWTF_USE_TILED_BACKING_STORE=1)
 
 set(ENABLE_GRAPHICS_CONTEXT_3D 1)
 add_definitions(-DENABLE_GRAPHICS_CONTEXT_3D=1)
index bbf5c07..da3cb27 100644 (file)
@@ -326,7 +326,6 @@ if (ENABLE_OPENGL)
         SET_AND_EXPOSE_TO_BUILD(WTF_USE_GLX TRUE)
     endif ()
 
-    SET_AND_EXPOSE_TO_BUILD(WTF_USE_TILED_BACKING_STORE ${ENABLE_THREADED_COMPOSITOR})
     SET_AND_EXPOSE_TO_BUILD(WTF_USE_COORDINATED_GRAPHICS ${ENABLE_THREADED_COMPOSITOR})
     SET_AND_EXPOSE_TO_BUILD(WTF_USE_COORDINATED_GRAPHICS_THREADED ${ENABLE_THREADED_COMPOSITOR})
 endif ()
index 71543f1..efeb551 100644 (file)
@@ -1,3 +1,13 @@
+2015-04-28  Ryuan Choi  <ryuan.choi@navercorp.com>
+
+        [CoordinatedGraphics] Merge TILED_BACKING_STORE guard with COORDINATED_GRAPHICS
+        https://bugs.webkit.org/show_bug.cgi?id=143001
+
+        Reviewed by Gyuyoung Kim.
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::shouldUseFixedLayout):
+
 2015-04-28  Dewei Zhu  <dewei_zhu@apple.com>
 
         Increase stablility of run-benchmark script
index 342751a..53442ad 100644 (file)
@@ -764,7 +764,7 @@ static bool shouldUseFixedLayout(const TestInvocation& test)
         return true;
 #endif
 
-#if USE(TILED_BACKING_STORE) && PLATFORM(EFL)
+#if USE(COORDINATED_GRAPHICS) && PLATFORM(EFL)
     if (test.urlContains("sticky/") || test.urlContains("sticky\\"))
         return true;
 #endif