bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-06-05 21:39:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge webkit_set target into //WebKit/source/controller to fix deps race (issue #2339)

Browse Source
This commit is contained in:
Marshall Greenblatt
2017-12-27 13:26:14 -05:00
parent 85f637afcf
commit dba68c026c
3 changed files with 97 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
patch/patches/component_build_1617.patch
View File

@ -25,14 +25,23 @@ index 7563ce48bf5e..6c594749d57b 100644
explicit ContentServiceManagerMainDelegate(const ContentMainParams& params);
~ContentServiceManagerMainDelegate() override;
diff --git third_party/WebKit/Source/controller/BUILD.gn third_party/WebKit/Source/controller/BUILD.gn
index 1d29633ba10d..1a42fe1d37fa 100644
index 1d29633ba10d..a4e738f0e199 100644
--- third_party/WebKit/Source/controller/BUILD.gn
+++ third_party/WebKit/Source/controller/BUILD.gn
@@ -16,6 +16,7 @@ component("controller") {
output_name = "blink_controller"
@@ -25,6 +25,7 @@ component("controller") {
deps = [
+ "//cef:webkit_set",
"//skia",
"//third_party/WebKit/Source/core",
"//third_party/WebKit/Source/modules",
configs += [
"//build/config/compiler:wexit_time_destructors",
+ "//cef/libcef/features:config",
"//third_party/WebKit/Source:config",
"//third_party/WebKit/Source:inside_blink",
"//third_party/WebKit/Source:non_test_config",
@@ -36,6 +37,8 @@ component("controller") {
sources = [
"BlinkInitializer.cpp",
"ControllerExport.h",
+ "//cef/libcef/renderer/webkit_glue.cc",
+ "//cef/libcef/renderer/webkit_glue.h",
]
if (is_mac) {