summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--DEPS2
-rw-r--r--chrome/renderer/renderer.scons1
-rw-r--r--chrome/renderer/renderer.vcproj20
-rw-r--r--chrome/test/unit/unit_tests.scons1
-rw-r--r--chrome/test/unit/unittests.vcproj4
-rw-r--r--chrome/worker/worker.vcproj4
-rw-r--r--webkit/build/WebKit/WebKit.vsprops2
-rw-r--r--webkit/build/WebKit/using_WebKit.vsprops13
-rw-r--r--webkit/build/WebKit/using_webkit.scons21
-rw-r--r--webkit/glue/SConscript4
-rw-r--r--webkit/glue/glue.vcproj4
-rw-r--r--webkit/glue/webthemeengine_impl_win.cc1
-rw-r--r--webkit/tools/test_shell/test_shell.vcproj4
-rw-r--r--webkit/tools/test_shell/test_shell_tests.vcproj4
-rw-r--r--webkit/webkit.gyp14
15 files changed, 23 insertions, 76 deletions
diff --git a/DEPS b/DEPS
index 69668d2..82ad2e04 100644
--- a/DEPS
+++ b/DEPS
@@ -19,7 +19,7 @@ deps = {
"http://googletest.googlecode.com/svn/trunk@167",
"src/third_party/WebKit":
- "/trunk/deps/third_party/WebKit@12084",
+ "/trunk/deps/third_party/WebKit@12109",
"src/third_party/icu38":
"/trunk/deps/third_party/icu38@11496",
diff --git a/chrome/renderer/renderer.scons b/chrome/renderer/renderer.scons
index df8d158..546db30 100644
--- a/chrome/renderer/renderer.scons
+++ b/chrome/renderer/renderer.scons
@@ -14,7 +14,6 @@ env.SConscript([
'$NPAPI_DIR/using_npapi.scons',
'$PRINTING_DIR/using_printing.scons',
'$SKIA_DIR/using_skia.scons',
- '$WEBKIT_DIR/build/WebKit/using_webkit.scons',
], {'env':env})
env.Prepend(
diff --git a/chrome/renderer/renderer.vcproj b/chrome/renderer/renderer.vcproj
index 4ec5331..634c044 100644
--- a/chrome/renderer/renderer.vcproj
+++ b/chrome/renderer/renderer.vcproj
@@ -18,7 +18,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="4"
- InheritedPropertySheets=".\renderer.vsprops;$(SolutionDir)..\build\debug.vsprops;..\tools\build\win\precompiled_wtl.vsprops;..\..\webkit\build\WebKit\using_WebKit.vsprops"
+ InheritedPropertySheets=".\renderer.vsprops;$(SolutionDir)..\build\debug.vsprops;..\tools\build\win\precompiled_wtl.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -69,7 +69,7 @@
<Configuration
Name="Release|Win32"
ConfigurationType="4"
- InheritedPropertySheets=".\renderer.vsprops;$(SolutionDir)..\build\release.vsprops;..\..\webkit\build\WebKit\using_WebKit.vsprops"
+ InheritedPropertySheets=".\renderer.vsprops;..\..\build\release.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -290,14 +290,6 @@
>
</File>
<File
- RelativePath=".\renderer_logging.cc"
- >
- </File>
- <File
- RelativePath=".\renderer_logging.h"
- >
- </File>
- <File
RelativePath=".\render_process.cc"
>
</File>
@@ -342,6 +334,14 @@
>
</File>
<File
+ RelativePath=".\renderer_logging.cc"
+ >
+ </File>
+ <File
+ RelativePath=".\renderer_logging.h"
+ >
+ </File>
+ <File
RelativePath=".\renderer_main.cc"
>
</File>
diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons
index 2c0ca9a..e25816b 100644
--- a/chrome/test/unit/unit_tests.scons
+++ b/chrome/test/unit/unit_tests.scons
@@ -29,7 +29,6 @@ env.SConscript([
'$PRINTING_DIR/using_printing.scons',
'$SDCH_DIR/using_sdch.scons',
'$SKIA_DIR/using_skia.scons',
- '$WEBKIT_DIR/build/WebKit/using_webkit.scons',
'$ZLIB_DIR/using_zlib.scons',
], {'env':env})
diff --git a/chrome/test/unit/unittests.vcproj b/chrome/test/unit/unittests.vcproj
index b8ce6f4..9aa8dab 100644
--- a/chrome/test/unit/unittests.vcproj
+++ b/chrome/test/unit/unittests.vcproj
@@ -20,7 +20,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="1"
- InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;..\..\tools\build\win\precompiled_wtl.vsprops;..\..\tools\build\win\unit_test.vsprops;$(SolutionDir)..\third_party\ffmpeg\using_ffmpeg.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops;..\..\third_party\hunspell\using_hunspell.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)installer\util\using_util.vsprops;..\..\..\webkit\build\WebKit\using_WebKit.vsprops"
+ InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;..\..\tools\build\win\precompiled_wtl.vsprops;..\..\tools\build\win\unit_test.vsprops;$(SolutionDir)..\third_party\ffmpeg\using_ffmpeg.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops;..\..\third_party\hunspell\using_hunspell.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)installer\util\using_util.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -86,7 +86,7 @@
<Configuration
Name="Release|Win32"
ConfigurationType="1"
- InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops;..\..\tools\build\win\unit_test.vsprops;$(SolutionDir)..\third_party\ffmpeg\using_ffmpeg.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops;..\..\third_party\hunspell\using_hunspell.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)installer\util\using_util.vsprops;..\..\..\webkit\build\WebKit\using_WebKit.vsprops"
+ InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops;..\..\tools\build\win\unit_test.vsprops;$(SolutionDir)..\third_party\ffmpeg\using_ffmpeg.vsprops;$(SolutionDir)..\third_party\libpng\using_libpng.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\skia\using_skia.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops;..\..\third_party\hunspell\using_hunspell.vsprops;$(SolutionDir)..\third_party\npapi\using_npapi.vsprops;$(SolutionDir)installer\util\using_util.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
diff --git a/chrome/worker/worker.vcproj b/chrome/worker/worker.vcproj
index 08b43d1..8adcbab 100644
--- a/chrome/worker/worker.vcproj
+++ b/chrome/worker/worker.vcproj
@@ -18,7 +18,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="4"
- InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;..\tools\build\win\precompiled.vsprops;..\..\webkit\build\WebKit\using_WebKit.vsprops"
+ InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;..\tools\build\win\precompiled.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -69,7 +69,7 @@
<Configuration
Name="Release|Win32"
ConfigurationType="4"
- InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops;..\..\webkit\build\WebKit\using_WebKit.vsprops"
+ InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;..\..\build\release.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
diff --git a/webkit/build/WebKit/WebKit.vsprops b/webkit/build/WebKit/WebKit.vsprops
index 03d48a3..905211e 100644
--- a/webkit/build/WebKit/WebKit.vsprops
+++ b/webkit/build/WebKit/WebKit.vsprops
@@ -8,7 +8,7 @@
<Tool
Name="VCCLCompilerTool"
AdditionalIncludeDirectories="$(SolutionDir)..\third_party\WebKit\WebKit\chromium\public;$(SolutionDir)..\third_party\WebKit\WebKit\chromium\public\win"
- PreprocessorDefinitions="WEBKIT_IMPLEMENTATION;WEBKIT_USING_SKIA=1;_SCL_SECURE_NO_DEPRECATE;_HAS_EXCEPTIONS=1"
+ PreprocessorDefinitions="WEBKIT_IMPLEMENTATION;_SCL_SECURE_NO_DEPRECATE;_HAS_EXCEPTIONS=1"
WarnAsError="true"
/>
</VisualStudioPropertySheet>
diff --git a/webkit/build/WebKit/using_WebKit.vsprops b/webkit/build/WebKit/using_WebKit.vsprops
deleted file mode 100644
index 28e1b79..0000000
--- a/webkit/build/WebKit/using_WebKit.vsprops
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
- ProjectType="Visual C++"
- Version="8.00"
- Name="using_WebKit"
- InheritedPropertySheets="$(SolutionDir)..\skia\using_skia.vsprops"
- >
- <Tool
- Name="VCCLCompilerTool"
- PreprocessorDefinitions="WEBKIT_USING_SKIA=1"
- WarnAsError="true"
- />
-</VisualStudioPropertySheet>
diff --git a/webkit/build/WebKit/using_webkit.scons b/webkit/build/WebKit/using_webkit.scons
deleted file mode 100644
index 6584790..0000000
--- a/webkit/build/WebKit/using_webkit.scons
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright (c) 2009 The Chromium Authors. All rights reserved. Use of this
-# source code is governed by a BSD-style license that can be found in the
-# LICENSE file.
-
-__doc__ = """
-Settings for other components using the WebKit library.
-"""
-
-Import("env")
-
-env.Append(
- CPPDEFINES = [
- 'WEBKIT_USING_SKIA'
- ],
- CPPPATH = [
- '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/public'
- ],
- LIBS = [
- 'WebKit',
- ],
-)
diff --git a/webkit/glue/SConscript b/webkit/glue/SConscript
index 91dce60..8a1b050 100644
--- a/webkit/glue/SConscript
+++ b/webkit/glue/SConscript
@@ -7,12 +7,8 @@ Import('env')
env = env.Clone()
env.Append(
- CPPDEFINES = [
- 'WEBKIT_USING_SKIA'
- ],
CPPPATH = [
'$WEBKIT_DIR/build/WebCore',
- '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/public',
],
LIBS = [
'port',
diff --git a/webkit/glue/glue.vcproj b/webkit/glue/glue.vcproj
index 5379315..35c11a0 100644
--- a/webkit/glue/glue.vcproj
+++ b/webkit/glue/glue.vcproj
@@ -18,7 +18,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="4"
- InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\glue.vsprops;..\build\WebKit\using_WebKit.vsprops"
+ InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\glue.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -69,7 +69,7 @@
<Configuration
Name="Release|Win32"
ConfigurationType="4"
- InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\glue.vsprops;..\build\WebKit\using_WebKit.vsprops"
+ InheritedPropertySheets="..\..\build\release.vsprops;.\glue.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
diff --git a/webkit/glue/webthemeengine_impl_win.cc b/webkit/glue/webthemeengine_impl_win.cc
index 19260ce2..50e7bd7 100644
--- a/webkit/glue/webthemeengine_impl_win.cc
+++ b/webkit/glue/webthemeengine_impl_win.cc
@@ -5,6 +5,7 @@
#include "webkit/glue/webthemeengine_impl_win.h"
#include "base/gfx/native_theme.h"
+#include "skia/ext/platform_canvas.h"
#include "skia/ext/skia_utils_win.h"
#include "third_party/WebKit/WebKit/chromium/public/WebRect.h"
diff --git a/webkit/tools/test_shell/test_shell.vcproj b/webkit/tools/test_shell/test_shell.vcproj
index 10555b1..8ced6eb 100644
--- a/webkit/tools/test_shell/test_shell.vcproj
+++ b/webkit/tools/test_shell/test_shell.vcproj
@@ -18,7 +18,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="1"
- InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\test_shell.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops;..\..\build\WebKit\using_WebKit.vsprops"
+ InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\test_shell.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -79,7 +79,7 @@
<Configuration
Name="Release|Win32"
ConfigurationType="1"
- InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\test_shell.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops;..\..\build\WebKit\using_WebKit.vsprops"
+ InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\test_shell.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
diff --git a/webkit/tools/test_shell/test_shell_tests.vcproj b/webkit/tools/test_shell/test_shell_tests.vcproj
index 81606f2..ac9db53 100644
--- a/webkit/tools/test_shell/test_shell_tests.vcproj
+++ b/webkit/tools/test_shell/test_shell_tests.vcproj
@@ -18,7 +18,7 @@
<Configuration
Name="Debug|Win32"
ConfigurationType="1"
- InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\test_shell_tests.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops;..\..\build\WebKit\using_WebKit.vsprops"
+ InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\test_shell_tests.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
@@ -78,7 +78,7 @@
<Configuration
Name="Release|Win32"
ConfigurationType="1"
- InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\test_shell_tests.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops;..\..\build\WebKit\using_WebKit.vsprops"
+ InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\test_shell_tests.vsprops;$(SolutionDir)..\testing\using_gtest.vsprops"
>
<Tool
Name="VCPreBuildEventTool"
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index 2129e7d..b18a216 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -4113,25 +4113,11 @@
'../third_party/WebKit/WebKit/chromium/src/WebString.cpp',
'../third_party/WebKit/WebKit/chromium/src/WebURL.cpp',
],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '../third_party/WebKit/WebKit/chromium/public',
- ],
- },
'conditions': [
['OS=="mac"', {
'sources!': [
'../third_party/WebKit/WebKit/chromium/src/WebImageSkia.cpp',
],
- }, { # else: OS!="mac"
- 'defines': [
- 'WEBKIT_USING_SKIA',
- ],
- 'direct_dependent_settings': {
- 'defines': [
- 'WEBKIT_USING_SKIA',
- ],
- },
}],
['OS=="win"', {
'sources': [
generated by cgit v1.1 at 2025-02-07 13:04:18 +0000