[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.
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: http://svn.webkit.org/repository/webkit/trunk@183529 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/platform/ScrollView.cpp b/Source/WebCore/platform/ScrollView.cpp
index cd0e13b..67ea7d2 100644
--- a/Source/WebCore/platform/ScrollView.cpp
+++ b/Source/WebCore/platform/ScrollView.cpp
@@ -271,7 +271,7 @@
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 @@
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 @@
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 @@
if (scrollbarsSuppressed())
return;
-#if USE(TILED_BACKING_STORE)
+#if USE(COORDINATED_GRAPHICS)
if (delegatesScrolling()) {
requestScrollPositionUpdate(IntPoint(newOffset));
return;
