2013-12-17 22:04:35 +00:00
|
|
|
Index: core/frame/FrameView.cpp
|
2012-04-03 01:34:16 +00:00
|
|
|
===================================================================
|
2014-04-04 16:50:38 +00:00
|
|
|
--- core/frame/FrameView.cpp (revision 170525)
|
2013-12-17 22:04:35 +00:00
|
|
|
+++ core/frame/FrameView.cpp (working copy)
|
2014-04-04 16:50:38 +00:00
|
|
|
@@ -165,8 +165,10 @@
|
2013-10-16 00:25:38 +00:00
|
|
|
if (!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-02-05 20:35:45 +00:00
|
|
|
Index: platform/scroll/ScrollbarThemeMacCommon.mm
|
2012-11-26 18:20:41 +00:00
|
|
|
===================================================================
|
2014-04-04 16:50:38 +00:00
|
|
|
--- platform/scroll/ScrollbarThemeMacCommon.mm (revision 170525)
|
2014-02-05 20:35:45 +00:00
|
|
|
+++ platform/scroll/ScrollbarThemeMacCommon.mm (working copy)
|
2014-04-04 16:50:38 +00:00
|
|
|
@@ -358,10 +358,14 @@
|
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-02-05 20:35:45 +00:00
|
|
|
} // namespace WebCore
|