diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
| commit | 3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch) | |
| tree | 73dc228333948738bbe02976cacca8cd382bc978 /Source/WebKit/chromium/src/WebBindings.cpp | |
| parent | b32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff) | |
| download | qtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz | |
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/WebKit/chromium/src/WebBindings.cpp')
| -rw-r--r-- | Source/WebKit/chromium/src/WebBindings.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Source/WebKit/chromium/src/WebBindings.cpp b/Source/WebKit/chromium/src/WebBindings.cpp index 926db3b11..786a4175b 100644 --- a/Source/WebKit/chromium/src/WebBindings.cpp +++ b/Source/WebKit/chromium/src/WebBindings.cpp @@ -35,18 +35,20 @@ #include "npruntime_priv.h" #if USE(V8) -#include <wtf/ArrayBufferView.h> +#include "BindingState.h" #include "DOMWindow.h" +#include "Frame.h" #include "NPV8Object.h" // for PrivateIdentifier #include "Range.h" #include "V8ArrayBuffer.h" #include "V8ArrayBufferView.h" -#include "V8BindingState.h" #include "V8DOMWrapper.h" #include "V8Element.h" #include "V8NPUtils.h" #include "V8Proxy.h" #include "V8Range.h" +#include <wtf/ArrayBufferView.h> +// FIXME: Remove the USE(JSC) ifdefs because we don't support USE(JSC) anymore. #elif USE(JSC) #include "bridge/c/c_utility.h" #endif @@ -288,7 +290,7 @@ static NPObject* makeIntArrayImpl(const WebVector<int>& data) for (size_t i = 0; i < data.size(); ++i) result->Set(i, v8::Number::New(data[i])); - DOMWindow* window = V8Proxy::retrieveWindow(V8Proxy::currentContext()); + DOMWindow* window = V8Proxy::retrieveWindow(v8::Context::GetCurrent()); return npCreateV8ScriptObject(0, result, window); } @@ -299,7 +301,7 @@ static NPObject* makeStringArrayImpl(const WebVector<WebString>& data) for (size_t i = 0; i < data.size(); ++i) result->Set(i, data[i].data() ? v8::String::New(reinterpret_cast<const uint16_t*>((data[i].data())), data[i].length()) : v8::String::New("")); - DOMWindow* window = V8Proxy::retrieveWindow(V8Proxy::currentContext()); + DOMWindow* window = V8Proxy::retrieveWindow(v8::Context::GetCurrent()); return npCreateV8ScriptObject(0, result, window); } |