bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to Chromium version 18.0.1025.54.

Browse Source 
git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1025@530 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt
2012-03-13 18:35:46 +00:00
parent 2f7c28cb00
commit ce081248da
4 changed files with 14 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHROMIUM_BUILD_COMPATIBILITY.txt
View File

@@ -16,5 +16,5 @@
# http://dev.chromium.org/developers/how-tos/get-the-code # http://dev.chromium.org/developers/how-tos/get-the-code
{ {
'release_url': 'http://src.chromium.org/svn/releases/18.0.1025.37', 'release_url': 'http://src.chromium.org/svn/releases/18.0.1025.54',
} }

5
patch/patch.cfg
View File

@@ -21,11 +21,6 @@ patches = [
'name': 'tools_gyp', 'name': 'tools_gyp',
'path': '../tools/gyp/', 'path': '../tools/gyp/',
}, },
{
# https://bugs.webkit.org/show_bug.cgi?id=73760
'name': 'webcore_cachedresource',
'path': '../third_party/WebKit/Source/WebCore/loader/cache/',
},
{ {
# http://code.google.com/p/chromiumembedded/issues/detail?id=364 # http://code.google.com/p/chromiumembedded/issues/detail?id=364
'name': 'spi_webcore_364', 'name': 'spi_webcore_364',

22
patch/patches/spi_webcore_364.patch
View File

@@ -1,6 +1,6 @@
Index: page/FrameView.cpp Index: page/FrameView.cpp
=================================================================== ===================================================================
--- page/FrameView.cpp (revision 106313) --- page/FrameView.cpp (revision 109991)
+++ page/FrameView.cpp (working copy) +++ page/FrameView.cpp (working copy)
@@ -157,10 +157,12 @@ @@ -157,10 +157,12 @@
m_page = page; m_page = page;
@@ -15,21 +15,25 @@ Index: page/FrameView.cpp
} }
} }
} }
Index: platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm Index: platform/mac/NSScrollerImpDetails.mm
=================================================================== ===================================================================
--- platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm (revision 101144) --- platform/mac/NSScrollerImpDetails.mm (revision 109991)
+++ platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm (working copy) +++ platform/mac/NSScrollerImpDetails.mm (working copy)
@@ -356,9 +356,13 @@ @@ -33,6 +33,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) {
@@ -43,6 +44,9 @@
&& [scrollerImpPairClass instancesRespondToSelector:@selector(scrollerStyle)];
}
return apiAvailable; return apiAvailable;
+#else +#else
+ return false; + return false;
+#endif +#endif
} }
#endif
#endif // USE(WK_SCROLLBAR_PAINTER)

14
patch/patches/webcore_cachedresource.patch
View File

@@ -1,14 +0,0 @@
Index: CachedResource.cpp
===================================================================
--- CachedResource.cpp (revision 103399)
+++ CachedResource.cpp (working copy)
@@ -366,6 +366,9 @@
void CachedResource::addClient(CachedResourceClient* client)
{
+ if (isPurgeable())
+ makePurgeable(false);
+
addClientToSet(client);
didAddClient(client);
}