Diff
Modified: branches/subpixellayout/Source/WebCore/Target.pri (108551 => 108552)
--- branches/subpixellayout/Source/WebCore/Target.pri 2012-02-22 22:21:14 UTC (rev 108551)
+++ branches/subpixellayout/Source/WebCore/Target.pri 2012-02-22 22:25:18 UTC (rev 108552)
@@ -1055,8 +1055,8 @@
platform/graphics/BitmapImage.cpp \
platform/graphics/Color.cpp \
platform/graphics/CrossfadeGeneratedImage.cpp \
- platform/graphics/FixedRect.cpp \
- platform/graphics/FixedSize.cpp \
+ platform/graphics/FractionalLayoutRect.cpp \
+ platform/graphics/FractionalLayoutSize.cpp \
platform/graphics/FloatPoint3D.cpp \
platform/graphics/FloatPoint.cpp \
platform/graphics/FloatQuad.cpp \
Modified: branches/subpixellayout/Source/WebCore/platform/chromium/ThemeChromiumMac.h (108551 => 108552)
--- branches/subpixellayout/Source/WebCore/platform/chromium/ThemeChromiumMac.h 2012-02-22 22:21:14 UTC (rev 108551)
+++ branches/subpixellayout/Source/WebCore/platform/chromium/ThemeChromiumMac.h 2012-02-22 22:25:18 UTC (rev 108552)
@@ -52,7 +52,7 @@
virtual bool controlRequiresPreWhiteSpace(ControlPart part) const { return part == PushButtonPart; }
virtual void paint(ControlPart, ControlStates, GraphicsContext*, const IntRect&, float zoomFactor, ScrollView*) const;
- virtual void inflateControlPaintRect(ControlPart, ControlStates, FixedRect&, float zoomFactor) const;
+ virtual void inflateControlPaintRect(ControlPart, ControlStates, FractionalLayoutRect&, float zoomFactor) const;
};
} // namespace WebCore
Modified: branches/subpixellayout/Source/WebCore/platform/chromium/ThemeChromiumMac.mm (108551 => 108552)
--- branches/subpixellayout/Source/WebCore/platform/chromium/ThemeChromiumMac.mm 2012-02-22 22:21:14 UTC (rev 108551)
+++ branches/subpixellayout/Source/WebCore/platform/chromium/ThemeChromiumMac.mm 2012-02-22 22:25:18 UTC (rev 108552)
@@ -307,7 +307,7 @@
return kThemeStateActive;
}
-static IntRect inflateRect(const FixedRect& zoomedRect, const IntSize& zoomedSize, const int* margins, float zoomFactor)
+static IntRect inflateRect(const FractionalLayoutRect& zoomedRect, const IntSize& zoomedSize, const int* margins, float zoomFactor)
{
// Only do the inflation if the available width/height are too small. Otherwise try to
// fit the glow/check space into the available box's width/height.
@@ -354,7 +354,7 @@
return sizeFromFont(font, zoomedSize, zoomFactor, checkboxSizes());
}
-static NSButtonCell *checkbox(ControlStates states, const FixedRect& zoomedRect, float zoomFactor)
+static NSButtonCell *checkbox(ControlStates states, const FractionalLayoutRect& zoomedRect, float zoomFactor)
{
static NSButtonCell *checkboxCell;
if (!checkboxCell) {
@@ -439,7 +439,7 @@
return sizeFromFont(font, zoomedSize, zoomFactor, radioSizes());
}
-static NSButtonCell *radio(ControlStates states, const FixedRect& zoomedRect, float zoomFactor)
+static NSButtonCell *radio(ControlStates states, const FractionalLayoutRect& zoomedRect, float zoomFactor)
{
static NSButtonCell *radioCell;
if (!radioCell) {
@@ -550,7 +550,7 @@
updateStates(buttonCell, states);
}
-static NSButtonCell *button(ControlPart part, ControlStates states, const FixedRect& zoomedRect, float zoomFactor)
+static NSButtonCell *button(ControlPart part, ControlStates states, const FractionalLayoutRect& zoomedRect, float zoomFactor)
{
bool isDefault = states & DefaultState;
static NSButtonCell *cells[2];
@@ -768,7 +768,7 @@
}
}
-void ThemeChromiumMac::inflateControlPaintRect(ControlPart part, ControlStates states, FixedRect& zoomedRect, float zoomFactor) const
+void ThemeChromiumMac::inflateControlPaintRect(ControlPart part, ControlStates states, FractionalLayoutRect& zoomedRect, float zoomFactor) const
{
BEGIN_BLOCK_OBJC_EXCEPTIONS
switch (part) {
Modified: branches/subpixellayout/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp (108551 => 108552)
--- branches/subpixellayout/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp 2012-02-22 22:21:14 UTC (rev 108551)
+++ branches/subpixellayout/Source/WebCore/platform/graphics/qt/GraphicsContextQt.cpp 2012-02-22 22:25:18 UTC (rev 108552)
@@ -45,7 +45,7 @@
#include "AffineTransform.h"
#include "Color.h"
#include "FloatConversion.h"
-#include "FixedRect.h"
+#include "FractionalLayoutRect.h"
#include "Font.h"
#include "ImageBuffer.h"
#include "NotImplemented.h"
@@ -795,7 +795,7 @@
else
clipRect = p->transform().inverted().mapRect(p->window());
- return enclosingIntRect(FixedRect(clipRect));
+ return enclosingIntRect(FractionalLayoutRect(clipRect));
}
void GraphicsContext::clipPath(const Path& path, WindRule clipRule)
@@ -844,7 +844,7 @@
* RenderTheme handles drawing focus on widgets which
* need it. It is still handled here for links.
*/
-void GraphicsContext::drawFocusRing(const Vector<FixedRect>& rects, int width, int offset, const Color& color)
+void GraphicsContext::drawFocusRing(const Vector<FractionalLayoutRect>& rects, int width, int offset, const Color& color)
{
if (paintingDisabled() || !color.isValid())
return;
Modified: branches/subpixellayout/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp (108551 => 108552)
--- branches/subpixellayout/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp 2012-02-22 22:21:14 UTC (rev 108551)
+++ branches/subpixellayout/Source/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp 2012-02-22 22:25:18 UTC (rev 108552)
@@ -33,7 +33,7 @@
#include "AffineTransform.h"
#include "Color.h"
-#include "FixedRect.h"
+#include "FractionalLayoutRect.h"
#include "FloatRect.h"
#include "Gradient.h"
#include "ImageBuffer.h"
@@ -565,7 +565,7 @@
#endif
}
-void GraphicsContext::drawFocusRing(const Vector<FixedRect>& rects, int width, int offset, const Color& color)
+void GraphicsContext::drawFocusRing(const Vector<FractionalLayoutRect>& rects, int width, int offset, const Color& color)
{
if (paintingDisabled())
return;
Modified: branches/subpixellayout/Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp (108551 => 108552)
--- branches/subpixellayout/Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp 2012-02-22 22:21:14 UTC (rev 108551)
+++ branches/subpixellayout/Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp 2012-02-22 22:25:18 UTC (rev 108552)
@@ -136,7 +136,7 @@
// FIXME: This is nearly identical to the GraphicsContext::drawFocusRing function in GraphicsContextMac.mm.
// The code could move to GraphicsContextCG.cpp and be shared.
-void GraphicsContext::drawFocusRing(const Vector<FixedRect>& rects, int width, int offset, const Color& color)
+void GraphicsContext::drawFocusRing(const Vector<FractionalLayoutRect>& rects, int width, int offset, const Color& color)
{
if (paintingDisabled())
return;
Modified: branches/subpixellayout/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp (108551 => 108552)
--- branches/subpixellayout/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp 2012-02-22 22:21:14 UTC (rev 108551)
+++ branches/subpixellayout/Source/WebCore/platform/gtk/ScrollbarThemeGtk.cpp 2012-02-22 22:25:18 UTC (rev 108552)
@@ -191,7 +191,7 @@
return IntRect(trackRect.x() + (trackRect.width() - m_thumbFatness) / 2, trackRect.y() + thumbPos, m_thumbFatness, thumbLength(scrollbar));
}
-bool ScrollbarThemeGtk::paint(Scrollbar* scrollbar, GraphicsContext* graphicsContext, const FixedRect& damageRect)
+bool ScrollbarThemeGtk::paint(Scrollbar* scrollbar, GraphicsContext* graphicsContext, const FractionalLayoutRect& damageRect)
{
if (graphicsContext->paintingDisabled())
return false;
Modified: branches/subpixellayout/Source/WebCore/platform/gtk/ScrollbarThemeGtk.h (108551 => 108552)
--- branches/subpixellayout/Source/WebCore/platform/gtk/ScrollbarThemeGtk.h 2012-02-22 22:21:14 UTC (rev 108551)
+++ branches/subpixellayout/Source/WebCore/platform/gtk/ScrollbarThemeGtk.h 2012-02-22 22:25:18 UTC (rev 108552)
@@ -43,7 +43,7 @@
virtual IntRect forwardButtonRect(Scrollbar*, ScrollbarPart, bool);
virtual IntRect trackRect(Scrollbar*, bool);
IntRect thumbRect(Scrollbar*, const IntRect& unconstrainedTrackRect);
- bool paint(Scrollbar*, GraphicsContext*, const FixedRect& damageRect);
+ bool paint(Scrollbar*, GraphicsContext*, const FractionalLayoutRect& damageRect);
void paintScrollbarBackground(GraphicsContext*, Scrollbar*);
void paintTrackBackground(GraphicsContext*, Scrollbar*, const IntRect&);
void paintThumb(GraphicsContext*, Scrollbar*, const IntRect&);
Modified: branches/subpixellayout/Source/WebCore/platform/win/PopupMenuWin.cpp (108551 => 108552)
--- branches/subpixellayout/Source/WebCore/platform/win/PopupMenuWin.cpp 2012-02-22 22:21:14 UTC (rev 108551)
+++ branches/subpixellayout/Source/WebCore/platform/win/PopupMenuWin.cpp 2012-02-22 22:25:18 UTC (rev 108552)
@@ -563,7 +563,7 @@
const int separatorPadding = 4;
const int separatorHeight = 1;
-void PopupMenuWin::paint(const FixedRect& damageRect, HDC hdc)
+void PopupMenuWin::paint(const FractionalLayoutRect& damageRect, HDC hdc)
{
if (!m_popup)
return;
Modified: branches/subpixellayout/Source/WebCore/platform/win/PopupMenuWin.h (108551 => 108552)
--- branches/subpixellayout/Source/WebCore/platform/win/PopupMenuWin.h 2012-02-22 22:21:14 UTC (rev 108551)
+++ branches/subpixellayout/Source/WebCore/platform/win/PopupMenuWin.h 2012-02-22 22:25:18 UTC (rev 108552)
@@ -72,7 +72,7 @@
void focusFirst();
void focusLast();
- void paint(const FixedRect& damageRect, HDC = 0);
+ void paint(const FractionalLayoutRect& damageRect, HDC = 0);
HWND popupHandle() const { return m_popup; }
