From ce081248daecb0797c9e639f38e5fc1fc173783a Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Tue, 13 Mar 2012 18:35:46 +0000
Subject: [PATCH] Update to Chromium version 18.0.1025.54.

git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1025@530 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 CHROMIUM_BUILD_COMPATIBILITY.txt           |  2 +-
 patch/patch.cfg                            |  5 -----
 patch/patches/spi_webcore_364.patch        | 22 +++++++++++++---------
 patch/patches/webcore_cachedresource.patch | 14 --------------
 4 files changed, 14 insertions(+), 29 deletions(-)
 delete mode 100644 patch/patches/webcore_cachedresource.patch

diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt
index 70e1d6fb0..5969f5e06 100644
--- a/CHROMIUM_BUILD_COMPATIBILITY.txt
+++ b/CHROMIUM_BUILD_COMPATIBILITY.txt
@@ -16,5 +16,5 @@
 # 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',
 }
diff --git a/patch/patch.cfg b/patch/patch.cfg
index b83254fc9..f4122f7ec 100644
--- a/patch/patch.cfg
+++ b/patch/patch.cfg
@@ -21,11 +21,6 @@ patches = [
     'name': '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
     'name': 'spi_webcore_364',
diff --git a/patch/patches/spi_webcore_364.patch b/patch/patches/spi_webcore_364.patch
index b89fbb49c..ac286e3dd 100644
--- a/patch/patches/spi_webcore_364.patch
+++ b/patch/patches/spi_webcore_364.patch
@@ -1,6 +1,6 @@
 Index: page/FrameView.cpp
 ===================================================================
---- page/FrameView.cpp	(revision 106313)
+--- page/FrameView.cpp	(revision 109991)
 +++ page/FrameView.cpp	(working copy)
 @@ -157,10 +157,12 @@
              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/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm	(working copy)
-@@ -356,9 +356,13 @@
- 
+--- platform/mac/NSScrollerImpDetails.mm	(revision 109991)
++++ 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)
diff --git a/patch/patches/webcore_cachedresource.patch b/patch/patches/webcore_cachedresource.patch
deleted file mode 100644
index 79fc57dad..000000000
--- a/patch/patches/webcore_cachedresource.patch
+++ /dev/null
@@ -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);
- }