diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | webkit/build/port/SConscript | 2 | ||||
| -rw-r--r-- | webkit/port/DerivedSources.make | 2 | ||||
| -rw-r--r-- | webkit/webkit.gyp | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -19,7 +19,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@214", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@12596", + "/trunk/deps/third_party/WebKit@12679", "src/third_party/icu38": "/trunk/deps/third_party/icu38@12390", diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript index 2b9ac9b..0b41874 100644 --- a/webkit/build/port/SConscript +++ b/webkit/build/port/SConscript @@ -571,7 +571,7 @@ env.Command(['$DERIVED_DIR/UserAgentStyleSheets.h', '$PORT_DIR/css/svg.css', '$PORT_DIR/css/html4.css', '$PORT_DIR/css/quirks.css', - '$PORT_DIR/css/themeChromiumWin.css', + '$PORT_DIR/css/themeWin.css', '$PORT_DIR/css/themeWinQuirks.css'], '$PERL ${SOURCES[0].posix} ${TARGETS.posix} ${SOURCES[1:].posix}') diff --git a/webkit/port/DerivedSources.make b/webkit/port/DerivedSources.make index 076d228..227aa5e 100644 --- a/webkit/port/DerivedSources.make +++ b/webkit/port/DerivedSources.make @@ -1018,7 +1018,7 @@ XPathGrammar.cpp : xml/XPathGrammar.y $(PROJECT_FILE) # user agent style sheets -USER_AGENT_STYLE_SHEETS = $(WebCore)/css/html4.css $(WebCore)/css/quirks.css $(WebCore)/css/view-source.css $(WebCore)/css/themeChromiumWin.css $(WebCore)/css/themeWinQuirks.css +USER_AGENT_STYLE_SHEETS = $(WebCore)/css/html4.css $(WebCore)/css/quirks.css $(WebCore)/css/view-source.css $(WebCore)/css/themeWin.css $(WebCore)/css/themeWinQuirks.css ifeq ($(findstring ENABLE_SVG,$(FEATURE_DEFINES)), ENABLE_SVG) USER_AGENT_STYLE_SHEETS := $(USER_AGENT_STYLE_SHEETS) $(WebCore)/css/svg.css diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 1b05b40..35c4e92 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -491,7 +491,7 @@ '../third_party/WebKit/WebCore/css/html4.css', '../third_party/WebKit/WebCore/css/quirks.css', '../third_party/WebKit/WebCore/css/view-source.css', - '../third_party/WebKit/WebCore/css/themeChromiumWin.css', + '../third_party/WebKit/WebCore/css/themeWin.css', '../third_party/WebKit/WebCore/css/themeWinQuirks.css', '../third_party/WebKit/WebCore/css/svg.css', '../third_party/WebKit/WebCore/css/mediaControls.css', |