Changeset 98876 in webkit

Timestamp:

Oct 31, 2011, 1:31:26 PM (15 years ago)

Author:

eae@chromium.org

Message:

Change WebKit/WebKit2 to use explicit conversion between FixedRect/Point/Size and the int equivalents. Follow up to change 98869.

Location:

branches/subpixellayout/Source

Files:

• WebCore/WebCore.exp.in (modified) (1 diff)
• WebKit/mac/Plugins/WebBaseNetscapePluginView.mm (modified) (2 diffs)
• WebKit/mac/WebView/WebHTMLView.mm (modified) (1 diff)
• WebKit2/UIProcess/API/mac/WKPrintingView.mm (modified) (1 diff)
• WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp (modified) (2 diffs)
• WebKit2/WebProcess/Plugins/PluginView.cpp (modified) (1 diff)

branches/subpixellayout/Source/WebCore/WebCore.exp.in

@@ -880 +880 @@
 __ZN7WebCore7IntRect5uniteERKS0_
 __ZN7WebCore7IntRect9intersectERKS0_
+__ZN7WebCore7IntRectC1ERKNS_9FixedRectE
 __ZN7WebCore7IntRectC1ERKNS_9FloatRectE
 __ZN7WebCore7IntSizeC1ERK6CGSize

branches/subpixellayout/Source/WebKit/mac/Plugins/WebBaseNetscapePluginView.mm

@@ -852 +852 @@
 {
     if (RenderBoxModelObject *renderer = toRenderBoxModelObject(_element->renderer())) {
-        IntRect contentRect(rect);
+        IntRect contentRect(enclosingIntRect(rect));
         contentRect.move(renderer->borderLeft() + renderer->paddingLeft(), renderer->borderTop() + renderer->paddingTop());
         
@@ -937 +937 @@
 
 #endif //  ENABLE(NETSCAPE_PLUGIN_API)
-

branches/subpixellayout/Source/WebKit/mac/WebView/WebHTMLView.mm

@@ -293 +293 @@
 
     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());

branches/subpixellayout/Source/WebKit2/UIProcess/API/mac/WKPrintingView.mm

@@ -427 +427 @@
     ASSERT(isMainThread());
 
-    IntRect rect(nsRect);
+    IntRect rect(enclosingIntRect(nsRect));
     rect.scale(1 / _totalScaleFactorForPrinting);
     HashMap<WebCore::IntRect, Vector<uint8_t> >::iterator pagePreviewIterator = _pagePreviews.find(rect);

branches/subpixellayout/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp

@@ -224 +224 @@
         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);
@@ -656 +656 @@
     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;

branches/subpixellayout/Source/WebKit2/WebProcess/Plugins/PluginView.cpp

@@ -725 +725 @@
 
     // 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);
 }