[webkit-changes] [112733] branches/subpixellayout/Source/WebCore

[eae]

Title: [112733] branches/subpixellayout/Source/WebCore

Revision

112733

Author

e...@chromium.org

Date

2012-03-30 15:26:44 -0700 (Fri, 30 Mar 2012)

Log Message

subpixel branch cleanup

Modified Paths

• branches/subpixellayout/Source/WebCore/dom/ClientRect.cpp
• branches/subpixellayout/Source/WebCore/dom/ClientRect.h
• branches/subpixellayout/Source/WebCore/rendering/RenderTextControlSingleLine.cpp

Diff

Modified: branches/subpixellayout/Source/WebCore/dom/ClientRect.cpp (112732 => 112733)

--- branches/subpixellayout/Source/WebCore/dom/ClientRect.cpp	2012-03-30 22:24:51 UTC (rev 112732)
+++ branches/subpixellayout/Source/WebCore/dom/ClientRect.cpp	2012-03-30 22:26:44 UTC (rev 112733)
@@ -26,7 +26,6 @@
 
 #include "config.h"
 #include "ClientRect.h"
-#include "LayoutTypes.h"
 
 namespace WebCore {
 
@@ -39,10 +38,6 @@
 {
 }
 
-ClientRect::ClientRect(const LayoutRect& rect)
-    : m_rect(rect)
-{
-}
 ClientRect::ClientRect(const FloatRect& rect)
     : m_rect(rect)
 {

Modified: branches/subpixellayout/Source/WebCore/dom/ClientRect.h (112732 => 112733)

--- branches/subpixellayout/Source/WebCore/dom/ClientRect.h	2012-03-30 22:24:51 UTC (rev 112732)
+++ branches/subpixellayout/Source/WebCore/dom/ClientRect.h	2012-03-30 22:26:44 UTC (rev 112733)
@@ -28,7 +28,6 @@
 #define ClientRect_h
 
 #include "FloatRect.h"
-#include "LayoutTypes.h"
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefCounted.h>
 
@@ -40,7 +39,6 @@
     public:
         static PassRefPtr<ClientRect> create() { return adoptRef(new ClientRect); }
         static PassRefPtr<ClientRect> create(const IntRect& rect) { return adoptRef(new ClientRect(rect)); }
-        static PassRefPtr<ClientRect> create(const LayoutRect& rect) { return adoptRef(new ClientRect(rect)); }
         static PassRefPtr<ClientRect> create(const FloatRect& rect) { return adoptRef(new ClientRect(rect)); }
 
         float top() const { return m_rect.y(); }
@@ -53,7 +51,6 @@
     private:
         ClientRect();
         ClientRect(const IntRect&);
-        ClientRect(const LayoutRect&);
         ClientRect(const FloatRect&);
 
         FloatRect m_rect;

Modified: branches/subpixellayout/Source/WebCore/rendering/RenderTextControlSingleLine.cpp (112732 => 112733)

--- branches/subpixellayout/Source/WebCore/rendering/RenderTextControlSingleLine.cpp	2012-03-30 22:24:51 UTC (rev 112732)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderTextControlSingleLine.cpp	2012-03-30 22:26:44 UTC (rev 112733)
@@ -398,7 +398,7 @@
     if (factor <= 0)
         factor = 20;
 
-    LayoutUnit result = static_cast<LayoutUnit>(ceilf(charWidth * factor));
+    LayoutUnit result = static_cast<LayoutUnit>(ceiledLayoutUnit(charWidth * factor));
 
     float maxCharWidth = 0.f;
     AtomicString family = style()->font().family().family();

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