mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-04-16 03:37:22 +02:00
eef89ccdd3
- Standardize usage of virtual/override specifiers in CEF internals (see http://crbug.com/417463). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1903 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
35 lines
1.2 KiB
Diff
35 lines
1.2 KiB
Diff
diff --git core/frame/FrameView.cpp core/frame/FrameView.cpp
|
|
index 8a77e1c..06e6c47 100644
|
|
--- core/frame/FrameView.cpp
|
|
+++ core/frame/FrameView.cpp
|
|
@@ -145,8 +145,10 @@ FrameView::FrameView(LocalFrame* frame)
|
|
if (!m_frame->isMainFrame())
|
|
return;
|
|
|
|
+#if 0
|
|
ScrollableArea::setVerticalScrollElasticity(ScrollElasticityAllowed);
|
|
ScrollableArea::setHorizontalScrollElasticity(ScrollElasticityAllowed);
|
|
+#endif
|
|
}
|
|
|
|
PassRefPtrWillBeRawPtr<FrameView> FrameView::create(LocalFrame* frame)
|
|
diff --git platform/scroll/ScrollbarThemeMacCommon.mm platform/scroll/ScrollbarThemeMacCommon.mm
|
|
index 90abb7c..6bb16c6 100644
|
|
--- platform/scroll/ScrollbarThemeMacCommon.mm
|
|
+++ platform/scroll/ScrollbarThemeMacCommon.mm
|
|
@@ -354,10 +354,14 @@ NSScrollerStyle ScrollbarThemeMacCommon::recommendedScrollerStyle()
|
|
// static
|
|
bool ScrollbarThemeMacCommon::isOverlayAPIAvailable()
|
|
{
|
|
+#if 0
|
|
static bool apiAvailable =
|
|
[NSClassFromString(@"NSScrollerImp") respondsToSelector:@selector(scrollerImpWithStyle:controlSize:horizontal:replacingScrollerImp:)]
|
|
&& [NSClassFromString(@"NSScrollerImpPair") instancesRespondToSelector:@selector(scrollerStyle)];
|
|
return apiAvailable;
|
|
+#else
|
|
+ return false;
|
|
+#endif
|
|
}
|
|
|
|
} // namespace blink
|