Changeset 88400 in webkit

Timestamp:

Jun 8, 2011 4:00:04 PM (13 years ago)

Author:

eae@chromium.org

Message:

2011-06-08 Emil A Eklund <​eae@chromium.org>

Reviewed by Eric Seidel.

RenderEmbeddedObject::getReplacementTextGeometry
​https://bugs.webkit.org/show_bug.cgi?id=62313

Replace the last use of tx, ty with IntPoint.

Covered by existing tests.

• platform/graphics/FloatRect.h: (WebCore::FloatRect::move): (WebCore::FloatRect::moveBy):
• rendering/RenderEmbeddedObject.cpp: (WebCore::RenderEmbeddedObject::paintReplaced): (WebCore::RenderEmbeddedObject::getReplacementTextGeometry): (WebCore::RenderEmbeddedObject::isInMissingPluginIndicator):
• rendering/RenderEmbeddedObject.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/FloatRect.h (modified) (2 diffs)
• rendering/RenderEmbeddedObject.cpp (modified) (3 diffs)
• rendering/RenderEmbeddedObject.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-08  Emil A Eklund  <eae@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        RenderEmbeddedObject::getReplacementTextGeometry
+        https://bugs.webkit.org/show_bug.cgi?id=62313
+
+        Replace the last use of tx, ty with IntPoint.
+
+        Covered by existing tests.
+
+        * platform/graphics/FloatRect.h:
+        (WebCore::FloatRect::move):
+        (WebCore::FloatRect::moveBy):
+        * rendering/RenderEmbeddedObject.cpp:
+        (WebCore::RenderEmbeddedObject::paintReplaced):
+        (WebCore::RenderEmbeddedObject::getReplacementTextGeometry):
+        (WebCore::RenderEmbeddedObject::isInMissingPluginIndicator):
+        * rendering/RenderEmbeddedObject.h:
+
 2011-06-08  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/platform/graphics/FloatRect.h

@@ -71 +71 @@
 
 class IntRect;
+class IntPoint;
 
 class FloatRect {
@@ -106 +107 @@
 
     void move(const FloatSize& delta) { m_location += delta; } 
-    void move(float dx, float dy) { m_location.move(dx, dy); } 
+    void move(float dx, float dy) { m_location.move(dx, dy); }
+    void moveBy(const FloatPoint& delta) { m_location.move(delta.x(), delta.y()); }
 
     bool intersects(const FloatRect&) const;

trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp

@@ -164 +164 @@
     TextRun run("");
     float textWidth;
-    if (!getReplacementTextGeometry(paintOffset.x(), paintOffset.y(), contentRect, path, replacementTextRect, font, run, textWidth))
+    if (!getReplacementTextGeometry(paintOffset, contentRect, path, replacementTextRect, font, run, textWidth))
         return;
     
@@ -181 +181 @@
 }
 
-bool RenderEmbeddedObject::getReplacementTextGeometry(int tx, int ty, FloatRect& contentRect, Path& path, FloatRect& replacementTextRect, Font& font, TextRun& run, float& textWidth)
+bool RenderEmbeddedObject::getReplacementTextGeometry(const IntPoint& accumulatedOffset, FloatRect& contentRect, Path& path, FloatRect& replacementTextRect, Font& font, TextRun& run, float& textWidth)
 {
     contentRect = contentBoxRect();
-    contentRect.move(tx, ty);
+    contentRect.moveBy(accumulatedOffset);
     
     FontDescription fontDescription;
@@ -258 +258 @@
     TextRun run("");
     float textWidth;
-    if (!getReplacementTextGeometry(0, 0, contentRect, path, replacementTextRect, font, run, textWidth))
+    if (!getReplacementTextGeometry(IntPoint(), contentRect, path, replacementTextRect, font, run, textWidth))
         return false;
     

trunk/Source/WebCore/rendering/RenderEmbeddedObject.h

@@ -69 +69 @@
     void setMissingPluginIndicatorIsPressed(bool);
     bool isInMissingPluginIndicator(MouseEvent*);
-    bool getReplacementTextGeometry(int tx, int ty, FloatRect& contentRect, Path&, FloatRect& replacementTextRect, Font&, TextRun&, float& textWidth);
+    bool getReplacementTextGeometry(const IntPoint& accumulatedOffset, FloatRect& contentRect, Path&, FloatRect& replacementTextRect, Font&, TextRun&, float& textWidth);
 
     String m_replacementText;