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

2025-06-05 21:39:12 +02:00 · 2017-04-26 21:59:52 -04:00
parent a2b8c250a8
commit 4fe6ac0d4b
33 changed files with 294 additions and 883 deletions
--- a/patch/README.txt
+++ b/patch/README.txt
@@ -1,20 +1,15 @@
-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:
+There may be instances where CEF requires changes to the source code for
+Chromium, Blink or third-party projects that are either not desired by those
+projects or that have not yet been merged into the source code versions of those
+projects used by CEF. To address this situation the CEF project adds a patch
+capability as part of cef_create_projects[.bat|sh] build step. This 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.
+   code changes 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.
+3. When building CEF from source code the patch files are applied by the
+   patcher.py tool via the cef_create_projects[.bat|sh] build step
+4. When updating Chromium the patch_updater.py tool is used to update all patch
+   files. See https://bitbucket.org/chromiumembedded/cef/wiki/ChromiumUpdate.md
+   for more information about the update process.
--- a/patch/patch.cfg
+++ b/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': '../',
  },
 ]
--- a/patch/patches/browser_frame_host_guest_1687.patch
+++ b/patch/patches/browser_frame_host_guest_1687.patch
@@ -1,7 +1,7 @@
-diff --git render_widget_host_view_guest.cc render_widget_host_view_guest.cc
+diff --git content/browser/frame_host/render_widget_host_view_guest.cc content/browser/frame_host/render_widget_host_view_guest.cc
 index fc720a7..1c30365 100644
--- render_widget_host_view_guest.cc
-+++ render_widget_host_view_guest.cc
+--- content/browser/frame_host/render_widget_host_view_guest.cc
+++ content/browser/frame_host/render_widget_host_view_guest.cc
@@ -247,13 +247,14 @@ void RenderWidgetHostViewGuest::Destroy() {
 }
 
--- a/patch/patches/browser_plugin_guest_1565.patch
+++ b/patch/patches/browser_plugin_guest_1565.patch
@@ -303,7 +303,7 @@ index d237318..3701bd2 100644
   content::WebContents* OpenURLFromTab(
       content::WebContents* source,
 diff --git extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h
-index e065104d..ea3f547 100644
+index e065104d..e67ae566e 100644
 --- extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h
 +++ extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest_delegate.h
@@ -6,9 +6,9 @@
@@ -317,11 +317,10 @@ index e065104d..ea3f547 100644
 struct ContextMenuParams;
 }  // namespace content
 
-@@ -21,6 +21,14 @@ class MimeHandlerViewGuestDelegate {
-  public:
+@@ -22,6 +22,14 @@ class MimeHandlerViewGuestDelegate {
   MimeHandlerViewGuestDelegate() {}
   virtual ~MimeHandlerViewGuestDelegate() {}
-+  
+ 
 +  // Provides an opportunity to supply a custom view implementation.
 +  virtual void OverrideWebContentsCreateParams(
 +      content::WebContents::CreateParams* params) {}
@@ -329,6 +328,7 @@ index e065104d..ea3f547 100644
 +  // Called when a guest is attached or detached.
 +  virtual void OnGuestAttached(content::WebContentsView* parent_view) {}
 +  virtual void OnGuestDetached(content::WebContentsView* parent_view) {}
- 
+
   // Handles context menu, or returns false if unhandled.
   virtual bool HandleContextMenu(content::WebContents* web_contents,
+                                  const content::ContextMenuParams& params);
--- a/patch/patches/content_pepper_flash_1586.patch
+++ b/patch/patches/content_pepper_flash_1586.patch
@@ -1,7 +1,7 @@
-diff --git pepper_flash_file_message_filter.cc pepper_flash_file_message_filter.cc
+diff --git content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc
 index 6f03077..c61fed3 100644
--- pepper_flash_file_message_filter.cc
-+++ pepper_flash_file_message_filter.cc
+--- content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc
+++ content/browser/renderer_host/pepper/pepper_flash_file_message_filter.cc
@@ -55,7 +55,7 @@ PepperFlashFileMessageFilter::PepperFlashFileMessageFilter(
     // will construct a bad path and could provide access to the wrong files.
     // In this case, |plugin_data_directory_| will remain unset and
--- a/patch/patches/crashpad_1995.patch
+++ b/patch/patches/crashpad_1995.patch
@@ -483,7 +483,7 @@ index 3bae07e..12b0a16 100644
 +      const char* product_version = "";
 +      crash_reporter_client->GetProductNameAndVersion(&product_name,
 +                                                      &product_version);
-+ 
+
       NSBundle* outer_bundle = base::mac::OuterBundle();
 -      NSString* product = base::mac::ObjCCast<NSString>([outer_bundle
 -          objectForInfoDictionaryKey:base::mac::CFToNSCast(kCFBundleNameKey)]);
@@ -528,7 +528,7 @@ index 3bae07e..12b0a16 100644
         arguments.push_back(
             "--reset-own-crash-exception-port-to-system-default");
       }
-+      
+
 +      // Since we're using the same subprocess helper exe we must specify the
 +      // process type.
 +      arguments.push_back(std::string("--type=") + switches::kCrashpadHandler);
@@ -581,7 +581,7 @@ index 94a350f..61667a8 100644
 -    // reinvoke it with --type=crashpad-handler. Otherwise, we use the
 -    // standalone crashpad_handler.exe (for tests, etc.).
     std::vector<std::string> start_arguments;
-+    
+
 +    // Always add --type=crashpad-handler because the value is expected by
 +    // CefExecuteProcess.
 +    start_arguments.push_back(
--- a/patch/patches/crashpad_tp_1995.patch
+++ b/patch/patches/crashpad_tp_1995.patch
@@ -1,7 +1,7 @@
-diff --git crashpad/client/prune_crash_reports.cc crashpad/client/prune_crash_reports.cc
+diff --git third_party/crashpad/crashpad/client/prune_crash_reports.cc third_party/crashpad/crashpad/client/prune_crash_reports.cc
 index 3aaaeee..d99fcb4 100644
--- crashpad/client/prune_crash_reports.cc
-+++ crashpad/client/prune_crash_reports.cc
+--- third_party/crashpad/crashpad/client/prune_crash_reports.cc
+++ third_party/crashpad/crashpad/client/prune_crash_reports.cc
@@ -67,13 +67,19 @@ void PruneCrashReportDatabase(CrashReportDatabase* database,
 }
 
@@ -25,10 +25,10 @@ index 3aaaeee..d99fcb4 100644
 }
 
 static const time_t kSecondsInDay = 60 * 60 * 24;
-diff --git crashpad/client/prune_crash_reports.h crashpad/client/prune_crash_reports.h
+diff --git third_party/crashpad/crashpad/client/prune_crash_reports.h third_party/crashpad/crashpad/client/prune_crash_reports.h
 index 6dac5f3..34f5ee1 100644
--- crashpad/client/prune_crash_reports.h
-+++ crashpad/client/prune_crash_reports.h
+--- third_party/crashpad/crashpad/client/prune_crash_reports.h
+++ third_party/crashpad/crashpad/client/prune_crash_reports.h
@@ -57,7 +57,8 @@ class PruneCondition {
   //! of 128 MB.
   //!
@@ -39,10 +39,10 @@ index 6dac5f3..34f5ee1 100644
 
   virtual ~PruneCondition() {}
 
-diff --git crashpad/client/settings.cc crashpad/client/settings.cc
+diff --git third_party/crashpad/crashpad/client/settings.cc third_party/crashpad/crashpad/client/settings.cc
 index 15d16f2..5e8eadf 100644
--- crashpad/client/settings.cc
-+++ crashpad/client/settings.cc
+--- third_party/crashpad/crashpad/client/settings.cc
+++ third_party/crashpad/crashpad/client/settings.cc
@@ -38,7 +38,7 @@ void ScopedLockedFileHandleTraits::Free(FileHandle handle) {
 
 struct Settings::Data {
@@ -129,10 +129,10 @@ index 15d16f2..5e8eadf 100644
 // static
 Settings::ScopedLockedFileHandle Settings::MakeScopedLockedFileHandle(
     FileHandle file,
-diff --git crashpad/client/settings.h crashpad/client/settings.h
+diff --git third_party/crashpad/crashpad/client/settings.h third_party/crashpad/crashpad/client/settings.h
 index b64f74f..0c3c22e 100644
--- crashpad/client/settings.h
-+++ crashpad/client/settings.h
+--- third_party/crashpad/crashpad/client/settings.h
+++ third_party/crashpad/crashpad/client/settings.h
@@ -102,6 +102,11 @@ class Settings {
   //!     error logged.
   bool SetLastUploadAttemptTime(time_t time);
@@ -145,10 +145,10 @@ index b64f74f..0c3c22e 100644
  private:
   struct Data;
 
-diff --git crashpad/handler/crash_report_upload_thread.h crashpad/handler/crash_report_upload_thread.h
+diff --git third_party/crashpad/crashpad/handler/crash_report_upload_thread.h third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
 index 14debac..c25c653 100644
--- crashpad/handler/crash_report_upload_thread.h
-+++ crashpad/handler/crash_report_upload_thread.h
+--- third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
+++ third_party/crashpad/crashpad/handler/crash_report_upload_thread.h
@@ -78,7 +78,7 @@ class CrashReportUploadThread : public WorkerThread::Delegate {
   //! This method may be called from any thread.
   void ReportPending();
@@ -176,10 +176,10 @@ index 14debac..c25c653 100644
 
   //! \brief Attempts to upload a crash report.
   //!
-diff --git crashpad/handler/handler_main.cc crashpad/handler/handler_main.cc
+diff --git third_party/crashpad/crashpad/handler/handler_main.cc third_party/crashpad/crashpad/handler/handler_main.cc
 index 641bf0f..3a86eb3 100644
--- crashpad/handler/handler_main.cc
-+++ crashpad/handler/handler_main.cc
+--- third_party/crashpad/crashpad/handler/handler_main.cc
+++ third_party/crashpad/crashpad/handler/handler_main.cc
@@ -35,8 +35,10 @@
 #include "base/metrics/persistent_histogram_allocator.h"
 #include "base/scoped_generic.h"
--- a/patch/patches/font_family_cache_1501.patch
+++ b/patch/patches/font_family_cache_1501.patch
@@ -1,7 +1,7 @@
-diff --git font_family_cache.h font_family_cache.h
+diff --git chrome/browser/font_family_cache.h chrome/browser/font_family_cache.h
 index 743448d..0a9f350 100644
--- font_family_cache.h
-+++ font_family_cache.h
+--- chrome/browser/font_family_cache.h
+++ chrome/browser/font_family_cache.h
@@ -20,6 +20,8 @@ class Profile;
 
 FORWARD_DECLARE_TEST(FontFamilyCacheTest, Caching);
--- a/patch/patches/gritsettings.patch
+++ b/patch/patches/gritsettings.patch
@@ -1,17 +1,16 @@
-diff --git resource_ids resource_ids
-index 4e3fd2d..447c1f5 100644
--- resource_ids
-+++ resource_ids
-@@ -361,5 +361,12 @@
-   # Thinking about appending to the end?
+diff --git tools/gritsettings/resource_ids tools/gritsettings/resource_ids
+index 4e3fd2d..2cf62da 100644
+--- tools/gritsettings/resource_ids
+++ tools/gritsettings/resource_ids
+@@ -362,4 +362,11 @@
   # Please read the header and find the right section above instead.
 
+   # Resource ids starting at 31000 are reserved for projects built on Chromium.
+
 +  "cef/libcef/resources/cef_resources.grd": {
 +    "includes": [31500],
 +  },
 +  "cef/libcef/resources/cef_strings.grd": {
 +    "messages": [32000],
 +  },
-+
-   # Resource ids starting at 31000 are reserved for projects built on Chromium.
 }
--- a/patch/patches/ime_1610.patch
+++ b/patch/patches/ime_1610.patch
@@ -1,7 +1,7 @@
-diff --git input_method_win.cc input_method_win.cc
+diff --git ui/base/ime/input_method_win.cc ui/base/ime/input_method_win.cc
 index e2bb528..3e851e5 100644
--- input_method_win.cc
-+++ input_method_win.cc
+--- ui/base/ime/input_method_win.cc
+++ ui/base/ime/input_method_win.cc
@@ -682,8 +682,9 @@ bool InputMethodWin::IsWindowFocused(const TextInputClient* client) const {
   // receiving keyboard input as long as it is an active window. This works well
   // even when the |attached_window_handle| becomes active but has not received
--- a/patch/patches/message_loop_443_1992243003.patch
+++ b/patch/patches/message_loop_443_1992243003.patch
@@ -1,7 +1,7 @@
-diff --git message_loop.cc message_loop.cc
+diff --git base/message_loop/message_loop.cc base/message_loop/message_loop.cc
 index 3d55920..721aca1 100644
--- message_loop.cc
-+++ message_loop.cc
+--- base/message_loop/message_loop.cc
+++ base/message_loop/message_loop.cc
@@ -96,12 +96,6 @@ MessageLoop::~MessageLoop() {
   // may be current.
   DCHECK((pump_ && current() == this) || (!pump_ && current() != this));
@@ -25,10 +25,10 @@ index 3d55920..721aca1 100644
       pump_factory_(pump_factory),
       run_loop_(nullptr),
       current_pending_task_(nullptr),
-diff --git message_loop.h message_loop.h
+diff --git base/message_loop/message_loop.h base/message_loop/message_loop.h
 index 2ef4537..9c657f8 100644
--- message_loop.h
-+++ message_loop.h
+--- base/message_loop/message_loop.h
+++ base/message_loop/message_loop.h
@@ -303,6 +303,16 @@ class BASE_EXPORT MessageLoop : public MessagePump::Delegate {
   void AddTaskObserver(TaskObserver* task_observer);
   void RemoveTaskObserver(TaskObserver* task_observer);
@@ -59,10 +59,10 @@ index 2ef4537..9c657f8 100644
   // pump_factory_.Run() is called to create a message pump for this loop
   // if type_ is TYPE_CUSTOM and pump_ is null.
   MessagePumpFactoryCallback pump_factory_;
-diff --git message_pump_win.cc message_pump_win.cc
+diff --git base/message_loop/message_pump_win.cc base/message_loop/message_pump_win.cc
 index d52c785..a43b5b3 100644
--- message_pump_win.cc
-+++ message_pump_win.cc
+--- base/message_loop/message_pump_win.cc
+++ base/message_loop/message_pump_win.cc
@@ -366,20 +366,28 @@ bool MessagePumpForUI::ProcessMessageHelper(const MSG& msg) {
 }
 
--- a/patch/patches/net_urlrequest_1327.patch
+++ b/patch/patches/net_urlrequest_1327.patch
@@ -1,7 +1,7 @@
-diff --git url_request.h url_request.h
+diff --git net/url_request/url_request.h net/url_request/url_request.h
 index e1406f3..ed9aa91 100644
--- url_request.h
-+++ url_request.h
+--- net/url_request/url_request.h
+++ net/url_request/url_request.h
@@ -651,10 +651,11 @@ class NET_EXPORT URLRequest : NON_EXPORTED_BASE(public base::NonThreadSafe),
   // Returns the error status of the request.
   // Do not use! Going to be protected!
--- a/patch/patches/prefs_content_1161.patch
+++ b/patch/patches/prefs_content_1161.patch
@@ -1,7 +1,7 @@
-diff --git public/common/common_param_traits_macros.h public/common/common_param_traits_macros.h
+diff --git content/public/common/common_param_traits_macros.h content/public/common/common_param_traits_macros.h
 index 3dd2e75..9f61aad 100644
--- public/common/common_param_traits_macros.h
-+++ public/common/common_param_traits_macros.h
+--- content/public/common/common_param_traits_macros.h
+++ content/public/common/common_param_traits_macros.h
@@ -201,6 +201,7 @@ IPC_STRUCT_TRAITS_BEGIN(content::WebPreferences)
   IPC_STRUCT_TRAITS_MEMBER(main_frame_resizes_are_orientation_changes)
   IPC_STRUCT_TRAITS_MEMBER(initialize_at_minimum_page_scale)
@@ -10,10 +10,10 @@ index 3dd2e75..9f61aad 100644
   IPC_STRUCT_TRAITS_MEMBER(cookie_enabled)
   IPC_STRUCT_TRAITS_MEMBER(navigate_on_drag_drop)
   IPC_STRUCT_TRAITS_MEMBER(spatial_navigation_enabled)
-diff --git public/common/web_preferences.cc public/common/web_preferences.cc
+diff --git content/public/common/web_preferences.cc content/public/common/web_preferences.cc
 index 72f7bd8..850e591 100644
--- public/common/web_preferences.cc
-+++ public/common/web_preferences.cc
+--- content/public/common/web_preferences.cc
+++ content/public/common/web_preferences.cc
@@ -172,6 +172,7 @@ WebPreferences::WebPreferences()
       spatial_navigation_enabled(false),
       use_solid_color_scrollbars(false),
@@ -22,10 +22,10 @@ index 72f7bd8..850e591 100644
       v8_cache_options(V8_CACHE_OPTIONS_DEFAULT),
       inert_visual_viewport(false),
       record_whole_document(false),
-diff --git public/common/web_preferences.h public/common/web_preferences.h
+diff --git content/public/common/web_preferences.h content/public/common/web_preferences.h
 index ae9756c..d0f2f1b 100644
--- public/common/web_preferences.h
-+++ public/common/web_preferences.h
+--- content/public/common/web_preferences.h
+++ content/public/common/web_preferences.h
@@ -184,6 +184,7 @@ struct CONTENT_EXPORT WebPreferences {
   bool spatial_navigation_enabled;
   bool use_solid_color_scrollbars;
@@ -34,10 +34,10 @@ index ae9756c..d0f2f1b 100644
   V8CacheOptions v8_cache_options;
   bool inert_visual_viewport;
   bool record_whole_document;
-diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc
+diff --git content/renderer/render_view_impl.cc content/renderer/render_view_impl.cc
 index 7d6113c..d600026 100644
--- renderer/render_view_impl.cc
-+++ renderer/render_view_impl.cc
+--- content/renderer/render_view_impl.cc
+++ content/renderer/render_view_impl.cc
@@ -1383,6 +1383,8 @@ void RenderViewImpl::ApplyWebPreferencesInternal(
     blink::WebView* web_view,
     CompositorDependencies* compositor_deps) {
--- a/patch/patches/render_view_host_impl_1392.patch
+++ b/patch/patches/render_view_host_impl_1392.patch
@@ -1,7 +1,7 @@
-diff --git render_view_host_impl.h render_view_host_impl.h
+diff --git content/browser/renderer_host/render_view_host_impl.h content/browser/renderer_host/render_view_host_impl.h
 index bcc702b..3753c50 100644
--- render_view_host_impl.h
-+++ render_view_host_impl.h
+--- content/browser/renderer_host/render_view_host_impl.h
+++ content/browser/renderer_host/render_view_host_impl.h
@@ -154,6 +154,7 @@ class CONTENT_EXPORT RenderViewHostImpl : public RenderViewHost,
   void set_is_swapped_out(bool is_swapped_out) {
     is_swapped_out_ = is_swapped_out;
--- a/patch/patches/render_widget_host_1070383005.patch
+++ b/patch/patches/render_widget_host_1070383005.patch
@@ -1,7 +1,7 @@
-diff --git render_widget_host_view_mac.mm render_widget_host_view_mac.mm
+diff --git content/browser/renderer_host/render_widget_host_view_mac.mm content/browser/renderer_host/render_widget_host_view_mac.mm
 index 896170a..4beadf9 100644
--- render_widget_host_view_mac.mm
-+++ render_widget_host_view_mac.mm
+--- content/browser/renderer_host/render_widget_host_view_mac.mm
+++ content/browser/renderer_host/render_widget_host_view_mac.mm
@@ -453,9 +453,6 @@ RenderWidgetHostViewMac::RenderWidgetHostViewMac(RenderWidgetHost* widget,
   // Paint this view host with |background_color_| when there is no content
   // ready to draw.
--- a/patch/patches/renderer_preferences_util_545103.patch
+++ b/patch/patches/renderer_preferences_util_545103.patch
@@ -1,7 +1,7 @@
-diff --git renderer_preferences_util.cc renderer_preferences_util.cc
+diff --git chrome/browser/renderer_preferences_util.cc chrome/browser/renderer_preferences_util.cc
 index 7296a04..c702d31 100644
--- renderer_preferences_util.cc
-+++ renderer_preferences_util.cc
+--- chrome/browser/renderer_preferences_util.cc
+++ chrome/browser/renderer_preferences_util.cc
@@ -32,7 +32,8 @@
 #include "ui/base/cocoa/defaults_utils.h"
 #endif
--- a/patch/patches/supports_user_data_1710.patch
+++ b/patch/patches/supports_user_data_1710.patch
@@ -1,7 +1,7 @@
-diff --git supports_user_data.h supports_user_data.h
+diff --git base/supports_user_data.h base/supports_user_data.h
 index 233ce38..02e690b 100644
--- supports_user_data.h
-+++ supports_user_data.h
+--- base/supports_user_data.h
+++ base/supports_user_data.h
@@ -39,10 +39,10 @@ class BASE_EXPORT SupportsUserData {
   // delete the object if it is changed or the object is destroyed.
   // TODO: remove the raw ptr version of SetUserData once everything uses
--- a/patch/patches/ui_dragdrop_355390.patch
+++ b/patch/patches/ui_dragdrop_355390.patch
@@ -1,7 +1,7 @@
-diff --git os_exchange_data_provider_aurax11.cc os_exchange_data_provider_aurax11.cc
+diff --git ui/base/dragdrop/os_exchange_data_provider_aurax11.cc ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
 index 9b93593..fe0f44a 100644
--- os_exchange_data_provider_aurax11.cc
-+++ os_exchange_data_provider_aurax11.cc
+--- ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
+++ ui/base/dragdrop/os_exchange_data_provider_aurax11.cc
@@ -162,7 +162,8 @@ void OSExchangeDataProviderAuraX11::SetURL(const GURL& url,
                        mem);
 
--- a/patch/patches/underlay_1051.patch
+++ b/patch/patches/underlay_1051.patch
@@ -1,7 +1,7 @@
-diff --git underlay_opengl_hosting_window.h underlay_opengl_hosting_window.h
+diff --git ui/base/cocoa/underlay_opengl_hosting_window.h ui/base/cocoa/underlay_opengl_hosting_window.h
 index d673c31..806d134 100644
--- underlay_opengl_hosting_window.h
-+++ underlay_opengl_hosting_window.h
+--- ui/base/cocoa/underlay_opengl_hosting_window.h
+++ ui/base/cocoa/underlay_opengl_hosting_window.h
@@ -12,7 +12,7 @@
 // Common base class for windows that host a OpenGL surface that renders under
 // the window. Previously contained methods related to hole punching, now just
--- a/patch/patches/views_menu_2102.patch
+++ b/patch/patches/views_menu_2102.patch
@@ -258,7 +258,7 @@ index db99e54..7c67a04 100644
   // Whether this item should be displayed with the normal text color, even if
   // it's disabled.
   virtual bool GetShouldUseNormalForegroundColor(int command_id) const;
-+  
+
 +  // Override the text color of a given menu item dependent on the |command_id|
 +  // and its |is_hovered| state. |is_minor| will be true for accelerator text.
 +  // Returns true if it chooses to override the color.
--- a/patch/patches/webkit_plugin_info_2015.patch
+++ b/patch/patches/webkit_plugin_info_2015.patch
@@ -1,7 +1,7 @@
-diff --git Source/core/dom/DOMImplementation.cpp Source/core/dom/DOMImplementation.cpp
+diff --git third_party/WebKit/Source/core/dom/DOMImplementation.cpp third_party/WebKit/Source/core/dom/DOMImplementation.cpp
 index 8aab9bb..e3286f6 100644
--- Source/core/dom/DOMImplementation.cpp
-+++ Source/core/dom/DOMImplementation.cpp
+--- third_party/WebKit/Source/core/dom/DOMImplementation.cpp
+++ third_party/WebKit/Source/core/dom/DOMImplementation.cpp
@@ -241,10 +241,11 @@ Document* DOMImplementation::createDocument(const String& type,
     // For that reason, the origin must be retrieved directly from init.url().
     if (init.GetFrame()->IsMainFrame()) {
@@ -16,10 +16,10 @@ index 8aab9bb..e3286f6 100644
                                                         ->Tree()
                                                         .Top()
                                                         ->GetSecurityContext()
-diff --git Source/core/frame/LocalFrame.cpp Source/core/frame/LocalFrame.cpp
+diff --git third_party/WebKit/Source/core/frame/LocalFrame.cpp third_party/WebKit/Source/core/frame/LocalFrame.cpp
 index b64d75d..869b45d 100644
--- Source/core/frame/LocalFrame.cpp
-+++ Source/core/frame/LocalFrame.cpp
+--- third_party/WebKit/Source/core/frame/LocalFrame.cpp
+++ third_party/WebKit/Source/core/frame/LocalFrame.cpp
@@ -927,7 +927,7 @@ ContentSettingsClient* LocalFrame::GetContentSettingsClient() {
 PluginData* LocalFrame::GetPluginData() const {
   if (!Loader().AllowPlugins(kNotAboutToInstantiatePlugin))
@@ -29,10 +29,10 @@ index b64d75d..869b45d 100644
       Tree().Top()->GetSecurityContext()->GetSecurityOrigin());
 }
 
-diff --git Source/core/page/Page.cpp Source/core/page/Page.cpp
+diff --git third_party/WebKit/Source/core/page/Page.cpp third_party/WebKit/Source/core/page/Page.cpp
 index 941a30c..2c5764c 100644
--- Source/core/page/Page.cpp
-+++ Source/core/page/Page.cpp
+--- third_party/WebKit/Source/core/page/Page.cpp
+++ third_party/WebKit/Source/core/page/Page.cpp
@@ -289,16 +289,30 @@ void Page::RefreshPlugins() {
 
   for (const Page* page : AllPages()) {
@@ -71,10 +71,10 @@ index 941a30c..2c5764c 100644
 }
 
 void Page::SetValidationMessageClient(ValidationMessageClient* client) {
-diff --git Source/core/page/Page.h Source/core/page/Page.h
+diff --git third_party/WebKit/Source/core/page/Page.h third_party/WebKit/Source/core/page/Page.h
 index e644faa..2fe0d37 100644
--- Source/core/page/Page.h
-+++ Source/core/page/Page.h
+--- third_party/WebKit/Source/core/page/Page.h
+++ third_party/WebKit/Source/core/page/Page.h
@@ -132,7 +132,8 @@ class CORE_EXPORT Page final : public GarbageCollectedFinalized<Page>,
   ViewportDescription GetViewportDescription() const;
 
@@ -95,10 +95,10 @@ index e644faa..2fe0d37 100644
 
   EditorClient* const editor_client_;
   SpellCheckerClient* const spell_checker_client_;
-diff --git Source/platform/plugins/PluginData.cpp Source/platform/plugins/PluginData.cpp
+diff --git third_party/WebKit/Source/platform/plugins/PluginData.cpp third_party/WebKit/Source/platform/plugins/PluginData.cpp
 index 03618f6..5ac59e8 100644
--- Source/platform/plugins/PluginData.cpp
-+++ Source/platform/plugins/PluginData.cpp
+--- third_party/WebKit/Source/platform/plugins/PluginData.cpp
+++ third_party/WebKit/Source/platform/plugins/PluginData.cpp
@@ -30,11 +30,12 @@
 
 namespace blink {
@@ -125,10 +125,10 @@ index 03618f6..5ac59e8 100644
                                      &builder);
 }
 
-diff --git Source/platform/plugins/PluginData.h Source/platform/plugins/PluginData.h
+diff --git third_party/WebKit/Source/platform/plugins/PluginData.h third_party/WebKit/Source/platform/plugins/PluginData.h
 index cdf3381..671f17c 100644
--- Source/platform/plugins/PluginData.h
-+++ Source/platform/plugins/PluginData.h
+--- third_party/WebKit/Source/platform/plugins/PluginData.h
+++ third_party/WebKit/Source/platform/plugins/PluginData.h
@@ -52,8 +52,9 @@ class PLATFORM_EXPORT PluginData : public RefCounted<PluginData> {
   WTF_MAKE_NONCOPYABLE(PluginData);
 
@@ -156,10 +156,10 @@ index cdf3381..671f17c 100644
   RefPtr<SecurityOrigin> main_frame_origin_;
 };
 
-diff --git public/platform/Platform.h public/platform/Platform.h
+diff --git third_party/WebKit/public/platform/Platform.h third_party/WebKit/public/platform/Platform.h
 index eab1ca5..6657878 100644
--- public/platform/Platform.h
-+++ public/platform/Platform.h
+--- third_party/WebKit/public/platform/Platform.h
+++ third_party/WebKit/public/platform/Platform.h
@@ -365,6 +365,7 @@ class BLINK_PLATFORM_EXPORT Platform {
   // satisfy this call. mainFrameOrigin is used by the browser process to
   // filter plugins from the plugin list based on content settings.
--- a/patch/patches/webkit_popups.patch
+++ b/patch/patches/webkit_popups.patch
@@ -1,7 +1,7 @@
-diff --git Source/web/ChromeClientImpl.cpp Source/web/ChromeClientImpl.cpp
+diff --git third_party/WebKit/Source/web/ChromeClientImpl.cpp third_party/WebKit/Source/web/ChromeClientImpl.cpp
 index ba81ee3..648d7ce 100644
--- Source/web/ChromeClientImpl.cpp
-+++ Source/web/ChromeClientImpl.cpp
+--- third_party/WebKit/Source/web/ChromeClientImpl.cpp
+++ third_party/WebKit/Source/web/ChromeClientImpl.cpp
@@ -908,7 +908,7 @@ bool ChromeClientImpl::HasOpenedPopup() const {
 PopupMenu* ChromeClientImpl::OpenPopupMenu(LocalFrame& frame,
                                            HTMLSelectElement& select) {
@@ -11,10 +11,10 @@ index ba81ee3..648d7ce 100644
     return new ExternalPopupMenu(frame, select, *web_view_);
 
   DCHECK(RuntimeEnabledFeatures::pagePopupEnabled());
-diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp
+diff --git third_party/WebKit/Source/web/WebViewImpl.cpp third_party/WebKit/Source/web/WebViewImpl.cpp
 index 16ac66b..7053b54 100644
--- Source/web/WebViewImpl.cpp
-+++ Source/web/WebViewImpl.cpp
+--- third_party/WebKit/Source/web/WebViewImpl.cpp
+++ third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -355,6 +355,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client,
       enable_fake_page_scale_animation_for_testing_(false),
       fake_page_scale_animation_page_scale_factor_(0),
@@ -38,10 +38,10 @@ index 16ac66b..7053b54 100644
 }
 
 void WebViewImpl::SetBackgroundColorOverride(WebColor color) {
-diff --git Source/web/WebViewImpl.h Source/web/WebViewImpl.h
+diff --git third_party/WebKit/Source/web/WebViewImpl.h third_party/WebKit/Source/web/WebViewImpl.h
 index a22ef37..33dbab4 100644
--- Source/web/WebViewImpl.h
-+++ Source/web/WebViewImpl.h
+--- third_party/WebKit/Source/web/WebViewImpl.h
+++ third_party/WebKit/Source/web/WebViewImpl.h
@@ -362,7 +362,8 @@ class WEB_EXPORT WebViewImpl final
 
   // Returns true if popup menus should be rendered by the browser, false if
@@ -61,10 +61,10 @@ index a22ef37..33dbab4 100644
   float compositor_device_scale_factor_override_;
   TransformationMatrix device_emulation_transform_;
 
-diff --git public/web/WebView.h public/web/WebView.h
+diff --git third_party/WebKit/public/web/WebView.h third_party/WebKit/public/web/WebView.h
 index e811392..d6d5bf8 100644
--- public/web/WebView.h
-+++ public/web/WebView.h
+--- third_party/WebKit/public/web/WebView.h
+++ third_party/WebKit/public/web/WebView.h
@@ -403,6 +403,7 @@ class WebView : protected WebWidget {
 
   // Sets whether select popup menus should be rendered by the browser.
--- a/patch/patches/zlib.patch
+++ b/patch/patches/zlib.patch
@@ -1,7 +1,7 @@
-diff --git contrib/minizip/unzip.c contrib/minizip/unzip.c
+diff --git third_party/zlib/contrib/minizip/unzip.c third_party/zlib/contrib/minizip/unzip.c
 index 199b472..be42478 100644
--- contrib/minizip/unzip.c
-+++ contrib/minizip/unzip.c
+--- third_party/zlib/contrib/minizip/unzip.c
+++ third_party/zlib/contrib/minizip/unzip.c
@@ -69,7 +69,7 @@
 #include <string.h>