From a10fef0bd70de10061db6bc85174ead56e159676 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Tue, 9 Oct 2012 14:35:00 +0000 Subject: [PATCH] Update spi_webcore_364.patch file. git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1180@848 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- cef1/patch/patches/spi_webcore_364.patch | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/cef1/patch/patches/spi_webcore_364.patch b/cef1/patch/patches/spi_webcore_364.patch index 9f66afaef..5a3bf56c0 100644 --- a/cef1/patch/patches/spi_webcore_364.patch +++ b/cef1/patch/patches/spi_webcore_364.patch @@ -1,8 +1,8 @@ Index: page/FrameView.cpp =================================================================== ---- page/FrameView.cpp (revision 112327) +--- page/FrameView.cpp (revision 126646) +++ page/FrameView.cpp (working copy) -@@ -159,10 +159,12 @@ +@@ -170,10 +170,12 @@ if (!page) return; @@ -15,21 +15,25 @@ Index: page/FrameView.cpp } PassRefPtr 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 126646) ++++ platform/mac/NSScrollerImpDetails.mm (working copy) +@@ -33,6 +33,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) { +@@ -43,6 +44,9 @@ + && [scrollerImpPairClass instancesRespondToSelector:@selector(scrollerStyle)]; + } return apiAvailable; +#else + return false; +#endif } + #endif - #endif // USE(WK_SCROLLBAR_PAINTER)