diff options
| author | Grace Kloba <klobag@google.com> | 2010-05-24 09:07:53 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-05-24 09:07:53 -0700 |
| commit | ed673adb74ab995cdb3f3d3a02fe8862cb216a76 (patch) | |
| tree | 348e4e193dcc7f8606f21a55b7dd1bbf8fa2ec77 /WebCore | |
| parent | ded190db41af0886b9cf1a4a86597e8d8dd06d5d (diff) | |
| parent | b31073102b4df9c6f531ad939e5d0f4d8880a9e5 (diff) | |
| download | external_webkit-ed673adb74ab995cdb3f3d3a02fe8862cb216a76.zip external_webkit-ed673adb74ab995cdb3f3d3a02fe8862cb216a76.tar.gz external_webkit-ed673adb74ab995cdb3f3d3a02fe8862cb216a76.tar.bz2 | |
Merge "Fix a binding big in WebKit which prevents url hijacking for mobile adsense."
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/bindings/generic/BindingDOMWindow.h | 2 | ||||
| -rw-r--r-- | WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/WebCore/bindings/generic/BindingDOMWindow.h b/WebCore/bindings/generic/BindingDOMWindow.h index b46bdf9..f883d11 100644 --- a/WebCore/bindings/generic/BindingDOMWindow.h +++ b/WebCore/bindings/generic/BindingDOMWindow.h @@ -109,7 +109,7 @@ Frame* BindingDOMWindow<Binding>::createWindow(State<Binding>* state, if (created) newFrame->loader()->changeLocation(completedUrl, referrer, false, false, userGesture); else if (!url.isEmpty()) - newFrame->redirectScheduler()->scheduleLocationChange(completedUrl.string(), referrer, false, userGesture); + newFrame->redirectScheduler()->scheduleLocationChange(completedUrl.string(), referrer, false, false, userGesture); } return newFrame; diff --git a/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp b/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp index 6a53a1f..ff2be37 100644 --- a/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp +++ b/WebCore/bindings/v8/custom/V8DOMWindowCustom.cpp @@ -574,7 +574,7 @@ v8::Handle<v8::Value> V8DOMWindow::openCallback(const v8::Arguments& args) // the outgoingReferrer. We replicate that behavior here. String referrer = enteredFrame->loader()->outgoingReferrer(); - frame->redirectScheduler()->scheduleLocationChange(completedUrl, referrer, false, userGesture); + frame->redirectScheduler()->scheduleLocationChange(completedUrl, referrer, false, false, userGesture); } return toV8(frame->domWindow()); } |