Convert RenderSelectionInfo::rect to LayoutUnits

https://bugs.webkit.org/show_bug.cgi?id=82213

Reviewed by Eric Seidel.

RenderSelectionInfoBase stores a cached repaint rect in local coordinates. Coordinates local to
renderers should be stored in LayoutUnits.

No new tests. No change in behavior.

* rendering/RenderSelectionInfo.h:
(WebCore::RenderSelectionInfo::rect):
(RenderSelectionInfo):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@112248 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index d87743e..ef50b3f 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,38 @@
+2012-03-26  Levi Weintraub  <leviw@chromium.org>
+
+        Convert RenderSelectionInfo::rect to LayoutUnits
+        https://bugs.webkit.org/show_bug.cgi?id=82213
+
+        Reviewed by Eric Seidel.
+
+        RenderSelectionInfoBase stores a cached repaint rect in local coordinates. Coordinates local to
+        renderers should be stored in LayoutUnits.
+
+        No new tests. No change in behavior.
+
+        * rendering/RenderSelectionInfo.h:
+        (WebCore::RenderSelectionInfo::rect):
+        (RenderSelectionInfo):
+
+<<<<<<< .mine
+2012-03-26  Levi Weintraub  <leviw@chromium.org>
+
+        Convert RenderSelectionInfo::rect to LayoutUnits
+        https://bugs.webkit.org/show_bug.cgi?id=82213
+
+        Reviewed by Eric Seidel.
+
+        RenderSelectionInfoBase stores a cached repaint rect in local coordinates. Coordinates
+        local to renderers should be stored in LayoutUnits as described in
+        http://trac.webkit.org/wiki/LayoutUnit
+
+        No new tests. No change in behavior.
+
+        * rendering/RenderSelectionInfo.h:
+        (WebCore::RenderSelectionInfo::rect):
+        (RenderSelectionInfo):
+
+=======
 2012-03-27  Nikolas Zimmermann  <nzimmermann@rim.com>
 
         Enable animVal support for SVGAnimatedRect
@@ -55,6 +90,7 @@
         * loader/cache/CachedXSLStyleSheet.h:
         (CachedXSLStyleSheet):
 
+>>>>>>> .r112247
 2012-03-27  Levi Weintraub  <leviw@chromium.org>
 
         LayoutRepainter: Remove unused constructor parameter and update to LayoutUnits

diff --git a/Source/WebCore/rendering/RenderSelectionInfo.h b/Source/WebCore/rendering/RenderSelectionInfo.h
index c5e76ee..8936a37 100644 (file)
--- a/Source/WebCore/rendering/RenderSelectionInfo.h
+++ b/Source/WebCore/rendering/RenderSelectionInfo.h
@@ -71,10 +71,10 @@ public:
         m_object->repaintUsingContainer(m_repaintContainer, m_rect);
     }
 
-    IntRect rect() const { return m_rect; }
+    LayoutRect rect() const { return m_rect; }
 
 private:
-    IntRect m_rect; // relative to repaint container
+    LayoutRect m_rect; // relative to repaint container
 };