Title: [134109] branches/safari-536.28-branch/Source/WebKit2
- Revision
- 134109
- Author
- [email protected]
- Date
- 2012-11-09 13:53:27 -0800 (Fri, 09 Nov 2012)
Log Message
Merged r126490. <rdar://problem/12516330>
Modified Paths
Diff
Modified: branches/safari-536.28-branch/Source/WebKit2/ChangeLog (134108 => 134109)
--- branches/safari-536.28-branch/Source/WebKit2/ChangeLog 2012-11-09 21:53:14 UTC (rev 134108)
+++ branches/safari-536.28-branch/Source/WebKit2/ChangeLog 2012-11-09 21:53:27 UTC (rev 134109)
@@ -1,3 +1,17 @@
+2012-11-09 Lucas Forschler <[email protected]>
+
+ Merge r126490
+
+ 2012-08-23 Brady Eidson <[email protected]>
+
+ REGRESSION (r124815): PDF in frame does not display any more
+ <rdar://problem/12063306> and https://bugs.webkit.org/show_bug.cgi?id=94869
+
+ Reviewed by Alexey Proskuryakov.
+
+ * WebProcess/Plugins/PDF/BuiltInPDFView.mm:
+ (WebKit::BuiltInPDFView::initialize): Tell the controller that initialization was successful.
+
2012-11-08 Lucas Forschler <[email protected]>
Merge r125695
@@ -47800,3 +47814,4 @@
.
.
.
+.
Modified: branches/safari-536.28-branch/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.mm (134108 => 134109)
--- branches/safari-536.28-branch/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.mm 2012-11-09 21:53:14 UTC (rev 134108)
+++ branches/safari-536.28-branch/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.mm 2012-11-09 21:53:27 UTC (rev 134109)
@@ -342,6 +342,7 @@
if (!parameters.shouldUseManualLoader && !parameters.url.isEmpty())
controller()->loadURL(pdfDocumentRequestID, "GET", parameters.url.string(), String(), HTTPHeaderMap(), Vector<uint8_t>(), false);
+ controller()->didInitializePlugin();
return true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
