diff options
| author | Iain Merrick <husky@google.com> | 2010-09-13 17:10:07 +0100 |
|---|---|---|
| committer | Iain Merrick <husky@google.com> | 2010-09-16 12:10:43 +0100 |
| commit | 92451d3c3cebc17dfa2908de5836d2dae50d4a42 (patch) | |
| tree | a1928379089f64399420a8e6f2cc4a9c52b08337 /WebCore/bindings | |
| parent | 5abb8606fa57c3ebfc8b3c3dbc3fa4a25d2ae306 (diff) | |
| download | external_webkit-92451d3c3cebc17dfa2908de5836d2dae50d4a42.zip external_webkit-92451d3c3cebc17dfa2908de5836d2dae50d4a42.tar.gz external_webkit-92451d3c3cebc17dfa2908de5836d2dae50d4a42.tar.bz2 | |
Merge WebKit at r67178 : Fix conflicts.
V8DOMWindowShell::initContextIfNeeded now has a return value:
http://trac.webkit.org/changeset/66840
DocLoader renamed to CachedResourceLoader. This affects
loader/*, ResourceHandleAndroid.cpp and WebSettings.cpp
http://trac.webkit.org/changeset/66963
Change-Id: I3ea74336a4a0236f7487b794982b9d19e08c1c45
Diffstat (limited to 'WebCore/bindings')
| -rw-r--r-- | WebCore/bindings/v8/V8DOMWindowShell.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/WebCore/bindings/v8/V8DOMWindowShell.cpp b/WebCore/bindings/v8/V8DOMWindowShell.cpp index a69eab4..f0f473d 100644 --- a/WebCore/bindings/v8/V8DOMWindowShell.cpp +++ b/WebCore/bindings/v8/V8DOMWindowShell.cpp @@ -319,13 +319,11 @@ bool V8DOMWindowShell::initContextIfNeeded() // we do isolated worlds the WebCore way. m_frame->loader()->dispatchDidClearWindowObjectInWorld(0); -<<<<<<< HEAD #ifdef ANDROID_INSTRUMENT android::TimeCounter::record(android::TimeCounter::JavaScriptInitTimeCounter, __FUNCTION__); #endif -======= + return true; ->>>>>>> webkit.org at r67178 } v8::Persistent<v8::Context> V8DOMWindowShell::createNewContext(v8::Handle<v8::Object> global, int extensionGroup) |