electron · zcbenz · Oct 9, 2016 · Oct 9, 2016 · Oct 10, 2016 · Oct 10, 2016
diff --git a/README.md b/README.md
@@ -41,3 +41,35 @@ $ ./chrome/installer/linux/sysroot_scripts/install-debian.wheezy.sysroot.py --ar
 $ cd -
 $ ./script/build -t arm
 ```
+
+### Chrome 54 Upgrade
+
+As a means of preserving history, here are some notes from the upgrade to Chrome 54.
+This will describe building on Windows, but should extend to other platforms.
+
+- Start all examples from `C:\src\` to avoid long path issues
+- Install [depot_tools](https://www.chromium.org/developers/how-tos/install-depot-tools) and add it to your PATH
+- Follow [Windows Chromium Setup](https://chromium.googlesource.com/chromium/src/+/master/docs/windows_build_instructions.md)
+- rather than bootstrap by downloading the chromium tarball generated by
+  [zcbenz/chromium-source-tarball](https://github.com/zcbenz/chromium-source-tarball)
+  we checkout the chromium source with [depot_tools](https://www.chromium.org/developers/how-tos/install-depot-tools) using:
+
+  ```
+  > cd \src
+  > git clone https://github.com/electron/libchromiumcontent.git
+  > cd libchromiumcontent
+  > fetch chromium
+  > python script/update --no-download-source-tarball
+  > python script/build
+  ```
+- electron (which you need to also clone) can be linked against this build with:
+
+  ```
+  > cd \src
+  > git clone https://github.com/electron/electron.git
+  > cd electron
+  > python script\bootstrap.py ^
+  --libcc_shared_library_path ../libchromiumcontent/src/out/component ^
+  --libcc_static_library_path ../libchromiumcontent/src/out/static ^
+  --libcc_source_path ../libchromiumcontent/src
+  ```
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-53.0.2785.143
+54.0.2840.101
diff --git a/chromiumcontent/BUILD.gn b/chromiumcontent/BUILD.gn
@@ -0,0 +1,104 @@
+declare_args() {
+  # Build for Mac App Store.
+  mac_mas_build = false
+}
+
+group("chromiumcontent") {
+  deps = [
+    ":libchromiumcontent",
+    "//chrome/test/chromedriver",
+  ]
+}
+
+# Override default compiler settings.
+config("compiler") {
+  defines = [
+    # Force exporting icu's symbols.
+    "U_COMBINED_IMPLEMENTATION",
+    # Defining "U_COMBINED_IMPLEMENTATION" will add "explicit" for some
+    # constructors, make sure it doesn' happen.
+    "UNISTR_FROM_CHAR_EXPLICIT=",
+    "UNISTR_FROM_STRING_EXPLICIT=",
+    "U_NO_DEFAULT_INCLUDE_UTF_HEADERS=0",
+  ]
+
+  if (!is_component_build) {
+    # Force exposing V8 symbols on Windows.
+    # (Corresponding part for POSIX is inside script/update.)
+    defines += [ "BUILDING_V8_SHARED" ]
+  }
+
+  # Enable MAS buld.
+  if (mac_mas_build) {
+    defines += [ "MAS_BUILD" ]
+  }
+}
+
+group("libchromiumcontent") {
+  deps = [
+    "//components/prefs",
+    "//components/cdm/renderer",
+    "//components/cookie_config",
+    "//components/devtools_discovery",
+    "//components/devtools_http_handler",
+    "//components/security_state",
+    "//content",
+    "//content/shell:pak",
+    "//content/shell:copy_shell_resources",
+    "//net:net_with_v8",
+    "//ppapi/host",
+    "//ppapi/proxy",
+    "//ppapi/shared_impl",
+    "//third_party/webrtc/modules/desktop_capture",
+    "//third_party/widevine/cdm:widevinecdmadapter",
+    "//third_party/widevine/cdm:version_h",
+    "//ui/events:dom_keycode_converter",
+  ]
+
+  if (!is_component_build) {
+    deps += [
+      "//content/public/app:both",
+    ]
+  }
+
+  if (is_linux) {
+    deps += [
+      ":chromiumviews",
+      "//chrome/browser/ui/libgtk2ui",
+      "//third_party/speech-dispatcher",
+      "//third_party/mesa:osmesa",
+    ]
+  } else if (is_win) {
+    deps += [
+      ":chromiumviews",
+      ":sandbox_helper_win",
+      "//pdf",
+    ]
+  }
+}
+
+if (is_linux || is_win) {
+  group("chromiumviews") {
+    deps = [
+      "//ui/content_accelerators",
+      "//ui/display",
+      "//ui/display/util",
+      "//ui/views/controls/webview",
+      "//ui/views",
+      "//ui/wm",
+    ]
+  }
+}
+
+if (is_win) {
+  static_library("sandbox_helper_win") {
+    sources = [
+      "../content/app/sandbox_helper_win.cc",
+      "../content/public/app/sandbox_helper_win.h",
+    ]
+
+    deps = [
+      "//sandbox",
+    ]
+  }
+}
diff --git a/chromiumcontent/chromiumcontent.gypi b/chromiumcontent/chromiumcontent.gypi
diff --git a/patches-mas/blink_no_private_api.patch b/patches-mas/blink_no_private_api.patch
@@ -1,5 +1,5 @@
 diff --git a/third_party/WebKit/Source/core/paint/ThemePainterMac.mm b/third_party/WebKit/Source/core/paint/ThemePainterMac.mm
-index 1c410d6f..de2c091 100644
+index c6e4288..29707d7 100644
 --- a/third_party/WebKit/Source/core/paint/ThemePainterMac.mm
 +++ b/third_party/WebKit/Source/core/paint/ThemePainterMac.mm
 @@ -40,12 +40,14 @@
@@ -27,7 +27,7 @@ index 1c410d6f..de2c091 100644
         return false;
     }
 #endif
-@@ -151,7 +155,9 @@
+@@ -153,7 +157,9 @@
 bool ThemePainterMac::paintTextArea(const LayoutObject& o, const PaintInfo& paintInfo, const IntRect& r)
 {
     LocalCurrentGraphicsContext localContext(paintInfo.context, r);