Title: [183145] branches/safari-600.7-branch/Source/WebKit2
- Revision
- 183145
- Author
- [email protected]
- Date
- 2015-04-22 15:41:28 -0700 (Wed, 22 Apr 2015)
Log Message
Merge r182746. rdar://problem/20645260
Modified Paths
Diff
Modified: branches/safari-600.7-branch/Source/WebKit2/ChangeLog (183144 => 183145)
--- branches/safari-600.7-branch/Source/WebKit2/ChangeLog 2015-04-22 22:41:23 UTC (rev 183144)
+++ branches/safari-600.7-branch/Source/WebKit2/ChangeLog 2015-04-22 22:41:28 UTC (rev 183145)
@@ -1,5 +1,21 @@
2015-04-22 Matthew Hanson <[email protected]>
+ Merge r182746. rdar://problem/20645260
+
+ 2015-04-13 Timothy Horton <[email protected]>
+
+ _javascript_: links in inline PDFs shouldn't execute _javascript_ in the context of the host website
+ https://bugs.webkit.org/show_bug.cgi?id=143642
+ <rdar://problem/18259355>
+
+ Reviewed by Darin Adler.
+
+ * WebProcess/Plugins/PDF/PDFPlugin.mm:
+ (WebKit::PDFPlugin::clickedLink):
+ Don't follow _javascript_: URLs.
+
+2015-04-22 Matthew Hanson <[email protected]>
+
Merge r182084. rdar://problem/20557359
2015-03-27 Andreas Kling <[email protected]>
Modified: branches/safari-600.7-branch/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm (183144 => 183145)
--- branches/safari-600.7-branch/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2015-04-22 22:41:23 UTC (rev 183144)
+++ branches/safari-600.7-branch/Source/WebKit2/WebProcess/Plugins/PDF/PDFPlugin.mm 2015-04-22 22:41:28 UTC (rev 183145)
@@ -1564,13 +1564,17 @@
void PDFPlugin::clickedLink(NSURL *url)
{
+ URL coreURL = url;
+ if (protocolIsJavaScript(coreURL))
+ return;
+
Frame* frame = webFrame()->coreFrame();
RefPtr<Event> coreEvent;
if (m_lastMouseEvent.type() != WebEvent::NoType)
coreEvent = MouseEvent::create(eventNames().clickEvent, frame->document()->defaultView(), platform(m_lastMouseEvent), 0, 0);
- frame->loader().urlSelected(url, emptyString(), coreEvent.get(), LockHistory::No, LockBackForwardList::No, MaybeSendReferrer);
+ frame->loader().urlSelected(coreURL, emptyString(), coreEvent.get(), LockHistory::No, LockBackForwardList::No, MaybeSendReferrer);
}
void PDFPlugin::setActiveAnnotation(PDFAnnotation *annotation)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
