Update spi_webcore_364.patch file.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@925 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2012-11-26 18:20:14 +00:00
parent 8d37ead057
commit 4d21c4ffca
1 changed files with 14 additions and 10 deletions

View File

@ -1,8 +1,8 @@
Index: page/FrameView.cpp
===================================================================
--- page/FrameView.cpp (revision 112327)
--- page/FrameView.cpp (revision 134630)
+++ page/FrameView.cpp (working copy)
@@ -159,10 +159,12 @@
@@ -206,10 +206,12 @@
if (!page)
return;
@ -15,21 +15,25 @@ Index: page/FrameView.cpp
}
PassRefPtr<FrameView> FrameView::create(Frame* frame)
Index: platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm
Index: platform/mac/NSScrollerImpDetails.mm
===================================================================
--- platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm (revision 101144)
+++ platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm (working copy)
@@ -356,9 +356,13 @@
--- platform/mac/NSScrollerImpDetails.mm (revision 134630)
+++ platform/mac/NSScrollerImpDetails.mm (working copy)
@@ -34,6 +34,7 @@
#if PLATFORM(CHROMIUM)
bool isScrollbarOverlayAPIAvailable()
{
+#if 0
static bool apiAvailable = [lookUpNSScrollerImpClass() respondsToSelector:@selector(scrollerImpWithStyle:controlSize:horizontal:replacingScrollerImp:)] &&
[lookUpNSScrollerImpPairClass() instancesRespondToSelector:@selector(scrollerStyle)];
static bool apiAvailable;
static bool shouldInitialize = true;
if (shouldInitialize) {
@@ -44,6 +45,9 @@
&& [scrollerImpPairClass instancesRespondToSelector:@selector(scrollerStyle)];
}
return apiAvailable;
+#else
+ return false;
+#endif
}
#endif
#endif // USE(WK_SCROLLBAR_PAINTER)