diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-21 00:12:04 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-21 00:12:04 +0000 |
| commit | 0ac65462510ce73b980ea222fe8e5d8646bba5c7 (patch) | |
| tree | 47f426884062ff865c7bc574636a2fc9baa79823 | |
| parent | d9a2546996befe9b387a38bb8151ec7d5cc9022e (diff) | |
| download | chromium_src-0ac65462510ce73b980ea222fe8e5d8646bba5c7.zip chromium_src-0ac65462510ce73b980ea222fe8e5d8646bba5c7.tar.gz chromium_src-0ac65462510ce73b980ea222fe8e5d8646bba5c7.tar.bz2 | |
src/webkit side of merge 38500:38550.
Review URL: http://codereview.chromium.org/11551
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5803 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | DEPS | 4 | ||||
| -rw-r--r-- | WEBKIT_MERGE_REVISION | 2 | ||||
| -rw-r--r-- | webkit/build/JavaScriptCore/JavaScriptCore.vcproj | 4 | ||||
| -rw-r--r-- | webkit/build/V8Bindings/V8Bindings.vcproj | 8 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/JSDOMBinding.cpp | 2 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/interpreter/CallFrame.h (renamed from webkit/port/bindings/v8/runtime/ExecState.h) | 0 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/v8_custom.cpp | 2 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/v8_nodefilter.cpp | 2 |
8 files changed, 14 insertions, 10 deletions
@@ -12,7 +12,7 @@ deps = { "http://googletest.googlecode.com/svn/trunk@63", "src/third_party/WebKit": - "/trunk/deps/third_party/WebKit@5780", + "/trunk/deps/third_party/WebKit@5802", "src/third_party/icu38": "/trunk/deps/third_party/icu38@5749", @@ -21,7 +21,7 @@ deps = { "http://v8.googlecode.com/svn/trunk@768", "src/webkit/data/layout_tests/LayoutTests": - "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@38500", + "http://svn.webkit.org/repository/webkit/trunk/LayoutTests@38550", } diff --git a/WEBKIT_MERGE_REVISION b/WEBKIT_MERGE_REVISION index 138be5f..f230eb5 100644 --- a/WEBKIT_MERGE_REVISION +++ b/WEBKIT_MERGE_REVISION @@ -1 +1 @@ -http://svn.webkit.org/repository/webkit/trunk@38500
\ No newline at end of file +http://svn.webkit.org/repository/webkit/trunk@38550
\ No newline at end of file diff --git a/webkit/build/JavaScriptCore/JavaScriptCore.vcproj b/webkit/build/JavaScriptCore/JavaScriptCore.vcproj index 58c5705..cdde44d 100644 --- a/webkit/build/JavaScriptCore/JavaScriptCore.vcproj +++ b/webkit/build/JavaScriptCore/JavaScriptCore.vcproj @@ -317,11 +317,11 @@ > </File> <File - RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ExecState.cpp" + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\interpreter\CallFrame.cpp" > </File> <File - RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\runtime\ExecState.h" + RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\interpreter\CallFrame.h" > </File> <File diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj index 677f2d8..5da844e 100644 --- a/webkit/build/V8Bindings/V8Bindings.vcproj +++ b/webkit/build/V8Bindings/V8Bindings.vcproj @@ -2433,12 +2433,16 @@ </File> </Filter> <Filter - Name="runtime" + Name="interpreter" > <File - RelativePath="..\..\port\bindings\v8\runtime\ExecState.h" + RelativePath="..\..\port\bindings\v8\interpreter\CallFrame.h" > </File> + </Filter> + <Filter + Name="runtime" + > <File RelativePath="..\..\port\bindings\v8\runtime\JSLock.h" > diff --git a/webkit/port/bindings/v8/JSDOMBinding.cpp b/webkit/port/bindings/v8/JSDOMBinding.cpp index a76782f..1c2f664 100644 --- a/webkit/port/bindings/v8/JSDOMBinding.cpp +++ b/webkit/port/bindings/v8/JSDOMBinding.cpp @@ -30,7 +30,7 @@ #include "config.h" #include "JSDOMBinding.h" -#include <runtime/ExecState.h> +#include <interpreter/CallFrame.h> #include "Document.h" #include "Node.h" diff --git a/webkit/port/bindings/v8/runtime/ExecState.h b/webkit/port/bindings/v8/interpreter/CallFrame.h index 5e968a2..5e968a2 100644 --- a/webkit/port/bindings/v8/runtime/ExecState.h +++ b/webkit/port/bindings/v8/interpreter/CallFrame.h diff --git a/webkit/port/bindings/v8/v8_custom.cpp b/webkit/port/bindings/v8/v8_custom.cpp index 1d807c3..bd5acf5 100644 --- a/webkit/port/bindings/v8/v8_custom.cpp +++ b/webkit/port/bindings/v8/v8_custom.cpp @@ -25,7 +25,7 @@ #include <Assertions.h> #include <wtf/ASCIICType.h> -#include <runtime/ExecState.h> +#include <interpreter/CallFrame.h> #include "v8_proxy.h" #include "v8_events.h" diff --git a/webkit/port/bindings/v8/v8_nodefilter.cpp b/webkit/port/bindings/v8/v8_nodefilter.cpp index 19b9437..9df8b2b 100644 --- a/webkit/port/bindings/v8/v8_nodefilter.cpp +++ b/webkit/port/bindings/v8/v8_nodefilter.cpp @@ -33,7 +33,7 @@ #include "v8_proxy.h" #include "NodeFilter.h" #include "Node.h" -#include <runtime/ExecState.h> +#include <interpreter/CallFrame.h> namespace WebCore { |