2014-09-04 19:53:40 +02:00
|
|
|
diff --git core/frame/FrameView.cpp core/frame/FrameView.cpp
|
2014-12-13 21:18:31 +01:00
|
|
|
index d8b6105..33abf9d 100644
|
2014-09-04 19:53:40 +02:00
|
|
|
--- core/frame/FrameView.cpp
|
|
|
|
+++ core/frame/FrameView.cpp
|
2014-11-12 20:25:15 +01:00
|
|
|
@@ -145,8 +145,10 @@ FrameView::FrameView(LocalFrame* frame)
|
2014-05-29 19:15:34 +02:00
|
|
|
if (!m_frame->isMainFrame())
|
2012-11-26 19:20:41 +01:00
|
|
|
return;
|
2012-04-03 03:34:16 +02:00
|
|
|
|
|
|
|
+#if 0
|
2013-10-16 02:25:38 +02:00
|
|
|
ScrollableArea::setVerticalScrollElasticity(ScrollElasticityAllowed);
|
|
|
|
ScrollableArea::setHorizontalScrollElasticity(ScrollElasticityAllowed);
|
2012-11-26 19:20:41 +01:00
|
|
|
+#endif
|
2012-04-03 03:34:16 +02:00
|
|
|
}
|
|
|
|
|
2014-11-12 20:25:15 +01:00
|
|
|
PassRefPtrWillBeRawPtr<FrameView> FrameView::create(LocalFrame* frame)
|
2014-09-04 19:53:40 +02:00
|
|
|
diff --git platform/scroll/ScrollbarThemeMacCommon.mm platform/scroll/ScrollbarThemeMacCommon.mm
|
2014-09-27 01:48:19 +02:00
|
|
|
index 90abb7c..6bb16c6 100644
|
2014-09-04 19:53:40 +02:00
|
|
|
--- platform/scroll/ScrollbarThemeMacCommon.mm
|
|
|
|
+++ platform/scroll/ScrollbarThemeMacCommon.mm
|
2014-09-27 01:48:19 +02:00
|
|
|
@@ -354,10 +354,14 @@ NSScrollerStyle ScrollbarThemeMacCommon::recommendedScrollerStyle()
|
2014-02-05 21:35:45 +01:00
|
|
|
// static
|
|
|
|
bool ScrollbarThemeMacCommon::isOverlayAPIAvailable()
|
2012-04-03 03:34:16 +02:00
|
|
|
{
|
|
|
|
+#if 0
|
2013-10-29 18:53:18 +01:00
|
|
|
static bool apiAvailable =
|
|
|
|
[NSClassFromString(@"NSScrollerImp") respondsToSelector:@selector(scrollerImpWithStyle:controlSize:horizontal:replacingScrollerImp:)]
|
|
|
|
&& [NSClassFromString(@"NSScrollerImpPair") instancesRespondToSelector:@selector(scrollerStyle)];
|
2012-04-03 03:34:16 +02:00
|
|
|
return apiAvailable;
|
|
|
|
+#else
|
|
|
|
+ return false;
|
|
|
|
+#endif
|
|
|
|
}
|
|
|
|
|
2014-09-04 19:53:40 +02:00
|
|
|
} // namespace blink
|