2013-12-17 23:04:35 +01:00
|
|
|
Index: core/frame/FrameView.cpp
|
2012-04-03 03:34:16 +02:00
|
|
|
===================================================================
|
2014-07-02 20:25:22 +02:00
|
|
|
--- core/frame/FrameView.cpp (revision 177271)
|
2013-12-17 23:04:35 +01:00
|
|
|
+++ core/frame/FrameView.cpp (working copy)
|
2014-07-02 20:25:22 +02:00
|
|
|
@@ -139,8 +139,10 @@
|
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-04-04 18:50:38 +02:00
|
|
|
PassRefPtr<FrameView> FrameView::create(LocalFrame* frame)
|
2014-02-05 21:35:45 +01:00
|
|
|
Index: platform/scroll/ScrollbarThemeMacCommon.mm
|
2012-11-26 19:20:41 +01:00
|
|
|
===================================================================
|
2014-07-02 20:25:22 +02:00
|
|
|
--- platform/scroll/ScrollbarThemeMacCommon.mm (revision 177271)
|
2014-02-05 21:35:45 +01:00
|
|
|
+++ platform/scroll/ScrollbarThemeMacCommon.mm (working copy)
|
2014-07-02 20:25:22 +02:00
|
|
|
@@ -355,10 +355,14 @@
|
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-02-05 21:35:45 +01:00
|
|
|
} // namespace WebCore
|