Diff
Modified: branches/subpixellayout/Source/WebCore/platform/chromium/ScrollbarThemeChromium.cpp (98648 => 98649)
--- branches/subpixellayout/Source/WebCore/platform/chromium/ScrollbarThemeChromium.cpp 2011-10-27 22:25:24 UTC (rev 98648)
+++ branches/subpixellayout/Source/WebCore/platform/chromium/ScrollbarThemeChromium.cpp 2011-10-27 22:28:16 UTC (rev 98649)
@@ -108,7 +108,7 @@
return; // nothing to draw on.
// Get the tickmarks for the frameview.
- Vector<IntRect> tickmarks;
+ Vector<FixedRect> tickmarks;
scrollbar->scrollableArea()->getTickmarks(tickmarks);
if (!tickmarks.size())
return;
@@ -122,7 +122,7 @@
context->save();
- for (Vector<IntRect>::const_iterator i = tickmarks.begin(); i != tickmarks.end(); ++i) {
+ for (Vector<FixedRect>::const_iterator i = tickmarks.begin(); i != tickmarks.end(); ++i) {
// Calculate how far down (in %) the tick-mark should appear.
const float percent = static_cast<float>(i->y()) / scrollbar->totalSize();
Modified: branches/subpixellayout/Source/WebCore/plugins/PluginView.h (98648 => 98649)
--- branches/subpixellayout/Source/WebCore/plugins/PluginView.h 2011-10-27 22:25:24 UTC (rev 98648)
+++ branches/subpixellayout/Source/WebCore/plugins/PluginView.h 2011-10-27 22:28:16 UTC (rev 98649)
@@ -321,7 +321,7 @@
#endif // ENABLE(NETSCAPE_PLUGIN_API)
#endif
void updatePluginWidget();
- void paintMissingPluginIcon(GraphicsContext*, const IntRect&);
+ void paintMissingPluginIcon(GraphicsContext*, const LayoutRect&);
void handleKeyboardEvent(KeyboardEvent*);
void handleMouseEvent(MouseEvent*);
Modified: branches/subpixellayout/Source/WebCore/plugins/qt/PluginViewQt.cpp (98648 => 98649)
--- branches/subpixellayout/Source/WebCore/plugins/qt/PluginViewQt.cpp 2011-10-27 22:25:24 UTC (rev 98648)
+++ branches/subpixellayout/Source/WebCore/plugins/qt/PluginViewQt.cpp 2011-10-27 22:28:16 UTC (rev 98649)
@@ -341,7 +341,7 @@
painter->drawPixmap(QPoint(exposedRect.x(), exposedRect.y()), qtDrawable, exposedRect);
}
-void PluginView::paint(GraphicsContext* context, const IntRect& rect)
+void PluginView::paint(GraphicsContext* context, const LayoutRect& rect)
{
if (!m_isStarted) {
paintMissingPluginIcon(context, rect);
Modified: branches/subpixellayout/Source/WebKit/chromium/src/ChromeClientImpl.h (98648 => 98649)
--- branches/subpixellayout/Source/WebKit/chromium/src/ChromeClientImpl.h 2011-10-27 22:25:24 UTC (rev 98648)
+++ branches/subpixellayout/Source/WebKit/chromium/src/ChromeClientImpl.h 2011-10-27 22:28:16 UTC (rev 98649)
@@ -120,7 +120,7 @@
virtual void contentsSizeChanged(WebCore::Frame*, const WebCore::LayoutSize&) const;
virtual void layoutUpdated(WebCore::Frame*) const;
virtual void scrollRectIntoView(
- const WebCore::FixedRect&) const { }
+ const WebCore::LayoutRect&) const { }
virtual void scrollbarsModeDidChange() const;
virtual void mouseDidMoveOverElement(
const WebCore::HitTestResult& result, unsigned modifierFlags);
Modified: branches/subpixellayout/Source/WebKit/chromium/src/WebScrollbarImpl.cpp (98648 => 98649)
--- branches/subpixellayout/Source/WebKit/chromium/src/WebScrollbarImpl.cpp 2011-10-27 22:25:24 UTC (rev 98648)
+++ branches/subpixellayout/Source/WebKit/chromium/src/WebScrollbarImpl.cpp 2011-10-27 22:28:16 UTC (rev 98649)
@@ -99,7 +99,7 @@
m_client->invalidateScrollbarRect(this, webrect);
}
-void WebScrollbarImpl::getTickmarks(Vector<WebCore::FixedRect>& tickmarks) const
+void WebScrollbarImpl::getTickmarks(Vector<LayoutRect>& tickmarks) const
{
WebVector<WebRect> ticks;
m_client->getTickmarks(const_cast<WebScrollbarImpl*>(this), &ticks);
@@ -108,9 +108,9 @@
tickmarks[i] = LayoutRect(ticks[i]);
}
-WebCore::FixedPoint WebScrollbarImpl::convertFromContainingViewToScrollbar(const WebCore::FixedPoint& parentPoint) const
+LayoutPoint WebScrollbarImpl::convertFromContainingViewToScrollbar(const LayoutPoint& parentPoint) const
{
- WebCore::FixedPoint offset(parentPoint.x() - m_scrollbar->x(), parentPoint.y() - m_scrollbar->y());
+ LayoutPoint offset(parentPoint.x() - m_scrollbar->x(), parentPoint.y() - m_scrollbar->y());
return m_scrollbar->Widget::convertFromContainingView(offset);
}
Modified: branches/subpixellayout/Source/WebKit/chromium/src/WebScrollbarImpl.h (98648 => 98649)
--- branches/subpixellayout/Source/WebKit/chromium/src/WebScrollbarImpl.h 2011-10-27 22:25:24 UTC (rev 98648)
+++ branches/subpixellayout/Source/WebKit/chromium/src/WebScrollbarImpl.h 2011-10-27 22:28:16 UTC (rev 98649)
@@ -31,14 +31,13 @@
#ifndef WebScrollbarImpl_h
#define WebScrollbarImpl_h
+#include "LayoutTypes.h"
#include "WebScrollbar.h"
#include <wtf/RefPtr.h>
#include <wtf/Vector.h>
namespace WebCore {
-class FixedPoint;
-class FixedRect;
class IntPoint;
class IntRect;
class Scrollbar;
@@ -57,8 +56,8 @@
void setScrollOffset(int);
void invalidateScrollbarRect(const WebCore::IntRect&);
- void getTickmarks(Vector<WebCore::FixedRect>&) const;
- WebCore::FixedPoint convertFromContainingViewToScrollbar(const WebCore::FixedPoint& parentPoint) const;
+ void getTickmarks(Vector<WebCore::LayoutRect>&) const;
+ WebCore::LayoutPoint convertFromContainingViewToScrollbar(const WebCore::LayoutPoint& parentPoint) const;
void scrollbarStyleChanged();
int scrollOffset() { return m_scrollOffset; }
