Diff
Modified: branches/subpixellayout/Source/WebCore/rendering/InlineBox.h (108636 => 108637)
--- branches/subpixellayout/Source/WebCore/rendering/InlineBox.h 2012-02-23 18:01:30 UTC (rev 108636)
+++ branches/subpixellayout/Source/WebCore/rendering/InlineBox.h 2012-02-23 18:10:27 UTC (rev 108637)
@@ -219,10 +219,7 @@
float left() const { return m_topLeft.x(); }
// y() is the top side of the box in the containing block's coordinate system.
- void setY(float y) {
- fprintf(stderr, "setY %0.2f\n", y);
- m_topLeft.setY(y);
- }
+ void setY(float y) { m_topLeft.setY(y); }
float y() const { return m_topLeft.y(); }
float top() const { return m_topLeft.y(); }
Modified: branches/subpixellayout/Source/WebKit/chromium/src/ChromeClientImpl.cpp (108636 => 108637)
--- branches/subpixellayout/Source/WebKit/chromium/src/ChromeClientImpl.cpp 2012-02-23 18:01:30 UTC (rev 108636)
+++ branches/subpixellayout/Source/WebKit/chromium/src/ChromeClientImpl.cpp 2012-02-23 18:10:27 UTC (rev 108637)
@@ -603,7 +603,7 @@
Widget* widget = toRenderWidget(object)->widget();
if (widget && widget->isPluginContainer()) {
WebPluginContainerImpl* plugin = static_cast<WebPluginContainerImpl*>(widget);
- url = ""
+ url = ""
}
}
}
Modified: branches/subpixellayout/Source/WebKit/chromium/src/ContextMenuClientImpl.cpp (108636 => 108637)
--- branches/subpixellayout/Source/WebKit/chromium/src/ContextMenuClientImpl.cpp 2012-02-23 18:01:30 UTC (rev 108636)
+++ branches/subpixellayout/Source/WebKit/chromium/src/ContextMenuClientImpl.cpp 2012-02-23 18:10:27 UTC (rev 108637)
@@ -158,7 +158,7 @@
Frame* selectedFrame = r.innerNonSharedNode()->document()->frame();
WebContextMenuData data;
- data.mousePosition = selectedFrame->view()->contentsToWindow(roundedIntPoint(r.point()));
+ data.mousePosition = selectedFrame->view()->contentsToWindow(r.roundedPoint());
// Compute edit flags.
data.editFlags = WebContextMenuData::CanDoNone;
Modified: branches/subpixellayout/Source/WebKit/chromium/src/WebAccessibilityObject.cpp (108636 => 108637)
--- branches/subpixellayout/Source/WebKit/chromium/src/WebAccessibilityObject.cpp 2012-02-23 18:01:30 UTC (rev 108636)
+++ branches/subpixellayout/Source/WebKit/chromium/src/WebAccessibilityObject.cpp 2012-02-23 18:10:27 UTC (rev 108637)
@@ -493,7 +493,7 @@
return WebRect();
m_private->updateBackingStore();
- return enclosingIntRect(m_private->boundingBoxRect());
+ return m_private->pixelSnappedBoundingBoxRect();
}
double WebAccessibilityObject::estimatedLoadingProgress() const
Modified: branches/subpixellayout/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp (108636 => 108637)
--- branches/subpixellayout/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2012-02-23 18:01:30 UTC (rev 108636)
+++ branches/subpixellayout/Source/WebKit/chromium/src/WebPluginContainerImpl.cpp 2012-02-23 18:10:27 UTC (rev 108637)
@@ -68,7 +68,6 @@
#include "IFrameShimSupport.h"
#include "KeyboardCodes.h"
#include "KeyboardEvent.h"
-#include "LayoutTypes.h"
#include "MouseEvent.h"
#include "Page.h"
#include "RenderBox.h"
@@ -531,7 +530,7 @@
m_scrollbarGroup->willEndLiveResize();
}
-bool WebPluginContainerImpl::paintCustomOverhangArea(GraphicsContext* context, const WebCore::FixedRect& horizontalOverhangArea, const WebCore::FixedRect& verticalOverhangArea, const WebCore::FixedRect& dirtyRect)
+bool WebPluginContainerImpl::paintCustomOverhangArea(GraphicsContext* context, const IntRect& horizontalOverhangArea, const IntRect& verticalOverhangArea, const IntRect& dirtyRect)
{
context->save();
context->setFillColor(Color(0xCC, 0xCC, 0xCC), ColorSpaceDeviceRGB);
Modified: branches/subpixellayout/Source/WebKit/chromium/src/WebViewImpl.cpp (108636 => 108637)
--- branches/subpixellayout/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-02-23 18:01:30 UTC (rev 108636)
+++ branches/subpixellayout/Source/WebKit/chromium/src/WebViewImpl.cpp 2012-02-23 18:10:27 UTC (rev 108637)
@@ -1819,7 +1819,7 @@
return false;
if (selection->isCaret()) {
- start = end = frame->view()->contentsToWindow(enclosingIntRect(selection->absoluteCaretBounds()));
+ start = end = frame->view()->contentsToWindow(selection->pixelSnappedAbsoluteCaretBounds());
return true;
}
@@ -2696,7 +2696,7 @@
if (m_autofillPopupShowing) {
refreshAutofillPopup();
} else {
- m_autofillPopup->showInRect(enclosingIntRect(focusedNode->getRect()), focusedNode->ownerDocument()->view(), 0);
+ m_autofillPopup->showInRect(focusedNode->getPixelSnappedRect(), focusedNode->ownerDocument()->view(), 0);
m_autofillPopupShowing = true;
}
}
@@ -2974,7 +2974,7 @@
}
IntRect oldBounds = m_autofillPopup->frameRect();
- m_autofillPopup->refresh(enclosingIntRect(focusedWebCoreNode()->getRect()));
+ m_autofillPopup->refresh(focusedWebCoreNode()->getPixelSnappedRect());
IntRect newBounds = m_autofillPopup->frameRect();
// Let's resize the backing window if necessary.
if (oldBounds != newBounds) {
Modified: branches/subpixellayout/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm (108636 => 108637)
--- branches/subpixellayout/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2012-02-23 18:01:30 UTC (rev 108636)
+++ branches/subpixellayout/Source/WebKit/mac/WebCoreSupport/WebChromeClient.mm 2012-02-23 18:10:27 UTC (rev 108637)
@@ -876,7 +876,7 @@
return;
NSView* view = frameView->documentView();
- IntPoint point = frameView->contentsToWindow(roundedIntPoint(controller->hitTestResult().point()));
+ IntPoint point = frameView->contentsToWindow(controller->hitTestResult().roundedPoint());
NSPoint nsScreenPoint = [view convertPoint:point toView:nil];
// Show the contextual menu for this event.
NSEvent* event = [NSEvent mouseEventWithType:NSRightMouseDown location:nsScreenPoint modifierFlags:0 timestamp:0 windowNumber:[[view window] windowNumber] context:0 eventNumber:0 clickCount:1 pressure:1];
Modified: branches/subpixellayout/Source/WebKit/qt/Api/qwebelement.cpp (108636 => 108637)
--- branches/subpixellayout/Source/WebKit/qt/Api/qwebelement.cpp 2012-02-23 18:01:30 UTC (rev 108636)
+++ branches/subpixellayout/Source/WebKit/qt/Api/qwebelement.cpp 2012-02-23 18:10:27 UTC (rev 108637)
@@ -551,7 +551,7 @@
{
if (!m_element)
return QRect();
- return pixelSnappedIntRect(m_element->getRect());
+ return m_element->getPixelSnappedRect();
}
/*!
@@ -1498,7 +1498,7 @@
view->updateLayoutAndStyleIfNeededRecursive();
- IntRect rect = pixelSnappedIntRect(e->getRect());
+ IntRect rect = e->getPixelSnappedRect();
if (rect.size().isEmpty())
return;
Modified: branches/subpixellayout/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp (108636 => 108637)
--- branches/subpixellayout/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp 2012-02-23 18:01:30 UTC (rev 108636)
+++ branches/subpixellayout/Source/WebKit2/WebProcess/WebPage/WebContextMenu.cpp 2012-02-23 18:10:27 UTC (rev 108637)
@@ -85,7 +85,7 @@
// Mark the WebPage has having a shown context menu then notify the UIProcess.
m_page->contextMenuShowing();
- m_page->send(Messages::WebPageProxy::ShowContextMenu(view->contentsToWindow(roundedIntPoint(controller->hitTestResult().point())), contextMenuState, proposedMenu, InjectedBundleUserMessageEncoder(userData.get())));
+ m_page->send(Messages::WebPageProxy::ShowContextMenu(view->contentsToWindow(controller->hitTestResult().roundedPoint()), contextMenuState, proposedMenu, InjectedBundleUserMessageEncoder(userData.get())));
}
void WebContextMenu::itemSelected(const WebContextMenuItemData& item)
