Title: [153030] branches/safari-537-branch/Source/WebCore
- Revision
- 153030
- Author
- [email protected]
- Date
- 2013-07-22 19:16:02 -0700 (Mon, 22 Jul 2013)
Log Message
Merged r153014. <rdar://problem/14516421>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (153029 => 153030)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-23 02:12:22 UTC (rev 153029)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-23 02:16:02 UTC (rev 153030)
@@ -1,5 +1,26 @@
2013-07-22 Lucas Forschler <[email protected]>
+ Merge r153014
+
+ 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 Lucas Forschler <[email protected]>
+
Merge r153013
2013-07-22 Tim Horton <[email protected]>
Modified: branches/safari-537-branch/Source/WebCore/rendering/RenderEmbeddedObject.cpp (153029 => 153030)
--- branches/safari-537-branch/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2013-07-23 02:12:22 UTC (rev 153029)
+++ branches/safari-537-branch/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2013-07-23 02:16:02 UTC (rev 153030)
@@ -334,7 +334,7 @@
return true;
}
-LayoutRect RenderEmbeddedObject::replacementTextRect(const LayoutPoint& accumulatedOffset) const
+LayoutRect RenderEmbeddedObject::unavailablePluginIndicatorBounds(const LayoutPoint& accumulatedOffset) const
{
FloatRect contentRect;
Path path;
@@ -344,7 +344,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();
}
@@ -366,7 +366,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: branches/safari-537-branch/Source/WebCore/rendering/RenderEmbeddedObject.h (153029 => 153030)
--- branches/safari-537-branch/Source/WebCore/rendering/RenderEmbeddedObject.h 2013-07-23 02:12:22 UTC (rev 153029)
+++ branches/safari-537-branch/Source/WebCore/rendering/RenderEmbeddedObject.h 2013-07-23 02:16:02 UTC (rev 153030)
@@ -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