mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update spi_webcore_364.patch file.
git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@926 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
@@ -1,35 +1,39 @@
|
|||||||
Index: page/FrameView.cpp
|
Index: page/FrameView.cpp
|
||||||
===================================================================
|
===================================================================
|
||||||
--- page/FrameView.cpp (revision 103399)
|
--- page/FrameView.cpp (revision 134630)
|
||||||
+++ page/FrameView.cpp (working copy)
|
+++ page/FrameView.cpp (working copy)
|
||||||
@@ -176,10 +176,12 @@
|
@@ -206,10 +206,12 @@
|
||||||
m_page = page;
|
if (!page)
|
||||||
m_page->addScrollableArea(this);
|
return;
|
||||||
|
|
||||||
+#if 0
|
+#if 0
|
||||||
if (m_frame == m_page->mainFrame()) {
|
if (m_frame == page->mainFrame()) {
|
||||||
ScrollableArea::setVerticalScrollElasticity(ScrollElasticityAllowed);
|
ScrollableArea::setVerticalScrollElasticity(ScrollElasticityAllowed);
|
||||||
ScrollableArea::setHorizontalScrollElasticity(ScrollElasticityAllowed);
|
ScrollableArea::setHorizontalScrollElasticity(ScrollElasticityAllowed);
|
||||||
}
|
|
||||||
+#endif
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
+#endif
|
||||||
}
|
}
|
||||||
Index: platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm
|
|
||||||
===================================================================
|
|
||||||
--- platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm (revision 101144)
|
|
||||||
+++ platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm (working copy)
|
|
||||||
@@ -356,9 +356,13 @@
|
|
||||||
|
|
||||||
|
PassRefPtr<FrameView> FrameView::create(Frame* frame)
|
||||||
|
Index: platform/mac/NSScrollerImpDetails.mm
|
||||||
|
===================================================================
|
||||||
|
--- platform/mac/NSScrollerImpDetails.mm (revision 134630)
|
||||||
|
+++ platform/mac/NSScrollerImpDetails.mm (working copy)
|
||||||
|
@@ -34,6 +34,7 @@
|
||||||
|
#if PLATFORM(CHROMIUM)
|
||||||
bool isScrollbarOverlayAPIAvailable()
|
bool isScrollbarOverlayAPIAvailable()
|
||||||
{
|
{
|
||||||
+#if 0
|
+#if 0
|
||||||
static bool apiAvailable = [lookUpNSScrollerImpClass() respondsToSelector:@selector(scrollerImpWithStyle:controlSize:horizontal:replacingScrollerImp:)] &&
|
static bool apiAvailable;
|
||||||
[lookUpNSScrollerImpPairClass() instancesRespondToSelector:@selector(scrollerStyle)];
|
static bool shouldInitialize = true;
|
||||||
|
if (shouldInitialize) {
|
||||||
|
@@ -44,6 +45,9 @@
|
||||||
|
&& [scrollerImpPairClass instancesRespondToSelector:@selector(scrollerStyle)];
|
||||||
|
}
|
||||||
return apiAvailable;
|
return apiAvailable;
|
||||||
+#else
|
+#else
|
||||||
+ return false;
|
+ return false;
|
||||||
+#endif
|
+#endif
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif // USE(WK_SCROLLBAR_PAINTER)
|
|
||||||
|
Reference in New Issue
Block a user