Title: [153029] branches/safari-537-branch/Source/WebCore
- Revision
- 153029
- Author
- [email protected]
- Date
- 2013-07-22 19:12:22 -0700 (Mon, 22 Jul 2013)
Log Message
Merged r153013. <rdar://problem/14511232>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (153028 => 153029)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-23 02:10:16 UTC (rev 153028)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-23 02:12:22 UTC (rev 153029)
@@ -1,5 +1,27 @@
2013-07-22 Lucas Forschler <[email protected]>
+ Merge r153013
+
+ 2013-07-22 Tim Horton <[email protected]>
+
+ <applet> plugins are instantiated post-attach (instead of post-layout like for object and embed)
+ https://bugs.webkit.org/show_bug.cgi?id=118994
+ <rdar://problem/14511232>
+
+ Reviewed by Anders Carlsson.
+
+ Make <applet> consistent with <object> and <embed>, deferring plugin
+ instantiation to post-layout, so that layout is up-to-date if anything
+ needs it (like RenderEmbeddedObject::isReplacementObscured) during creation.
+
+ * html/HTMLAppletElement.cpp:
+ (WebCore::HTMLAppletElement::updateWidget):
+ Copy code from HTMLObjectElement/HTMLEmbedElement that defers plugin
+ creation until post-layout tasks. Java is always an NPAPI plugin, so
+ we should always defer if requested.
+
+2013-07-22 Lucas Forschler <[email protected]>
+
Merge r152989
2013-07-22 Dean Jackson <[email protected]>
Modified: branches/safari-537-branch/Source/WebCore/html/HTMLAppletElement.cpp (153028 => 153029)
--- branches/safari-537-branch/Source/WebCore/html/HTMLAppletElement.cpp 2013-07-23 02:10:16 UTC (rev 153028)
+++ branches/safari-537-branch/Source/WebCore/html/HTMLAppletElement.cpp 2013-07-23 02:12:22 UTC (rev 153029)
@@ -91,13 +91,22 @@
return renderPart();
}
-void HTMLAppletElement::updateWidget(PluginCreationOption)
+void HTMLAppletElement::updateWidget(PluginCreationOption pluginCreationOption)
{
setNeedsWidgetUpdate(false);
// FIXME: This should ASSERT isFinishedParsingChildren() instead.
if (!isFinishedParsingChildren())
return;
+ // FIXME: It's sadness that we have this special case here.
+ // See http://trac.webkit.org/changeset/25128 and
+ // plugins/netscape-plugin-setwindow-size.html
+ if (pluginCreationOption == CreateOnlyNonNetscapePlugins) {
+ // Ensure updateWidget() is called again during layout to create the Netscape plug-in.
+ setNeedsWidgetUpdate(true);
+ return;
+ }
+
RenderEmbeddedObject* renderer = renderEmbeddedObject();
LayoutUnit contentWidth = renderer->style()->width().isFixed() ? LayoutUnit(renderer->style()->width().value()) :
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes