Changeset 112248 in webkit

Timestamp:

Mar 27, 2012 3:52:49 AM (12 years ago)

Author:

leviw@chromium.org

Message:

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (2 diffs)
• rendering/RenderSelectionInfo.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 
@@ -56 +91 @@
         (CachedXSLStyleSheet):
 
+>>>>>>> .r112247
 2012-03-27  Levi Weintraub  <leviw@chromium.org>
 

trunk/Source/WebCore/rendering/RenderSelectionInfo.h

@@ -72 +72 @@
     }
 
-    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
 };