diff options
| author | Steve Block <steveblock@google.com> | 2010-02-16 18:57:53 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-17 10:28:46 +0000 |
| commit | 3eb2fab210a9ae636c55b30b23bb53b130d1efb6 (patch) | |
| tree | 0ece7655ec5e35392c9567bd5172b46034613ce4 /WebCore/bindings/v8/V8Proxy.cpp | |
| parent | f0cd1188eb59c99056536dcaece36f348f594ac9 (diff) | |
| download | external_webkit-3eb2fab210a9ae636c55b30b23bb53b130d1efb6.zip external_webkit-3eb2fab210a9ae636c55b30b23bb53b130d1efb6.tar.gz external_webkit-3eb2fab210a9ae636c55b30b23bb53b130d1efb6.tar.bz2 | |
Updates Android to reflect upstreaming of CHROMIUM and XPATH guards in V8 bindings
See http://trac.webkit.org/changeset/54881
Change-Id: I7bf987cbdc8e88e39317551c098475d8f92cd582
Diffstat (limited to 'WebCore/bindings/v8/V8Proxy.cpp')
| -rw-r--r-- | WebCore/bindings/v8/V8Proxy.cpp | 23 |
1 files changed, 8 insertions, 15 deletions
diff --git a/WebCore/bindings/v8/V8Proxy.cpp b/WebCore/bindings/v8/V8Proxy.cpp index 6e2d8b2..9b1fff5 100644 --- a/WebCore/bindings/v8/V8Proxy.cpp +++ b/WebCore/bindings/v8/V8Proxy.cpp @@ -39,6 +39,7 @@ #include "InspectorTimelineAgent.h" #include "Page.h" #include "PageGroup.h" +#include "PlatformBridge.h" #include "ScriptController.h" #include "StorageNamespace.h" #include "V8Binding.h" @@ -69,10 +70,6 @@ #include <wtf/StringExtras.h> #include <wtf/UnusedParam.h> -#if PLATFORM(CHROMIUM) -#include "ChromiumBridge.h" -#endif - #ifdef ANDROID_INSTRUMENT #include "TimeCounter.h" #endif @@ -281,8 +278,7 @@ bool V8Proxy::handleOutOfMemory() } #if PLATFORM(CHROMIUM) - // TODO (andreip): ChromeBridge -> BrowserBridge? - ChromiumBridge::notifyJSOutOfMemory(frame); + PlatformBridge::notifyJSOutOfMemory(frame); #endif // Disable JS. @@ -381,34 +377,31 @@ v8::Local<v8::Value> V8Proxy::evaluate(const ScriptSourceCode& source, Node* nod // Compile the script. v8::Local<v8::String> code = v8ExternalString(source.source()); #if PLATFORM(CHROMIUM) - // TODO(andreip): ChromeBridge->BrowserBridge? - ChromiumBridge::traceEventBegin("v8.compile", node, ""); + PlatformBridge::traceEventBegin("v8.compile", node, ""); #endif // NOTE: For compatibility with WebCore, ScriptSourceCode's line starts at // 1, whereas v8 starts at 0. v8::Handle<v8::Script> script = compileScript(code, source.url(), source.startLine() - 1); #if PLATFORM(CHROMIUM) - // TODO(andreip): ChromeBridge->BrowserBridge? - ChromiumBridge::traceEventEnd("v8.compile", node, ""); + PlatformBridge::traceEventEnd("v8.compile", node, ""); - ChromiumBridge::traceEventBegin("v8.run", node, ""); + PlatformBridge::traceEventBegin("v8.run", node, ""); #endif // Set inlineCode to true for <a href="javascript:doSomething()"> // and false for <script>doSomething</script>. We make a rough guess at // this based on whether the script source has a URL. result = runScript(script, source.url().string().isNull()); } +#if PLATFORM(CHROMIUM) + PlatformBridge::traceEventEnd("v8.run", node, ""); +#endif #if ENABLE(INSPECTOR) if (InspectorTimelineAgent* timelineAgent = m_frame->page() ? m_frame->page()->inspectorTimelineAgent() : 0) timelineAgent->didEvaluateScript(); #endif -#if PLATFORM(CHROMIUM) - // TODO(andreip): upstream CHROMIUM guards to webkit.org - ChromiumBridge::traceEventEnd("v8.run", node, ""); -#endif return result; } |