Title: [144348] tags/Safari-537.31.11/Source/WebCore
- Revision
- 144348
- Author
- [email protected]
- Date
- 2013-02-28 12:18:00 -0800 (Thu, 28 Feb 2013)
Log Message
Merged r143684. <rdar://problem/13315270>
Modified Paths
Diff
Modified: tags/Safari-537.31.11/Source/WebCore/ChangeLog (144347 => 144348)
--- tags/Safari-537.31.11/Source/WebCore/ChangeLog 2013-02-28 20:15:21 UTC (rev 144347)
+++ tags/Safari-537.31.11/Source/WebCore/ChangeLog 2013-02-28 20:18:00 UTC (rev 144348)
@@ -1,5 +1,18 @@
2013-02-28 Lucas Forschler <[email protected]>
+ Merge r143684
+
+ 2013-02-21 Dean Jackson <[email protected]>
+
+ Followup commit for https://bugs.webkit.org/show_bug.cgi?id=110541
+ from a comment by Jon Lee.
+
+ * html/HTMLPlugInImageElement.cpp:
+ (WebCore::HTMLPlugInImageElement::subframeLoaderWillCreatePlugIn): Logic
+ in conditional was unnecessarily complex.
+
+2013-02-28 Lucas Forschler <[email protected]>
+
Merge r143680
2013-02-21 Dean Jackson <[email protected]>
Modified: tags/Safari-537.31.11/Source/WebCore/html/HTMLPlugInImageElement.cpp (144347 => 144348)
--- tags/Safari-537.31.11/Source/WebCore/html/HTMLPlugInImageElement.cpp 2013-02-28 20:15:21 UTC (rev 144347)
+++ tags/Safari-537.31.11/Source/WebCore/html/HTMLPlugInImageElement.cpp 2013-02-28 20:18:00 UTC (rev 144348)
@@ -427,7 +427,7 @@
LayoutRect rect = toRenderEmbeddedObject(renderer())->contentBoxRect();
int width = rect.width();
int height = rect.height();
- if (!width || !height || (width <= sizingTinyDimensionThreshold || height <= sizingTinyDimensionThreshold)) {
+ if (width <= sizingTinyDimensionThreshold || height <= sizingTinyDimensionThreshold) {
LOG(Plugins, "%p Plug-in is %dx%d, set to play", this, width, height);
return;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
