2014-09-04 17:53:40 +00:00
|
|
|
diff --git core/frame/FrameView.cpp core/frame/FrameView.cpp
|
|
|
|
index 5d42bda..70e70a6 100644
|
|
|
|
--- core/frame/FrameView.cpp
|
|
|
|
+++ core/frame/FrameView.cpp
|
|
|
|
@@ -126,8 +126,10 @@ FrameView::FrameView(LocalFrame* frame)
|
2014-05-29 17:15:34 +00:00
|
|
|
if (!m_frame->isMainFrame())
|
2012-11-26 18:20:41 +00:00
|
|
|
return;
|
2012-04-03 01:34:16 +00:00
|
|
|
|
|
|
|
+#if 0
|
2013-10-16 00:25:38 +00:00
|
|
|
ScrollableArea::setVerticalScrollElasticity(ScrollElasticityAllowed);
|
|
|
|
ScrollableArea::setHorizontalScrollElasticity(ScrollElasticityAllowed);
|
2012-11-26 18:20:41 +00:00
|
|
|
+#endif
|
2012-04-03 01:34:16 +00:00
|
|
|
}
|
|
|
|
|
2014-04-04 16:50:38 +00:00
|
|
|
PassRefPtr<FrameView> FrameView::create(LocalFrame* frame)
|
2014-09-04 17:53:40 +00:00
|
|
|
diff --git platform/scroll/ScrollbarThemeMacCommon.mm platform/scroll/ScrollbarThemeMacCommon.mm
|
|
|
|
index 309e1e3..b40a19a 100644
|
|
|
|
--- platform/scroll/ScrollbarThemeMacCommon.mm
|
|
|
|
+++ platform/scroll/ScrollbarThemeMacCommon.mm
|
|
|
|
@@ -355,10 +355,14 @@ NSScrollerStyle ScrollbarThemeMacCommon::recommendedScrollerStyle()
|
2014-02-05 20:35:45 +00:00
|
|
|
// static
|
|
|
|
bool ScrollbarThemeMacCommon::isOverlayAPIAvailable()
|
2012-04-03 01:34:16 +00:00
|
|
|
{
|
|
|
|
+#if 0
|
2013-10-29 17:53:18 +00:00
|
|
|
static bool apiAvailable =
|
|
|
|
[NSClassFromString(@"NSScrollerImp") respondsToSelector:@selector(scrollerImpWithStyle:controlSize:horizontal:replacingScrollerImp:)]
|
|
|
|
&& [NSClassFromString(@"NSScrollerImpPair") instancesRespondToSelector:@selector(scrollerStyle)];
|
2012-04-03 01:34:16 +00:00
|
|
|
return apiAvailable;
|
|
|
|
+#else
|
|
|
|
+ return false;
|
|
|
|
+#endif
|
|
|
|
}
|
|
|
|
|
2014-09-04 17:53:40 +00:00
|
|
|
} // namespace blink
|