Title: [153014] trunk/Source/WebCore
- Revision
- 153014
- Author
- [email protected]
- Date
- 2013-07-22 17:14:59 -0700 (Mon, 22 Jul 2013)
Log Message
RenderEmbeddedObject::isReplacementObscured should include the arrow in its area-of-interest
https://bugs.webkit.org/show_bug.cgi?id=118995
<rdar://problem/14516421>
Reviewed by Anders Carlsson.
* rendering/RenderEmbeddedObject.cpp:
(WebCore::RenderEmbeddedObject::unavailablePluginIndicatorBounds):
Rename method from replacementTextRect to unavailablePluginIndicatorBounds for accuracy.
Use the bounding box of the indicator's path, which includes the rounded rect behind
the text as well as the arrow button.
(WebCore::RenderEmbeddedObject::isReplacementObscured):
* rendering/RenderEmbeddedObject.h:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (153013 => 153014)
--- trunk/Source/WebCore/ChangeLog 2013-07-23 00:05:46 UTC (rev 153013)
+++ trunk/Source/WebCore/ChangeLog 2013-07-23 00:14:59 UTC (rev 153014)
@@ -1,5 +1,22 @@
2013-07-22 Tim Horton <[email protected]>
+ RenderEmbeddedObject::isReplacementObscured should include the arrow in its area-of-interest
+ https://bugs.webkit.org/show_bug.cgi?id=118995
+ <rdar://problem/14516421>
+
+ Reviewed by Anders Carlsson.
+
+ * rendering/RenderEmbeddedObject.cpp:
+ (WebCore::RenderEmbeddedObject::unavailablePluginIndicatorBounds):
+ Rename method from replacementTextRect to unavailablePluginIndicatorBounds for accuracy.
+ Use the bounding box of the indicator's path, which includes the rounded rect behind
+ the text as well as the arrow button.
+
+ (WebCore::RenderEmbeddedObject::isReplacementObscured):
+ * rendering/RenderEmbeddedObject.h:
+
+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>
Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp (153013 => 153014)
--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2013-07-23 00:05:46 UTC (rev 153013)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2013-07-23 00:14:59 UTC (rev 153014)
@@ -335,7 +335,7 @@
return true;
}
-LayoutRect RenderEmbeddedObject::replacementTextRect(const LayoutPoint& accumulatedOffset) const
+LayoutRect RenderEmbeddedObject::unavailablePluginIndicatorBounds(const LayoutPoint& accumulatedOffset) const
{
FloatRect contentRect;
Path path;
@@ -345,7 +345,7 @@
TextRun run("", 0);
float textWidth;
if (getReplacementTextGeometry(accumulatedOffset, contentRect, path, replacementTextRect, arrowRect, font, run, textWidth))
- return LayoutRect(replacementTextRect);
+ return LayoutRect(path.boundingRect());
return LayoutRect();
}
@@ -367,7 +367,7 @@
// Calculate the absolute rect for the blocked plugin replacement text.
IntRect absoluteBoundingBox = absoluteBoundingBoxRect();
LayoutPoint absoluteLocation(absoluteBoundingBox.location());
- LayoutRect rect = replacementTextRect(absoluteLocation);
+ LayoutRect rect = unavailablePluginIndicatorBounds(absoluteLocation);
if (rect.isEmpty())
return true;
Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.h (153013 => 153014)
--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.h 2013-07-23 00:05:46 UTC (rev 153013)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.h 2013-07-23 00:14:59 UTC (rev 153014)
@@ -93,7 +93,7 @@
bool isInUnavailablePluginIndicator(MouseEvent*) const;
bool isInUnavailablePluginIndicator(const LayoutPoint&) const;
bool getReplacementTextGeometry(const LayoutPoint& accumulatedOffset, FloatRect& contentRect, Path&, FloatRect& replacementTextRect, FloatRect& arrowRect, Font&, TextRun&, float& textWidth) const;
- LayoutRect replacementTextRect(const LayoutPoint&) const;
+ LayoutRect unavailablePluginIndicatorBounds(const LayoutPoint&) const;
virtual bool canHaveChildren() const;
virtual RenderObjectChildList* virtualChildren() { return children(); }
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes