[webkit-changes] [218838] trunk/Source/WebCore

Tue, 27 Jun 2017 12:52:35 -0700

Title: [218838] trunk/Source/WebCore
Revision
218838
Author
za...@apple.com
Date
2017-06-27 12:52:00 -0700 (Tue, 27 Jun 2017)

Log Message

Add RenderEmbeddedObject::getReplacementTextGeometry helper.
https://bugs.webkit.org/show_bug.cgi?id=173847

Reviewed by Simon Fraser.

...and remove getReplacementTextGeometry's redundant return value.

No change in functionality.

* rendering/RenderEmbeddedObject.cpp:
(WebCore::RenderEmbeddedObject::paintReplaced):
(WebCore::RenderEmbeddedObject::getReplacementTextGeometry):
(WebCore::RenderEmbeddedObject::unavailablePluginIndicatorBounds):
(WebCore::RenderEmbeddedObject::isInUnavailablePluginIndicator):
* rendering/RenderEmbeddedObject.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (218837 => 218838)


--- trunk/Source/WebCore/ChangeLog	2017-06-27 19:11:34 UTC (rev 218837)
+++ trunk/Source/WebCore/ChangeLog	2017-06-27 19:52:00 UTC (rev 218838)
@@ -1,3 +1,21 @@
+2017-06-27  Zalan Bujtas  <za...@apple.com>
+
+        Add RenderEmbeddedObject::getReplacementTextGeometry helper.
+        https://bugs.webkit.org/show_bug.cgi?id=173847
+
+        Reviewed by Simon Fraser.
+
+        ...and remove getReplacementTextGeometry's redundant return value. 
+
+        No change in functionality.
+
+        * rendering/RenderEmbeddedObject.cpp:
+        (WebCore::RenderEmbeddedObject::paintReplaced):
+        (WebCore::RenderEmbeddedObject::getReplacementTextGeometry):
+        (WebCore::RenderEmbeddedObject::unavailablePluginIndicatorBounds):
+        (WebCore::RenderEmbeddedObject::isInUnavailablePluginIndicator):
+        * rendering/RenderEmbeddedObject.h:
+
 2017-06-27  Wenson Hsieh  <wenson_hs...@apple.com>
 
         Refactor drag start codepaths to plumb a DragItem to client layers

Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp (218837 => 218838)


--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp	2017-06-27 19:11:34 UTC (rev 218837)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp	2017-06-27 19:52:00 UTC (rev 218838)
@@ -301,8 +301,7 @@
     FontCascade font;
     TextRun run(emptyString());
     float textWidth;
-    if (!getReplacementTextGeometry(paintOffset, contentRect, indicatorRect, replacementTextRect, arrowRect, font, run, textWidth))
-        return;
+    getReplacementTextGeometry(paintOffset, contentRect, indicatorRect, replacementTextRect, arrowRect, font, run, textWidth);
 
     Path background;
     background.addRoundedRect(indicatorRect, FloatSize(replacementTextRoundedRectRadius, replacementTextRoundedRectRadius));
@@ -349,8 +348,21 @@
     repaint();
 }
 
-bool RenderEmbeddedObject::getReplacementTextGeometry(const LayoutPoint& accumulatedOffset, FloatRect& contentRect, FloatRect& indicatorRect, FloatRect& replacementTextRect, FloatRect& arrowRect, FontCascade& font, TextRun& run, float& textWidth) const
+LayoutRect RenderEmbeddedObject::getReplacementTextGeometry(const LayoutPoint& accumulatedOffset) const
 {
+    FloatRect contentRect;
+    FloatRect indicatorRect;
+    FloatRect replacementTextRect;
+    FloatRect arrowRect;
+    FontCascade font;
+    TextRun run(emptyString());
+    float textWidth;
+    getReplacementTextGeometry(accumulatedOffset, contentRect, indicatorRect, replacementTextRect, arrowRect, font, run, textWidth);
+    return LayoutRect(indicatorRect);
+}
+
+void RenderEmbeddedObject::getReplacementTextGeometry(const LayoutPoint& accumulatedOffset, FloatRect& contentRect, FloatRect& indicatorRect, FloatRect& replacementTextRect, FloatRect& arrowRect, FontCascade& font, TextRun& run, float& textWidth) const
+{
     bool includesArrow = shouldUnavailablePluginMessageBeButton(page(), m_pluginUnavailabilityReason);
 
     contentRect = contentBoxRect();
@@ -381,23 +393,11 @@
         arrowRect.setWidth(arrowRect.height());
         indicatorRect.unite(arrowRect);
     }
-
-    return true;
 }
 
 LayoutRect RenderEmbeddedObject::unavailablePluginIndicatorBounds(const LayoutPoint& accumulatedOffset) const
 {
-    FloatRect contentRect;
-    FloatRect indicatorRect;
-    FloatRect replacementTextRect;
-    FloatRect arrowRect;
-    FontCascade font;
-    TextRun run(emptyString());
-    float textWidth;
-    if (getReplacementTextGeometry(accumulatedOffset, contentRect, indicatorRect, replacementTextRect, arrowRect, font, run, textWidth))
-        return LayoutRect(indicatorRect);
-
-    return LayoutRect();
+    return getReplacementTextGeometry(accumulatedOffset);
 }
 
 bool RenderEmbeddedObject::isReplacementObscured() const
@@ -580,15 +580,7 @@
 
 bool RenderEmbeddedObject::isInUnavailablePluginIndicator(const FloatPoint& point) const
 {
-    FloatRect contentRect;
-    FloatRect indicatorRect;
-    FloatRect replacementTextRect;
-    FloatRect arrowRect;
-    FontCascade font;
-    TextRun run(emptyString());
-    float textWidth;
-    return getReplacementTextGeometry(IntPoint(), contentRect, indicatorRect, replacementTextRect, arrowRect, font, run, textWidth)
-        && indicatorRect.contains(point);
+    return getReplacementTextGeometry(LayoutPoint()).contains(LayoutPoint(point));
 }
 
 bool RenderEmbeddedObject::isInUnavailablePluginIndicator(const MouseEvent& event) const

Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.h (218837 => 218838)


--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.h	2017-06-27 19:11:34 UTC (rev 218837)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.h	2017-06-27 19:52:00 UTC (rev 218838)
@@ -86,7 +86,8 @@
     void setUnavailablePluginIndicatorIsPressed(bool);
     bool isInUnavailablePluginIndicator(const MouseEvent&) const;
     bool isInUnavailablePluginIndicator(const FloatPoint&) const;
-    bool getReplacementTextGeometry(const LayoutPoint& accumulatedOffset, FloatRect& contentRect, FloatRect& indicatorRect, FloatRect& replacementTextRect, FloatRect& arrowRect, FontCascade&, TextRun&, float& textWidth) const;
+    void getReplacementTextGeometry(const LayoutPoint& accumulatedOffset, FloatRect& contentRect, FloatRect& indicatorRect, FloatRect& replacementTextRect, FloatRect& arrowRect, FontCascade&, TextRun&, float& textWidth) const;
+    LayoutRect getReplacementTextGeometry(const LayoutPoint& accumulatedOffset) const;
     LayoutRect unavailablePluginIndicatorBounds(const LayoutPoint&) const;
 
     bool canHaveChildren() const final;

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to