Title: [145041] trunk/Source/WebCore
- Revision
- 145041
- Author
- [email protected]
- Date
- 2013-03-06 22:47:21 -0800 (Wed, 06 Mar 2013)
Log Message
WebKit does not build without accelerated compositing after Changeset 144823
https://bugs.webkit.org/show_bug.cgi?id=111597
Patch by Paweł Forysiuk <[email protected]> on 2013-03-06
Reviewed by Kentaro Hara.
Properly guard functions ifdefed in ScrollingCoordinator.h.
Remove redundant checks and fallback code inside those functions.
* page/scrolling/ScrollingCoordinator.cpp:
(WebCore::ScrollingCoordinator::scrollLayerForScrollableArea):
(WebCore::ScrollingCoordinator::horizontalScrollbarLayerForScrollableArea):
(WebCore::ScrollingCoordinator::verticalScrollbarLayerForScrollableArea):
(WebCore):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (145040 => 145041)
--- trunk/Source/WebCore/ChangeLog 2013-03-07 06:32:27 UTC (rev 145040)
+++ trunk/Source/WebCore/ChangeLog 2013-03-07 06:47:21 UTC (rev 145041)
@@ -1,3 +1,19 @@
+2013-03-06 Paweł Forysiuk <[email protected]>
+
+ WebKit does not build without accelerated compositing after Changeset 144823
+ https://bugs.webkit.org/show_bug.cgi?id=111597
+
+ Reviewed by Kentaro Hara.
+
+ Properly guard functions ifdefed in ScrollingCoordinator.h.
+ Remove redundant checks and fallback code inside those functions.
+
+ * page/scrolling/ScrollingCoordinator.cpp:
+ (WebCore::ScrollingCoordinator::scrollLayerForScrollableArea):
+ (WebCore::ScrollingCoordinator::horizontalScrollbarLayerForScrollableArea):
+ (WebCore::ScrollingCoordinator::verticalScrollbarLayerForScrollableArea):
+ (WebCore):
+
2013-03-06 Hajime Morrita <[email protected]>
Custom Elements Refactoring: CustomElementConstructor API shouldn't bound to HTMLElement
Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (145040 => 145041)
--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2013-03-07 06:32:27 UTC (rev 145040)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2013-03-07 06:47:21 UTC (rev 145041)
@@ -275,34 +275,19 @@
#if USE(ACCELERATED_COMPOSITING)
GraphicsLayer* ScrollingCoordinator::scrollLayerForScrollableArea(ScrollableArea* scrollableArea)
{
-#if USE(ACCELERATED_COMPOSITING)
return scrollableArea->layerForScrolling();
-#else
- UNUSED_PARAM(scrollableArea);
- return 0;
-#endif
}
GraphicsLayer* ScrollingCoordinator::horizontalScrollbarLayerForScrollableArea(ScrollableArea* scrollableArea)
{
-#if USE(ACCELERATED_COMPOSITING)
return scrollableArea->layerForHorizontalScrollbar();
-#else
- UNUSED_PARAM(scrollableArea);
- return 0;
-#endif
}
-#endif
GraphicsLayer* ScrollingCoordinator::verticalScrollbarLayerForScrollableArea(ScrollableArea* scrollableArea)
{
-#if USE(ACCELERATED_COMPOSITING)
return scrollableArea->layerForVerticalScrollbar();
-#else
- UNUSED_PARAM(scrollableArea);
- return 0;
-#endif
}
+#endif
GraphicsLayer* ScrollingCoordinator::scrollLayerForFrameView(FrameView* frameView)
{
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
