Use git apply for applying patch files (issue #1825)

patch/patch.cfg

@@ -1,15 +1,24 @@
-# 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.
+# Patch configuration file. See the README.txt file in the patch directory for
+# information on how this configuration is used.
+#
+# Each dictionary entry in the "patches" map represents a single patch file.
+# Supported key/value pairs are as follows:
+#
+# - 'name'       Required. The name of the patch file without the .patch
+#                extension that will be read from the patches subdirectory.
+# - 'path'       Optional. The repository root for the patch file. Defaults to
+#                the Chromium "src" root. All patch file contents must be
+#                relative to this repository root.
+# - 'condition'  Optional. The patch file will only be applied if an environment
+#                variable with this name exists.
+#
+# Each entry should also include a comment linking to the code review or bug
+# report that the patch relates to.
 
 patches = [
   {
     # Necessary for grit integration.
     'name': 'gritsettings',
-    'path': '../tools/gritsettings/',
   },
   {
     # Necessary for GN integration.
@@ -23,13 +32,11 @@ patches = [
     # Write environment.* files with the correct SDK version on Windows.
     # https://bugs.chromium.org/p/chromium/issues/detail?id=634788
     'name': 'gn_config',
-    'path': '../',
   },
   {
     # Support loading of password protected zip archives.
     # https://bitbucket.org/chromiumembedded/cef/issues/496
     'name': 'zlib',
-    'path': '../third_party/zlib/',
   },
   {
     # Avoid MessageLoop assertion on OS X.
@@ -38,18 +45,15 @@ patches = [
     # Revert change on Windows that removes MessageLoop::os_modal_loop().
     # https://codereview.chromium.org/1992243003
     'name': 'message_loop_443_1992243003',
-    'path': '../base/message_loop/',
   },
   {
     # Enable popups in offscreen rendering on OS X.
     'name': 'webkit_popups',
-    'path': '../third_party/WebKit/',
   },
   {
     # Fix export of UnderlayOpenGLHostingWindow for 64-bit OS X builds.
     # https://bitbucket.org/chromiumembedded/cef/issues/1051
     'name': 'underlay_1051',
-    'path': '../ui/base/cocoa/',
   },
   {
     # Allow specification of a parent window handle for Widget creation.
@@ -72,7 +76,6 @@ patches = [
     # Remove console spam from RenderWidgetHostViewBase::IsInVR.
     # https://codereview.chromium.org/2822223002
     'name': 'views_widget_180_1481_1565_1677_1749',
-    'path': '../',
   },
   {
     # Allow specification of a custom WebContentsView.
@@ -81,58 +84,49 @@ patches = [
     # Support custom RenderWidgetHostViewOSR for BrowserPluginGuest.
     # https://bitbucket.org/chromiumembedded/cef/issues/1565
     'name': 'web_contents_1257_1565',
-    'path': '../',
   },
   {
     # Allow creation of a custom SoftwareOutputDevice.
     # https://bitbucket.org/chromiumembedded/cef/issues/1368
     'name': 'compositor_1368',
-    'path': '../',
   },
   {
     # Support custom RenderWidgetHostViewOSR for BrowserPluginGuest.
     # https://bitbucket.org/chromiumembedded/cef/issues/1565
     'name': 'browser_plugin_guest_1565',
-    'path': '../',
   },
   {
     # Allow customization of the WebView background color.
     # https://bitbucket.org/chromiumembedded/cef/issues/1161
     # https://codereview.chromium.org/228603007/
     'name': 'prefs_content_1161',
-    'path': '../content/',
   },
   {
     # Fix drag&drop of combined text and URL data on Linux/Aura.
     # https://codereview.chromium.org/208313009
     'name': 'ui_dragdrop_355390',
-    'path': '../ui/base/dragdrop/',
   },
   {
     # Windows: Fix AtExitManager assertion on *ServiceFactory destruction during
     # multi-threaded message loop shutdown.
     # https://bitbucket.org/chromiumembedded/cef/issues/1680
     'name': 'service_factory_1680',
-    'path': '../',
   },
   {
     # Make URLRequest::set_is_pending() public so that it can be called from
     # CefRequestInterceptor::MaybeInterceptResponse().
     # https://bitbucket.org/chromiumembedded/cef/issues/1327
     'name': 'net_urlrequest_1327',
-    'path': '../net/url_request/',
   },
   {
     # Remove NOTREACHED() that is hit when loading Flash in incognito mode.
     # https://bitbucket.org/chromiumembedded/cef/issue/1586
     'name': 'content_pepper_flash_1586',
-    'path': '../content/browser/renderer_host/pepper/',
   },
   {
     # Fix placement of IME window on Windows.
     # https://bitbucket.org/chromiumembedded/cef/issue/1610
     'name': 'ime_1610',
-    'path': '../ui/base/ime/',
   },
   {
     # Enable support for print header and footer.
@@ -146,7 +140,6 @@ patches = [
     #
     # Add missing ENABLE_PRINT_PREVIEW checks in chrome/ on Mac.
     'name': 'print_header_footer_1478_1565',
-    'path': '../',
   },
   {
     # Split service_manager::Main into the separate steps required by CEF.
@@ -155,52 +148,45 @@ patches = [
     # Remove DCHECK on Linux when initialized CEF from a non-main thread.
     # https://bitbucket.org/chromiumembedded/cef/issue/1639
     'name': 'service_manager_654986',
-    'path': '../',
   },
   {
     # Fix rendering of the PDF extension with OSR when the device scale factor
     # is not 1.
     # https://bitbucket.org/chromiumembedded/cef/issues/1687
     'name': 'browser_frame_host_guest_1687',
-    'path': '../content/browser/frame_host/',
   },
   {
     # Fix loading of the PDF extension with proxy BrowserContext.
     # https://bitbucket.org/chromiumembedded/cef/issues/1710
     'name': 'supports_user_data_1710',
-    'path': '../base/',
   },
   {
     # Fix background color on Mac.
     # https://codereview.chromium.org/1070383005 (reverted)
     'name': 'render_widget_host_1070383005',
-    'path': '../content/browser/renderer_host/',
   },
   {
     # Fix missing check for defined(ENABLE_THEMES) in
     # renderer_preferences_util.cc on Linux.
     # https://bugs.chromium.org/p/chromium/issues/detail?id=545103
     'name': 'renderer_preferences_util_545103',
-    'path': '../chrome/browser/',
   },
   {
     # Expose the FontFamilyCache UserData key.
     # https://bitbucket.org/chromiumembedded/cef/issues/1501
     'name': 'font_family_cache_1501',
-    'path': '../chrome/browser/',
   },
   {
     # Fix crash while printing on Windows by properly initializing V8 in the PDF
     # module.
     # https://bugs.chromium.org/p/chromium/issues/detail?id=549365#c17
     'name': 'pdfium_print_549365',
-    'path': '../third_party/pdfium/',
+    'path': 'third_party/pdfium/',
   },
   {
     # Enable support for filtering resource responses.
     # https://bitbucket.org/chromiumembedded/cef/issues/515
     'name': 'net_filter_515',
-    'path': '../',
   },
   {
     # Modify views::View to extend SupportsUserData.
@@ -219,29 +205,24 @@ patches = [
     # Reverts label_button.h changes from
     # https://codereview.chromium.org/2793283002
     'name': 'views_1749',
-    'path': '../',
   },
   {
     # Expose RenderViewHostImpl swapped-out state.
     # https://bitbucket.org/chromiumembedded/cef/issues/1392
     'name': 'render_view_host_impl_1392',
-    'path': '../content/browser/renderer_host/',
   },
   {
     # Expose ui::Compositor via BrowserCompositorMac for OSR.
     'name': 'browser_compositor_mac',
-    'path': '../',
   },
   {
     # Fix chrome Widevine build on Linux.
     'name': 'chrome_widevine',
-    'path': '../',
   },
   {
     # Make some methods of ProfileManager virtual.
     # Allow CEF to intercept GetBrowserContext*InIncognito functions.
     'name': 'chrome_profile',
-    'path': '../',
   },
   {
     # Support StoragePartition proxy by:
@@ -258,13 +239,11 @@ patches = [
     # initializing the channel from RPHI::ProcessDied.
     # https://bitbucket.org/chromiumembedded/cef/issues/2096
     'name': 'storage_partition_1973',
-    'path': '../',
   },
   {
     # Fix plugin placeholder blocked message.
     # https://bitbucket.org/chromiumembedded/cef/issues/2020/
     'name': 'webview_plugin_2020',
-    'path': '../',
   },
   {
     # Support WebUI by:
@@ -272,25 +251,21 @@ patches = [
     # (b) Removing dependency on non-NULL IOThread* object.
     # https://bitbucket.org/chromiumembedded/cef/issues/2037
     'name': 'webui_2037',
-    'path': '../',
   },
   {
     # Support an option to enable/disable net security expiration.
     # https://bitbucket.org/chromiumembedded/cef/issues/1994
     'name': 'net_security_expiration_1994',
-    'path': '../',
   },
   {
     # Remove DCHECK hit during latency reporting when using OSR.
     # https://bitbucket.org/chromiumembedded/cef/issues/2060
     'name': 'render_widget_latency_2060',
-    'path': '../',
   },
   {
     # Implement breakpad/crashpad customization required by CEF.
     # https://bitbucket.org/chromiumembedded/cef/issues/1995
     'name': 'crashpad_1995',
-    'path': '../',
   },
   {
     # Support customization of crash report pruning limits.
@@ -299,13 +274,11 @@ patches = [
     # Implement better rate-limiting/retry logic.
     # https://bugs.chromium.org/p/crashpad/issues/detail?id=23
     'name': 'crashpad_tp_1995',
-    'path': '../third_party/crashpad/',
   },
   {
     # Fix white flash during browser creation.
     # https://bitbucket.org/chromiumembedded/cef/issues/1984
     'name': 'rwh_background_color_1984',
-    'path': '../',
   },
   {
     # Allow continued use of ContentRendererClient::HandleNavigation.
@@ -321,31 +294,26 @@ patches = [
     # network error.
     # https://groups.google.com/a/chromium.org/d/msg/chromium-dev/6iAQPx_hwh8/gaTR5f1GAQAJ
     'name': 'content_1129_2015',
-    'path': '../',
   },
   {
     # Pass is_main_frame to PluginServiceFilter::IsPluginAvailable.
     # https://bitbucket.org/chromiumembedded/cef/issues/2015
     'name': 'webkit_plugin_info_2015',
-    'path': '../third_party/WebKit/',
   },
   {
     # Expose callbacks for mouse/keyboard events that trigger menu switching.
     # Add accelerator display support to Label.
     # https://bitbucket.org/chromiumembedded/cef/issues/2102
     'name': 'views_menu_2102',
-    'path': '../',
   },
   {
     # Mac: Fix build error when including openssl/opensslconf.h.
     # https://bugs.chromium.org/p/chromium/issues/detail?id=711670
     'name': 'mac_build_711670',
-    'path': '../',
   },
   {
     # Linux: Remove DCHECK during GPU feature info detection.
     # https://bugs.chromium.org/p/chromium/issues/detail?id=699278
     'name': 'gpu_feature_info_699278',
-    'path': '../',
   },
 ]