diff options
author | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-28 01:13:47 +0000 |
---|---|---|
committer | darin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-28 01:13:47 +0000 |
commit | 90a3fbb1723ba60bcf557121b7bbe80817a7533f (patch) | |
tree | 28d845ed0f1d64cdfa418f4561af4536de6f3c40 /webkit/build | |
parent | 41fb1d7d262e44d8561a5c4d6d7e353f638b56e8 (diff) | |
download | chromium_src-90a3fbb1723ba60bcf557121b7bbe80817a7533f.zip chromium_src-90a3fbb1723ba60bcf557121b7bbe80817a7533f.tar.gz chromium_src-90a3fbb1723ba60bcf557121b7bbe80817a7533f.tar.bz2 |
Chrome side to pick up new WebKit API changes.
WebKit API now provides:
- layoutTestMode
- support for registering extra local URL schemes
- access to the current WebKitClient
WebKitClient was extended to include:
- access to the default locale
- access to the current time
- methods to start/stop the shared timer
- method to get work scheduled on the main thread
- methods to access cookies
- method to prefetch hostnames
R=dglazkov
Review URL: http://codereview.chromium.org/27276
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10665 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
-rw-r--r-- | webkit/build/JavaScriptCore/WTF.vcproj | 32 | ||||
-rw-r--r-- | webkit/build/WebKit/SConscript | 2 | ||||
-rw-r--r-- | webkit/build/WebKit/WebKit.vcproj | 8 | ||||
-rw-r--r-- | webkit/build/WebKit/using_webkit.scons | 21 |
4 files changed, 45 insertions, 18 deletions
diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj index be75e21..502ca67 100644 --- a/webkit/build/JavaScriptCore/WTF.vcproj +++ b/webkit/build/JavaScriptCore/WTF.vcproj @@ -158,15 +158,15 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\unicode\Collator.h" + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\chromium\ChromiumThreading.h" > </File> <File - RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\unicode\icu\CollatorICU.cpp" + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\unicode\Collator.h" > </File> <File - RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\CurrentTime.cpp" + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\unicode\icu\CollatorICU.cpp" > </File> <File @@ -242,6 +242,10 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\chromium\MainThreadChromium.cpp" + > + </File> + <File RelativePath="..\..\pending\wtf\MathExtras.h" > </File> @@ -266,10 +270,6 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\PtrAndFlags.h" - > - </File> - <File RelativePath="..\precompiled_webkit.cc" > <FileConfiguration @@ -294,6 +294,10 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\PtrAndFlags.h" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\RandomNumber.cpp" > </File> @@ -362,15 +366,15 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\TypeTraits.cpp" + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\ThreadSpecificWin.cpp" > </File> <File - RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\TypeTraits.h" + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\TypeTraits.cpp" > </File> <File - RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\ThreadSpecificWin.cpp" + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\TypeTraits.h" > </File> <File @@ -401,14 +405,6 @@ RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\VectorTraits.h" > </File> - <File - RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\chromium\ChromiumThreading.h" - > - </File> - <File - RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\chromium\MainThreadChromium.cpp" - > - </File> </Files> <Globals> </Globals> diff --git a/webkit/build/WebKit/SConscript b/webkit/build/WebKit/SConscript index fa87fe0..8686346 100644 --- a/webkit/build/WebKit/SConscript +++ b/webkit/build/WebKit/SConscript @@ -19,6 +19,8 @@ env.Append( input_files = [ '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/ChromiumBridge.cpp', + '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/ChromiumCurrentTime.cpp', + '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/ChromiumThreading.cpp', '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/WebCString.cpp', '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/WebImageSkia.cpp', '$THIRD_PARTY_WEBKIT_DIR/WebKit/chromium/src/WebKit.cpp', diff --git a/webkit/build/WebKit/WebKit.vcproj b/webkit/build/WebKit/WebKit.vcproj index 2aa6c6c..6b798b7 100644 --- a/webkit/build/WebKit/WebKit.vcproj +++ b/webkit/build/WebKit/WebKit.vcproj @@ -180,6 +180,14 @@ > </File> <File + RelativePath="..\..\..\third_party\WebKit\WebKit\chromium\src\ChromiumCurrentTime.cpp" + > + </File> + <File + RelativePath="..\..\..\third_party\WebKit\WebKit\chromium\src\ChromiumThreading.cpp" + > + </File> + <File RelativePath="..\..\..\third_party\WebKit\WebKit\chromium\src\WebCString.cpp" > </File> diff --git a/webkit/build/WebKit/using_webkit.scons b/webkit/build/WebKit/using_webkit.scons new file mode 100644 index 0000000..6584790 --- /dev/null +++ b/webkit/build/WebKit/using_webkit.scons @@ -0,0 +1,21 @@ +# 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', + ], +) |