Modified: trunk/Source/WebCore/ChangeLog (88399 => 88400)
--- trunk/Source/WebCore/ChangeLog 2011-06-08 22:51:08 UTC (rev 88399)
+++ trunk/Source/WebCore/ChangeLog 2011-06-08 23:00:04 UTC (rev 88400)
@@ -1,3 +1,23 @@
+2011-06-08 Emil A Eklund <e...@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_hor...@apple.com>
Reviewed by Ryosuke Niwa.
Modified: trunk/Source/WebCore/platform/graphics/FloatRect.h (88399 => 88400)
--- trunk/Source/WebCore/platform/graphics/FloatRect.h 2011-06-08 22:51:08 UTC (rev 88399)
+++ trunk/Source/WebCore/platform/graphics/FloatRect.h 2011-06-08 23:00:04 UTC (rev 88400)
@@ -70,6 +70,7 @@
#endif
class IntRect;
+class IntPoint;
class FloatRect {
public:
@@ -105,7 +106,8 @@
FloatPoint center() const { return FloatPoint(x() + width() / 2, y() + height() / 2); }
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;
bool contains(const FloatRect&) const;
Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp (88399 => 88400)
--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2011-06-08 22:51:08 UTC (rev 88399)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.cpp 2011-06-08 23:00:04 UTC (rev 88400)
@@ -163,7 +163,7 @@
Font font;
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;
GraphicsContextStateSaver stateSaver(*context);
@@ -180,10 +180,10 @@
context->drawBidiText(font, run, FloatPoint(labelX, labelY));
}
-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;
RenderTheme::defaultTheme()->systemFont(CSSValueWebkitSmallControl, fontDescription);
@@ -257,7 +257,7 @@
Font font;
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;
return path.contains(absoluteToLocal(event->absoluteLocation(), false, true));
Modified: trunk/Source/WebCore/rendering/RenderEmbeddedObject.h (88399 => 88400)
--- trunk/Source/WebCore/rendering/RenderEmbeddedObject.h 2011-06-08 22:51:08 UTC (rev 88399)
+++ trunk/Source/WebCore/rendering/RenderEmbeddedObject.h 2011-06-08 23:00:04 UTC (rev 88400)
@@ -68,7 +68,7 @@
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;
bool m_hasFallbackContent; // FIXME: This belongs on HTMLObjectElement.
