Changeset 172842 in webkit

Timestamp:

Aug 21, 2014 6:28:52 PM (10 years ago)

Author:

ryuan.choi@samsung.com

Message:

Unreviewed build fix when RUBBER_BANDING is not enabled.

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::overhangAmount):
(WebCore::RenderLayer::setHasHorizontalScrollbar):
(WebCore::RenderLayer::setHasVerticalScrollbar):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-08-21  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        Unreviewed build fix when RUBBER_BANDING is not enabled.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::overhangAmount):
+        (WebCore::RenderLayer::setHasHorizontalScrollbar):
+        (WebCore::RenderLayer::setHasVerticalScrollbar):
+
 2014-08-21  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -2650 +2650 @@
 IntSize RenderLayer::overhangAmount() const
 {
+#if ENABLE(RUBBER_BANDING)
     if (!renderer().frame().settings().rubberBandingForOverflowScrollEnabled())
         return IntSize();
@@ -2668 +2669 @@
 
     return stretch;
+#else
+    return IntSize();
+#endif
 }
 
@@ -3001 +3005 @@
     if (hasScrollbar) {
         m_hBar = createScrollbar(HorizontalScrollbar);
+#if ENABLE(RUBBER_BANDING)
         ScrollableArea::setHorizontalScrollElasticity(renderer().frame().settings().rubberBandingForOverflowScrollEnabled() ? ScrollElasticityAutomatic : ScrollElasticityNone);
+#endif
     } else {
         destroyScrollbar(HorizontalScrollbar);
+#if ENABLE(RUBBER_BANDING)
         ScrollableArea::setHorizontalScrollElasticity(ScrollElasticityNone);
+#endif
     }
 
@@ -3027 +3035 @@
     if (hasScrollbar) {
         m_vBar = createScrollbar(VerticalScrollbar);
+#if ENABLE(RUBBER_BANDING)
         ScrollableArea::setVerticalScrollElasticity((renderer().frame().settings().rubberBandingForOverflowScrollEnabled() ? ScrollElasticityAutomatic : ScrollElasticityNone));
+#endif
     } else {
         destroyScrollbar(VerticalScrollbar);
+#if ENABLE(RUBBER_BANDING)
         ScrollableArea::setVerticalScrollElasticity(ScrollElasticityNone);
+#endif
     }