Title: [154255] trunk/Source/WebCore
- Revision
- 154255
- Author
- [email protected]
- Date
- 2013-08-18 16:05:35 -0700 (Sun, 18 Aug 2013)
Log Message
Fix crashing plugin tests caused by a logic error in the previous patch.
Not reviewed.
* html/HTMLPlugInImageElement.cpp:
(WebCore::HTMLPlugInImageElement::willDetachRenderers):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (154254 => 154255)
--- trunk/Source/WebCore/ChangeLog 2013-08-18 20:01:20 UTC (rev 154254)
+++ trunk/Source/WebCore/ChangeLog 2013-08-18 23:05:35 UTC (rev 154255)
@@ -1,5 +1,14 @@
2013-08-18 Antti Koivisto <[email protected]>
+ Fix crashing plugin tests caused by a logic error in the previous patch.
+
+ Not reviewed.
+
+ * html/HTMLPlugInImageElement.cpp:
+ (WebCore::HTMLPlugInImageElement::willDetachRenderers):
+
+2013-08-18 Antti Koivisto <[email protected]>
+
<https://webkit.org/b/119982> Make Element::attach non-virtual
Reviewed by Andreas Kling.
Modified: trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp (154254 => 154255)
--- trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2013-08-18 20:01:20 UTC (rev 154254)
+++ trunk/Source/WebCore/html/HTMLPlugInImageElement.cpp 2013-08-18 23:05:35 UTC (rev 154255)
@@ -249,13 +249,10 @@
// FIXME: Because of the insanity that is HTMLPlugInImageElement::willRecalcStyle,
// we can end up detaching during an attach() call, before we even have a
// renderer. In that case, don't mark the widget for update.
- if (!attached() || !renderer())
- return;
- if (useFallbackContent())
- return;
- // Update the widget the next time we attach (detaching destroys the plugin).
- setNeedsWidgetUpdate(true);
-
+ if (attached() && renderer() && !useFallbackContent()) {
+ // Update the widget the next time we attach (detaching destroys the plugin).
+ setNeedsWidgetUpdate(true);
+ }
HTMLPlugInElement::willDetachRenderers();
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
