Diff
Modified: branches/subpixellayout/Source/WebCore/WebCore.exp.in (98875 => 98876)
--- branches/subpixellayout/Source/WebCore/WebCore.exp.in 2011-10-31 20:29:38 UTC (rev 98875)
+++ branches/subpixellayout/Source/WebCore/WebCore.exp.in 2011-10-31 20:31:26 UTC (rev 98876)
@@ -879,6 +879,7 @@
__ZN7WebCore7IntRect5scaleEf
__ZN7WebCore7IntRect5uniteERKS0_
__ZN7WebCore7IntRect9intersectERKS0_
+__ZN7WebCore7IntRectC1ERKNS_9FixedRectE
__ZN7WebCore7IntRectC1ERKNS_9FloatRectE
__ZN7WebCore7IntSizeC1ERK6CGSize
__ZN7WebCore7TextRun19allowsRoundingHacksEv
Modified: branches/subpixellayout/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm (98875 => 98876)
--- branches/subpixellayout/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm 2011-10-31 20:29:38 UTC (rev 98875)
+++ branches/subpixellayout/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm 2011-10-31 20:31:26 UTC (rev 98876)
@@ -851,7 +851,7 @@
- (void)invalidatePluginContentRect:(NSRect)rect
{
if (RenderBoxModelObject *renderer = toRenderBoxModelObject(_element->renderer())) {
- IntRect contentRect(rect);
+ IntRect contentRect(enclosingIntRect(rect));
contentRect.move(renderer->borderLeft() + renderer->paddingLeft(), renderer->borderTop() + renderer->paddingTop());
renderer->repaintRectangle(contentRect);
@@ -936,4 +936,3 @@
} // namespace WebKit
#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
Modified: branches/subpixellayout/Source/WebKit/mac/WebView/WebHTMLView.mm (98875 => 98876)
--- branches/subpixellayout/Source/WebKit/mac/WebView/WebHTMLView.mm 2011-10-31 20:29:38 UTC (rev 98875)
+++ branches/subpixellayout/Source/WebKit/mac/WebView/WebHTMLView.mm 2011-10-31 20:31:26 UTC (rev 98876)
@@ -292,7 +292,7 @@
}
NSRect invalidRectInWebFrameViewCoordinates = [enclosingWebFrameView convertRect:invalidRect fromView:self];
- IntRect invalidRectInFrameViewCoordinates(invalidRectInWebFrameViewCoordinates);
+ IntRect invalidRectInFrameViewCoordinates(enclosingIntRect(invalidRectInWebFrameViewCoordinates));
if (![enclosingWebFrameView isFlipped])
invalidRectInFrameViewCoordinates.setY(frameView->frameRect().size().height() - invalidRectInFrameViewCoordinates.maxY());
Modified: branches/subpixellayout/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm (98875 => 98876)
--- branches/subpixellayout/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm 2011-10-31 20:29:38 UTC (rev 98875)
+++ branches/subpixellayout/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm 2011-10-31 20:31:26 UTC (rev 98876)
@@ -426,7 +426,7 @@
{
ASSERT(isMainThread());
- IntRect rect(nsRect);
+ IntRect rect(enclosingIntRect(nsRect));
rect.scale(1 / _totalScaleFactorForPrinting);
HashMap<WebCore::IntRect, Vector<uint8_t> >::iterator pagePreviewIterator = _pagePreviews.find(rect);
if (pagePreviewIterator == _pagePreviews.end()) {
Modified: branches/subpixellayout/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp (98875 => 98876)
--- branches/subpixellayout/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp 2011-10-31 20:29:38 UTC (rev 98875)
+++ branches/subpixellayout/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp 2011-10-31 20:31:26 UTC (rev 98876)
@@ -223,7 +223,7 @@
CGRect box = CGPDFPageGetBoxRect(pdfPage, kCGPDFCropBox);
if (CGRectIsEmpty(box))
box = CGPDFPageGetBoxRect(pdfPage, kCGPDFMediaBox);
- m_pageBoxes.append(IntRect(box));
+ m_pageBoxes.append(enclosingIntRect(box));
m_pdfDocumentSize.setWidth(max(m_pdfDocumentSize.width(), static_cast<int>(box.size.width)));
m_pdfDocumentSize.expand(0, box.size.height);
}
@@ -655,7 +655,7 @@
AppUnit horizontalScrollbarHeight = (m_horizontalScrollbar && !m_horizontalScrollbar->isOverlayScrollbar()) ? m_horizontalScrollbar->height() : AppUnit();
AppUnit verticalScrollbarWidth = (m_verticalScrollbar && !m_verticalScrollbar->isOverlayScrollbar()) ? m_verticalScrollbar->width() : AppUnit();
- IntPoint maximumOffset((m_pdfDocumentSize.width() - m_pluginSize.width() + verticalScrollbarWidth, m_pdfDocumentSize.height() - m_pluginSize.height() + horizontalScrollbarHeight).ceil());
+ IntPoint maximumOffset((m_pdfDocumentSize.width() - m_pluginSize.width() + verticalScrollbarWidth).ceil(), (m_pdfDocumentSize.height() - m_pluginSize.height() + horizontalScrollbarHeight).ceil());
maximumOffset.clampNegativeToZero();
return maximumOffset;
}
Modified: branches/subpixellayout/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (98875 => 98876)
--- branches/subpixellayout/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2011-10-31 20:29:38 UTC (rev 98875)
+++ branches/subpixellayout/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2011-10-31 20:31:26 UTC (rev 98876)
@@ -724,12 +724,12 @@
}
// FIXME: Just passing a translation matrix isn't good enough.
- IntPoint locationInWindowCoordinates = parent()->contentsToRootView(frameRect().location());
+ IntPoint locationInWindowCoordinates = parent()->contentsToRootView(roundedIntPoint(frameRect().location()));
AffineTransform transform = AffineTransform::translation(locationInWindowCoordinates.x(), locationInWindowCoordinates.y());
// FIXME: The clip rect isn't correct.
- IntRect clipRect = boundsRect();
- m_plugin->geometryDidChange(size(), clipRect, transform);
+ IntRect clipRect = enclosingIntRect(boundsRect());
+ m_plugin->geometryDidChange(expandedIntSize(size()), clipRect, transform);
}
void PluginView::viewVisibilityDidChange()
