Branch CEF3 files from /branches/cef3 to /trunk/cef3 (issue #564).

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@571 5089003a-bbd8-11dd-ad1f-f1f9622dbc98

patch/README.txt

@@ -0,0 +1,20 @@
+There may be instances where CEF requires changes to the Chromium/WebKit code
+base that are not desired by the Chromium/WebKit projects as a whole. To address
+this situation the CEF project adds a patch capability as part of the CEF GYP
+project generation step. The patch capability works as follows:
+
+1. The CEF developer creates one or more patch files containing all required
+   changes to the Chromium/WebKit code base and places those patch files in the
+   "patches" subdirectory.
+2. The CEF developer adds an entry for each patch file in the "patch.cfg" file.
+3. CEF applies the patches to the Chromium/WebKit source tree using the
+   patcher.py tool in the tools directory.  If necessary the patcher.py tool
+   also rewrites the "patch_state.h" file which defines the CEF_PATCHES_APPLIED
+   preprocessor value.
+
+To disable automatic application of patches to the Chromium/WebKit code base
+create an empty "NOPATCH" file in the "patch" directory. Sections of the CEF
+code base that otherwise require patches will be disabled using the
+CEF_PATCHES_APPLIED preprocessor value defined in the "patch_state.h" file. Be
+warned that not applying all required patches may break important CEF
+functionality.

patch/patch.cfg

@@ -0,0 +1,30 @@
+# Each map in the list associates a patch file name with a target path and
+# optional condition. All paths in the patch file must be relative to the
+# target path. Each map should include a comment linking to the code review
+# or bug report that the patch relates to. If a condition is provided the
+# patch will only be applied if an environment variable with the specified
+# name exists.
+
+patches = [
+  {
+    # Necessary for grit integration
+    'name': 'gritsettings',
+    'path': '../tools/gritsettings/',
+  },
+  {
+    # http://codereview.chromium.org/8086022/
+    'name': 'build',
+    'path': '../build/',
+  },
+  {
+    # http://code.google.com/p/gyp/issues/detail?id=223
+    'name': 'tools_gyp',
+    'path': '../tools/gyp/',
+  },
+  {
+    # http://code.google.com/p/chromiumembedded/issues/detail?id=364
+    'name': 'spi_webcore_364',
+    'path': '../third_party/WebKit/Source/WebCore/',
+    'condition': 'CEF_SPI_BUILD',
+  },
+]

patch/patches/build.patch

@@ -0,0 +1,27 @@
+Index: common.gypi
+===================================================================
+--- common.gypi	(revision 102269)
++++ common.gypi	(working copy)
+@@ -9,6 +9,9 @@
+   # Variables expected to be overriden on the GYP command line (-D) or by
+   # ~/.gyp/include.gypi.
+   'variables': {
++    # Directory for CEF source files. This will be set by cef.gypi.
++    'cef_directory%' : '',
++
+     # Putting a variables dict inside another variables dict looks kind of
+     # weird.  This is done so that 'host_arch', 'chromeos', etc are defined as
+     # variables within the outer variables dict here.  This is necessary
+Index: mac/strip_save_dsym
+===================================================================
+--- mac/strip_save_dsym	(revision 102269)
++++ mac/strip_save_dsym	(working copy)
+@@ -48,7 +48,7 @@
+                  "bundle"]
+   macho_types_re = "Mach-O (?:64-bit )?(?:" + "|".join(macho_types) + ")"
+ 
+-  file_cmd = subprocess.Popen(["/usr/bin/file", "-b", "--", macho],
++  file_cmd = subprocess.Popen(["/usr/bin/file", "-b", "-L", "--", macho],
+                               stdout=subprocess.PIPE)
+ 
+   archs = []

patch/patches/gritsettings.patch

@@ -0,0 +1,14 @@
+Index: resource_ids
+===================================================================
+--- resource_ids	(revision 119665)
++++ resource_ids	(working copy)
+@@ -16,6 +16,9 @@
+ {
+   "SRCDIR": "../..",
+ 
++  "cef/libcef/browser/resources/cef_resources.grd": {
++    "includes": [25500],
++  },
+   "chrome/browser/browser_resources.grd": {
+     "includes": [500],
+   },

patch/patches/spi_webcore_364.patch

@@ -0,0 +1,35 @@
+Index: page/FrameView.cpp
+===================================================================
+--- page/FrameView.cpp	(revision 103399)
++++ page/FrameView.cpp	(working copy)
+@@ -176,10 +176,12 @@
+             m_page = page;
+             m_page->addScrollableArea(this);
+ 
++#if 0
+             if (m_frame == m_page->mainFrame()) {
+                 ScrollableArea::setVerticalScrollElasticity(ScrollElasticityAllowed);
+                 ScrollableArea::setHorizontalScrollElasticity(ScrollElasticityAllowed);
+             }
++#endif
+         }
+     }
+ }
+Index: platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm
+===================================================================
+--- platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm	(revision 101144)
++++ platform/chromium/ScrollbarOverlayUtilitiesChromiumMac.mm	(working copy)
+@@ -356,9 +356,13 @@
+ 
+ bool isScrollbarOverlayAPIAvailable()
+ {
++#if 0
+     static bool apiAvailable = [lookUpNSScrollerImpClass() respondsToSelector:@selector(scrollerImpWithStyle:controlSize:horizontal:replacingScrollerImp:)] &&
+                                [lookUpNSScrollerImpPairClass() instancesRespondToSelector:@selector(scrollerStyle)];
+     return apiAvailable;
++#else
++    return false;
++#endif
+ }
+ 
+ #endif // USE(WK_SCROLLBAR_PAINTER)

patch/patches/tools_gyp.patch

@@ -0,0 +1,14 @@
+Index: pylib/gyp/input.py
+===================================================================
+--- pylib/gyp/input.py	(revision 1107)
++++ pylib/gyp/input.py	(working copy)
+@@ -666,7 +666,8 @@
+             # that don't load quickly, this can be faster than
+             # <!(python modulename param eters). Do this in |build_file_dir|.
+             oldwd = os.getcwd()  # Python doesn't like os.open('.'): no fchdir.
+-            os.chdir(build_file_dir)
++            if not build_file_dir is None:
++              os.chdir(build_file_dir)
+ 
+             parsed_contents = shlex.split(contents)
+             py_module = __import__(parsed_contents[0])