Diff
Modified: trunk/Source/WebCore/CMakeLists.txt (108201 => 108202)
--- trunk/Source/WebCore/CMakeLists.txt 2012-02-19 23:47:10 UTC (rev 108201)
+++ trunk/Source/WebCore/CMakeLists.txt 2012-02-19 23:51:39 UTC (rev 108202)
@@ -1052,6 +1052,7 @@
page/animation/KeyframeAnimation.cpp
page/scrolling/ScrollingCoordinator.cpp
+ page/scrolling/ScrollingCoordinatorNone.cpp
platform/Arena.cpp
platform/CalculationValue.cpp
Modified: trunk/Source/WebCore/ChangeLog (108201 => 108202)
--- trunk/Source/WebCore/ChangeLog 2012-02-19 23:47:10 UTC (rev 108201)
+++ trunk/Source/WebCore/ChangeLog 2012-02-19 23:51:39 UTC (rev 108202)
@@ -1,3 +1,36 @@
+2012-02-19 James Robinson <[email protected]>
+
+ Move stub implementations of ScrollingCoordinator functions into ScrollingCoordinatorNone.cpp
+ https://bugs.webkit.org/show_bug.cgi?id=78951
+
+ Reviewed by Adam Barth.
+
+ This move stubs for ScrollingCoordinator functions into ScrollingCoordinatorNone.cpp instead of #ifdefing inside
+ ScrollingCoordinator.cpp. The mac port uses ScrollingCoordinator when #if ENABLE(THREADED_SCROLLING) is not set
+ and implementations in ScrollingCoordinator.cpp / ScrollingCoordinatorMac.mm otherwise. The chromium port
+ always uses implementations in ScrollingCoordinatorChromium.cpp. All other ports use
+ ScrollingCoordinatorNone.cpp.
+
+ * CMakeLists.txt:
+ * GNUmakefile.list.am:
+ * Target.pri:
+ * WebCore.vcproj/WebCore.vcproj:
+ * WebCore.xcodeproj/project.pbx:
+ * page/scrolling/ScrollingCoordinator.cpp:
+ * page/scrolling/ScrollingCoordinatorNone.cpp:
+ (WebCore):
+ (WebCore::ScrollingCoordinator::create):
+ (WebCore::ScrollingCoordinator::frameViewHorizontalScrollbarLayerDidChange):
+ (WebCore::ScrollingCoordinator::frameViewVerticalScrollbarLayerDidChange):
+ (WebCore::ScrollingCoordinator::setScrollLayer):
+ (WebCore::ScrollingCoordinator::setNonFastScrollableRegion):
+ (WebCore::ScrollingCoordinator::setScrollParameters):
+ (WebCore::ScrollingCoordinator::setWheelEventHandlerCount):
+ (WebCore::ScrollingCoordinator::setShouldUpdateScrollLayerPositionOnMainThread):
+ * page/scrolling/mac/ScrollingCoordinatorMac.mm:
+ (WebCore::ScrollingCoordinator::create):
+ (WebCore):
+
2012-02-19 Kentaro Hara <[email protected]>
Rename [CheckDomainSecurity] to [CheckSecurity]
Modified: trunk/Source/WebCore/GNUmakefile.list.am (108201 => 108202)
--- trunk/Source/WebCore/GNUmakefile.list.am 2012-02-19 23:47:10 UTC (rev 108201)
+++ trunk/Source/WebCore/GNUmakefile.list.am 2012-02-19 23:51:39 UTC (rev 108202)
@@ -2768,8 +2768,7 @@
Source/WebCore/page/Screen.h \
Source/WebCore/page/scrolling/ScrollingCoordinator.cpp \
Source/WebCore/page/scrolling/ScrollingCoordinator.h \
- Source/WebCore/page/scrolling/ScrollingTreeState.cpp \
- Source/WebCore/page/scrolling/ScrollingTreeState.h \
+ Source/WebCore/page/scrolling/ScrollingCoordinatorNone.cpp \
Source/WebCore/page/SecurityOrigin.cpp \
Source/WebCore/page/SecurityOrigin.h \
Source/WebCore/page/SecurityOriginHash.h \
Modified: trunk/Source/WebCore/Target.pri (108201 => 108202)
--- trunk/Source/WebCore/Target.pri 2012-02-19 23:47:10 UTC (rev 108201)
+++ trunk/Source/WebCore/Target.pri 2012-02-19 23:51:39 UTC (rev 108202)
@@ -1011,6 +1011,7 @@
page/PrintContext.cpp \
page/Screen.cpp \
page/scrolling/ScrollingCoordinator.cpp \
+ page/scrolling/ScrollingCoordinatorNone.cpp \
page/SecurityOrigin.cpp \
page/SecurityPolicy.cpp \
page/Settings.cpp \
Modified: trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj (108201 => 108202)
--- trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-02-19 23:47:10 UTC (rev 108201)
+++ trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj 2012-02-19 23:51:39 UTC (rev 108202)
@@ -25817,6 +25817,10 @@
RelativePath="..\page\scrolling\ScrollingCoordinator.h"
>
</File>
+ <File
+ RelativePath="..\page\scrolling\ScrollingCoordinatorNone.cpp"
+ >
+ </File>
<Filter
Name="win"
>
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (108201 => 108202)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-02-19 23:47:10 UTC (rev 108201)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-02-19 23:51:39 UTC (rev 108202)
@@ -297,10 +297,9 @@
1432E8490C51493F00B1500F /* GCController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1432E8480C51493F00B1500F /* GCController.cpp */; };
1449E24C107D4A8400B5793F /* JSCallbackData.h in Headers */ = {isa = PBXBuildFile; fileRef = 1449E24A107D4A8400B5793F /* JSCallbackData.h */; };
1449E287107D4DB400B5793F /* JSCallbackData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1449E286107D4DB400B5793F /* JSCallbackData.cpp */; };
- 144FCE5914EC79E7000D17A3 /* FractionalLayoutPoint.h in Headers */ = {isa = PBXBuildFile; fileRef = 144FCE5414EC79E7000D17A3 /* FractionalLayoutPoint.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 144FCE5214EC79BC000D17A3 /* FractionalLayoutUnit.h in Headers */ = {isa = PBXBuildFile; fileRef = 144FCE5114EC79BC000D17A3 /* FractionalLayoutUnit.h */; settings = {ATTRIBUTES = (Private, ); }; };
144FCE5C14EC79E7000D17A3 /* FractionalLayoutSize.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 144FCE5714EC79E7000D17A3 /* FractionalLayoutSize.cpp */; };
144FCE5D14EC79E7000D17A3 /* FractionalLayoutSize.h in Headers */ = {isa = PBXBuildFile; fileRef = 144FCE5814EC79E7000D17A3 /* FractionalLayoutSize.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 144FCE5214EC79BC000D17A3 /* FractionalLayoutUnit.h in Headers */ = {isa = PBXBuildFile; fileRef = 144FCE5114EC79BC000D17A3 /* FractionalLayoutUnit.h */; settings = {ATTRIBUTES = (Private, ); }; };
1464E06C135EC10600FDB00A /* JSMediaListCustom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1464E06B135EC10600FDB00A /* JSMediaListCustom.cpp */; };
1477E7760BF4134A00152872 /* PageCache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1477E7740BF4134A00152872 /* PageCache.cpp */; };
1477E7770BF4134A00152872 /* PageCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 1477E7750BF4134A00152872 /* PageCache.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -988,6 +987,7 @@
37F818FD0D657606005E1F05 /* WebCoreURLResponse.h in Headers */ = {isa = PBXBuildFile; fileRef = 37F818FB0D657606005E1F05 /* WebCoreURLResponse.h */; settings = {ATTRIBUTES = (Private, ); }; };
37F818FE0D657606005E1F05 /* WebCoreURLResponse.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37F818FC0D657606005E1F05 /* WebCoreURLResponse.mm */; };
37FD4298118368460093C029 /* TreeDepthLimit.h in Headers */ = {isa = PBXBuildFile; fileRef = 37FD4297118368460093C029 /* TreeDepthLimit.h */; };
+ 3866AF3814F1C17100283D68 /* ScrollingCoordinatorNone.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3866AF3714F1C17100283D68 /* ScrollingCoordinatorNone.cpp */; };
3AB02D2A12D4F91600FBB694 /* StorageTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 3AB02D2812D4F91600FBB694 /* StorageTracker.h */; settings = {ATTRIBUTES = (Private, ); }; };
3AB02D2B12D4F91600FBB694 /* StorageTracker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 3AB02D2912D4F91600FBB694 /* StorageTracker.cpp */; };
3AC3680012EF7A09006A3D6F /* StorageTrackerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 3AC367FE12EF7A09006A3D6F /* StorageTrackerClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -7021,10 +7021,10 @@
1432E8480C51493F00B1500F /* GCController.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = GCController.cpp; sourceTree = "<group>"; };
1449E24A107D4A8400B5793F /* JSCallbackData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCallbackData.h; sourceTree = "<group>"; };
1449E286107D4DB400B5793F /* JSCallbackData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCallbackData.cpp; sourceTree = "<group>"; };
+ 144FCE5114EC79BC000D17A3 /* FractionalLayoutUnit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FractionalLayoutUnit.h; sourceTree = "<group>"; };
144FCE5414EC79E7000D17A3 /* FractionalLayoutPoint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FractionalLayoutPoint.h; sourceTree = "<group>"; };
144FCE5714EC79E7000D17A3 /* FractionalLayoutSize.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FractionalLayoutSize.cpp; sourceTree = "<group>"; };
144FCE5814EC79E7000D17A3 /* FractionalLayoutSize.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FractionalLayoutSize.h; sourceTree = "<group>"; };
- 144FCE5114EC79BC000D17A3 /* FractionalLayoutUnit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FractionalLayoutUnit.h; sourceTree = "<group>"; };
1464E06B135EC10600FDB00A /* JSMediaListCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSMediaListCustom.cpp; sourceTree = "<group>"; };
1477E7740BF4134A00152872 /* PageCache.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = PageCache.cpp; sourceTree = "<group>"; };
1477E7750BF4134A00152872 /* PageCache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PageCache.h; sourceTree = "<group>"; };
@@ -7786,6 +7786,7 @@
37F818FC0D657606005E1F05 /* WebCoreURLResponse.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreURLResponse.mm; sourceTree = "<group>"; };
37FC96DA1104ED71003E1FAD /* TrailingFloatsRootInlineBox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TrailingFloatsRootInlineBox.h; sourceTree = "<group>"; };
37FD4297118368460093C029 /* TreeDepthLimit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TreeDepthLimit.h; sourceTree = "<group>"; };
+ 3866AF3714F1C17100283D68 /* ScrollingCoordinatorNone.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScrollingCoordinatorNone.cpp; sourceTree = "<group>"; };
3AB02D2812D4F91600FBB694 /* StorageTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageTracker.h; sourceTree = "<group>"; };
3AB02D2912D4F91600FBB694 /* StorageTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageTracker.cpp; sourceTree = "<group>"; };
3AC367FE12EF7A09006A3D6F /* StorageTrackerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageTrackerClient.h; sourceTree = "<group>"; };
@@ -14019,6 +14020,7 @@
1AF62EE214DA22A70041556C /* mac */,
1AF62EE414DA22A70041556C /* ScrollingCoordinator.cpp */,
1AF62EE514DA22A70041556C /* ScrollingCoordinator.h */,
+ 3866AF3714F1C17100283D68 /* ScrollingCoordinatorNone.cpp */,
1AF62F2014DAFE790041556C /* ScrollingThread.cpp */,
1AF62F2114DAFE790041556C /* ScrollingThread.h */,
1AAADDA114DB409F00AF64B3 /* ScrollingTree.cpp */,
@@ -22321,7 +22323,6 @@
41885B9311B6FDA6003383BB /* FormSubmission.h in Headers */,
935C476D09AC4D6300A6AAB4 /* FoundationExtras.h in Headers */,
144FCE5D14EC79E7000D17A3 /* FractionalLayoutSize.h in Headers */,
- BAB22AD414B7A02D00D8ABA6 /* FractionalLayoutUnit.h in Headers */,
144FCE5214EC79BC000D17A3 /* FractionalLayoutUnit.h in Headers */,
A853123D11D0471B00D4D077 /* FragmentScriptingPermission.h in Headers */,
65BF022F0974816300C43196 /* Frame.h in Headers */,
@@ -26711,6 +26712,7 @@
1AA84F04143BA7BD0051D153 /* ScrollElasticityController.mm in Sources */,
1AF62EE714DA22A70041556C /* ScrollingCoordinator.cpp in Sources */,
1AF62EE614DA22A70041556C /* ScrollingCoordinatorMac.mm in Sources */,
+ 3866AF3814F1C17100283D68 /* ScrollingCoordinatorNone.cpp in Sources */,
1AF62F2514DAFE9E0041556C /* ScrollingThread.cpp in Sources */,
1AF62F2414DAFE910041556C /* ScrollingThreadMac.mm in Sources */,
1AAADDA314DB409F00AF64B3 /* ScrollingTree.cpp in Sources */,
Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (108201 => 108202)
--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2012-02-19 23:47:10 UTC (rev 108201)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2012-02-19 23:51:39 UTC (rev 108202)
@@ -51,11 +51,6 @@
namespace WebCore {
-PassRefPtr<ScrollingCoordinator> ScrollingCoordinator::create(Page* page)
-{
- return adoptRef(new ScrollingCoordinator(page));
-}
-
ScrollingCoordinator::ScrollingCoordinator(Page* page)
: m_page(page)
#if ENABLE(THREADED_SCROLLING)
@@ -291,43 +286,6 @@
setShouldUpdateScrollLayerPositionOnMainThread(frameView->hasSlowRepaintObjects() || frameView->hasFixedObjects());
}
-#if !ENABLE(THREADED_SCROLLING) && !PLATFORM(CHROMIUM)
-void ScrollingCoordinator::frameViewHorizontalScrollbarLayerDidChange(FrameView*, GraphicsLayer*)
-{
- // FIXME: Implement
-}
-
-void ScrollingCoordinator::frameViewVerticalScrollbarLayerDidChange(FrameView*, GraphicsLayer*)
-{
- // FIXME: Implement
-}
-
-void ScrollingCoordinator::setScrollLayer(GraphicsLayer*)
-{
- // FIXME: Implement
-}
-
-void ScrollingCoordinator::setNonFastScrollableRegion(const Region&)
-{
- // FIXME: Implement
-}
-
-void ScrollingCoordinator::setScrollParameters(ScrollElasticity, ScrollElasticity, bool, bool, const IntRect&, const IntSize&)
-{
- // FIXME: Implement
-}
-
-void ScrollingCoordinator::setWheelEventHandlerCount(unsigned)
-{
- // FIXME: Implement
-}
-
-void ScrollingCoordinator::setShouldUpdateScrollLayerPositionOnMainThread(bool)
-{
- // FIXME: Implement
-}
-#endif
-
#if ENABLE(THREADED_SCROLLING)
void ScrollingCoordinator::setScrollLayer(GraphicsLayer* scrollLayer)
{
Copied: trunk/Source/WebCore/page/scrolling/ScrollingCoordinatorNone.cpp (from rev 108201, trunk/Source/WebCore/page/scrolling/chromium/ScrollingCoordinatorChromium.cpp) (0 => 108202)
--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinatorNone.cpp (rev 0)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinatorNone.cpp 2012-02-19 23:51:39 UTC (rev 108202)
@@ -0,0 +1,69 @@
+/*
+ * Copyright (C) 2012 Google Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. 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 APPLE INC. AND ITS CONTRIBUTORS ``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 APPLE INC. OR ITS 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.
+ */
+
+#include "config.h"
+
+#include "ScrollingCoordinator.h"
+
+namespace WebCore {
+
+#if !ENABLE(THREADED_SCROLLING)
+PassRefPtr<ScrollingCoordinator> ScrollingCoordinator::create(Page* page)
+{
+ return adoptRef(new ScrollingCoordinator(page));
+}
+
+void ScrollingCoordinator::frameViewHorizontalScrollbarLayerDidChange(FrameView*, GraphicsLayer*)
+{
+}
+
+void ScrollingCoordinator::frameViewVerticalScrollbarLayerDidChange(FrameView*, GraphicsLayer*)
+{
+}
+
+void ScrollingCoordinator::setScrollLayer(GraphicsLayer*)
+{
+}
+
+void ScrollingCoordinator::setNonFastScrollableRegion(const Region&)
+{
+}
+
+void ScrollingCoordinator::setScrollParameters(ScrollElasticity, ScrollElasticity, bool, bool, const IntRect&, const IntSize&)
+{
+}
+
+void ScrollingCoordinator::setWheelEventHandlerCount(unsigned)
+{
+}
+
+void ScrollingCoordinator::setShouldUpdateScrollLayerPositionOnMainThread(bool)
+{
+}
+
+#endif // !ENABLE(THREADED_SCROLLING)
+
+}
+
Modified: trunk/Source/WebCore/page/scrolling/chromium/ScrollingCoordinatorChromium.cpp (108201 => 108202)
--- trunk/Source/WebCore/page/scrolling/chromium/ScrollingCoordinatorChromium.cpp 2012-02-19 23:47:10 UTC (rev 108201)
+++ trunk/Source/WebCore/page/scrolling/chromium/ScrollingCoordinatorChromium.cpp 2012-02-19 23:51:39 UTC (rev 108202)
@@ -29,6 +29,11 @@
namespace WebCore {
+PassRefPtr<ScrollingCoordinator> ScrollingCoordinator::create(Page* page)
+{
+ return adoptRef(new ScrollingCoordinator(page));
+}
+
void ScrollingCoordinator::frameViewHorizontalScrollbarLayerDidChange(FrameView*, GraphicsLayer* horizontalScrollbarLayer)
{
ASSERT_NOT_REACHED();
Modified: trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm (108201 => 108202)
--- trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2012-02-19 23:47:10 UTC (rev 108201)
+++ trunk/Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm 2012-02-19 23:51:39 UTC (rev 108202)
@@ -42,6 +42,12 @@
namespace WebCore {
+PassRefPtr<ScrollingCoordinator> ScrollingCoordinator::create(Page* page)
+{
+ return adoptRef(new ScrollingCoordinator(page));
+}
+
+
void ScrollingCoordinator::frameViewHorizontalScrollbarLayerDidChange(FrameView* frameView, GraphicsLayer*)
{
ASSERT(isMainThread());
