Changeset 112758 in webkit

Timestamp:

Mar 30, 2012 5:57:47 PM (12 years ago)

Author:

eae@chromium.org

Message:

Change WebKit/WebKit2 platform code to use pixel snapped values
​https://bugs.webkit.org/show_bug.cgi?id=82549

Source/WebCore:

Reviewed by Eric Seidel.

Change WebKit and WebKit2 platform code to use rounded locations and
pixel snapped rects and sizes. This largely avoids having to expose the
fractional layout types to the platform code.

No new tests. No change in functionality.

• dom/Node.h:

(WebCore::Node::pixelSnappedRenderRect):
Add pixel snapped version of renderRect

• rendering/RenderBox.h:

(WebCore::RenderBox::pixelSnappedFrameRect):
Add pixel snapped version of frameRect

Source/WebKit/chromium:

Reviewed by Eric Seidel.

• src/WebAccessibilityObject.cpp:

(WebKit::WebAccessibilityObject::boundingBoxRect):
Use pixelSnappedBoundingBoxRect instead of boundingBoxRect which returns
a LayoutRect.

• src/WebFrameImpl.cpp:

(WebKit::WebFrameImpl::characterIndexForPoint):
Use roundedPoint instead of point for hit testing as ranges use screen
cordinates which are represented with pixel accuracy.

Source/WebKit/mac:

Change WebKit and WebKit2 platform code to use rounded locations and
pixel snapped rects and sizes. This largely avoids having to expose the
fractional layout types to the platform code.

Reviewed by Eric Seidel.

• DOM/WebDOMOperations.mm:

(-[DOMNode _renderRect:]):

Source/WebKit/qt:

Reviewed by Eric Seidel.

• Api/qwebelement.cpp:

(QWebElement::geometry):
Replace getRect with getPixelSnappedRect to avoid having to expose
subpixel types to the platform layer.

• Api/qwebpage.cpp:

(QWebPagePrivate::TouchAdjuster::findCandidatePointForTouch):
Use pixel snapped element rect when comparing with the touch rect as the
touch rect use screen cordinates which are represented with pixel
accuracy.

• WebCoreSupport/ChromeClientQt.h:

(WebCore::ChromeClientQt::scrollRectIntoView):
Change scrollRectIntoView to take a LayoutRect to match base class
interface.

Source/WebKit2:

Change WebKit and WebKit2 platform code to use rounded locations and
pixel snapped rects and sizes. This largely avoids having to expose the
fractional layout types to the platform code.

Reviewed by Eric Seidel.

• Shared/WebRenderObject.cpp:

(WebKit::WebRenderObject::WebRenderObject):

• UIProcess/win/WebPopupMenuProxyWin.cpp:

(WebKit::WebPopupMenuProxyWin::calculatePositionAndSize):

• WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp:

(WebKit::InjectedBundleNodeHandle::renderRect):

• WebProcess/Plugins/PDF/BuiltInPDFView.cpp:

(WebKit::BuiltInPDFView::invalidateScrollbarRect):

• WebProcess/WebPage/mac/WebPageMac.mm:

(WebKit::WebPage::characterIndexForPoint):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/Node.h (modified) (1 diff)
• WebCore/rendering/RenderBox.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebAccessibilityObject.cpp (modified) (1 diff)
• WebKit/chromium/src/WebFrameImpl.cpp (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/DOM/WebDOMOperations.mm (modified) (1 diff)
• WebKit/qt/Api/qwebelement.cpp (modified) (1 diff)
• WebKit/qt/Api/qwebpage.cpp (modified) (1 diff)
• WebKit/qt/ChangeLog (modified) (1 diff)
• WebKit/qt/WebCoreSupport/ChromeClientQt.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/WebRenderObject.cpp (modified) (1 diff)
• WebKit2/UIProcess/win/WebPopupMenuProxyWin.cpp (modified) (1 diff)
• WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp (modified) (1 diff)
• WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp (modified) (1 diff)
• WebKit2/WebProcess/WebPage/mac/WebPageMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-30  Emil A Eklund  <eae@chromium.org>
+
+        Change WebKit/WebKit2 platform code to use pixel snapped values
+        https://bugs.webkit.org/show_bug.cgi?id=82549
+
+        Reviewed by Eric Seidel.
+
+        Change WebKit and WebKit2 platform code to use rounded locations and
+        pixel snapped rects and sizes. This largely avoids having to expose the
+        fractional layout types to the platform code.
+
+        No new tests. No change in functionality.
+
+        * dom/Node.h:
+        (WebCore::Node::pixelSnappedRenderRect):
+        Add pixel snapped version of renderRect
+        
+        * rendering/RenderBox.h:
+        (WebCore::RenderBox::pixelSnappedFrameRect):
+        Add pixel snapped version of frameRect
+
 2012-03-30  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/dom/Node.h

@@ -380 +380 @@
     IntRect getPixelSnappedRect() const { return pixelSnappedIntRect(getRect()); }
     LayoutRect renderRect(bool* isReplaced);
+    IntRect pixelSnappedRenderRect(bool* isReplaced) { return pixelSnappedIntRect(renderRect(isReplaced)); }
 
     // Returns true if the node has a non-empty bounding box in layout.

trunk/Source/WebCore/rendering/RenderBox.h

@@ -131 +131 @@
 
     LayoutRect frameRect() const { return m_frameRect; }
+    IntRect pixelSnappedFrameRect() const { return pixelSnappedIntRect(m_frameRect); }
     void setFrameRect(const LayoutRect& rect) { m_frameRect = rect; }
 

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-03-30  Emil A Eklund  <eae@chromium.org>
+
+        Change WebKit/WebKit2 platform code to use pixel snapped values
+        https://bugs.webkit.org/show_bug.cgi?id=82549
+
+        Reviewed by Eric Seidel.
+
+        * src/WebAccessibilityObject.cpp:
+        (WebKit::WebAccessibilityObject::boundingBoxRect):
+        Use pixelSnappedBoundingBoxRect instead of boundingBoxRect which returns
+        a LayoutRect.
+        
+        * src/WebFrameImpl.cpp:
+        (WebKit::WebFrameImpl::characterIndexForPoint):
+        Use roundedPoint instead of point for hit testing as ranges use screen
+        cordinates which are represented with pixel accuracy.
+
 2012-03-30  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebKit/chromium/src/WebAccessibilityObject.cpp

@@ -494 +494 @@
 
     m_private->updateBackingStore();
-    return m_private->boundingBoxRect();
+    return m_private->pixelSnappedBoundingBoxRect();
 }
 

trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp

@@ -1191 +1191 @@
     IntPoint point = frame()->view()->windowToContents(webPoint);
     HitTestResult result = frame()->eventHandler()->hitTestResultAtPoint(point, false);
-    RefPtr<Range> range = frame()->rangeForPoint(result.point());
+    RefPtr<Range> range = frame()->rangeForPoint(result.roundedPoint());
     if (!range)
         return notFound;

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2012-03-30  Emil A Eklund  <eae@chromium.org>
+
+        Change WebKit/WebKit2 platform code to use pixel snapped values
+        https://bugs.webkit.org/show_bug.cgi?id=82549
+
+        Change WebKit and WebKit2 platform code to use rounded locations and
+        pixel snapped rects and sizes. This largely avoids having to expose the
+        fractional layout types to the platform code.
+
+        Reviewed by Eric Seidel.
+
+        * DOM/WebDOMOperations.mm:
+        (-[DOMNode _renderRect:]):
+
 2012-03-30  Mark Pilgrim  <pilgrim@chromium.org>
 

trunk/Source/WebKit/mac/DOM/WebDOMOperations.mm

@@ -132 +132 @@
 - (NSRect)_renderRect:(bool *)isReplaced
 {
-    return NSRect(core(self)->renderRect(isReplaced));
+    return NSRect(core(self)->pixelSnappedRenderRect(isReplaced));
 }
 

trunk/Source/WebKit/qt/Api/qwebelement.cpp

@@ -553 +553 @@
     if (!m_element)
         return QRect();
-    return m_element->getRect();
+    return m_element->getPixelSnappedRect();
 }
 

trunk/Source/WebKit/qt/Api/qwebpage.cpp

@@ -1588 +1588 @@
             continue;
 
-        IntRect currentElementBoundingRect = currentElement->getRect();
+        IntRect currentElementBoundingRect = currentElement->getPixelSnappedRect();
         currentElementBoundingRect.intersect(touchRect);
 

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2012-03-30  Emil A Eklund  <eae@chromium.org>
+
+        Change WebKit/WebKit2 platform code to use pixel snapped values
+        https://bugs.webkit.org/show_bug.cgi?id=82549
+
+        Reviewed by Eric Seidel.
+
+        * Api/qwebelement.cpp:
+        (QWebElement::geometry):
+        Replace getRect with getPixelSnappedRect to avoid having to expose
+        subpixel types to the platform layer.
+        
+        * Api/qwebpage.cpp:
+        (QWebPagePrivate::TouchAdjuster::findCandidatePointForTouch):
+        Use pixel snapped element rect when comparing with the touch rect as the
+        touch rect use screen cordinates which are represented with pixel
+        accuracy.
+        
+        * WebCoreSupport/ChromeClientQt.h:
+        (WebCore::ChromeClientQt::scrollRectIntoView):
+        Change scrollRectIntoView to take a LayoutRect to match base class
+        interface.
+
 2012-03-30  Mark Pilgrim  <pilgrim@chromium.org>
 

trunk/Source/WebKit/qt/WebCoreSupport/ChromeClientQt.h

@@ -172 +172 @@
     virtual void setCursorHiddenUntilMouseMoves(bool) { }
 
-    virtual void scrollRectIntoView(const IntRect&) const { }
+    virtual void scrollRectIntoView(const LayoutRect) const { }
 
     virtual bool selectItemWritingDirectionIsNatural();

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-03-30  Emil A Eklund  <eae@chromium.org>
+
+        Change WebKit/WebKit2 platform code to use pixel snapped values
+        https://bugs.webkit.org/show_bug.cgi?id=82549
+
+        Change WebKit and WebKit2 platform code to use rounded locations and
+        pixel snapped rects and sizes. This largely avoids having to expose the
+        fractional layout types to the platform code.
+
+        Reviewed by Eric Seidel.
+
+        * Shared/WebRenderObject.cpp:
+        (WebKit::WebRenderObject::WebRenderObject):
+        * UIProcess/win/WebPopupMenuProxyWin.cpp:
+        (WebKit::WebPopupMenuProxyWin::calculatePositionAndSize):
+        * WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp:
+        (WebKit::InjectedBundleNodeHandle::renderRect):
+        * WebProcess/Plugins/PDF/BuiltInPDFView.cpp:
+        (WebKit::BuiltInPDFView::invalidateScrollbarRect):
+        * WebProcess/WebPage/mac/WebPageMac.mm:
+        (WebKit::WebPage::characterIndexForPoint):
+
 2012-03-30  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebKit2/Shared/WebRenderObject.cpp

@@ -62 +62 @@
 
     if (renderer->isBox())
-        m_frameRect = toRenderBox(renderer)->frameRect();
+        m_frameRect = toRenderBox(renderer)->pixelSnappedFrameRect();
     else if (renderer->isText()) {
         m_frameRect = toRenderText(renderer)->linesBoundingBox();

trunk/Source/WebKit2/UIProcess/win/WebPopupMenuProxyWin.cpp

@@ -402 +402 @@
     monitorInfo.cbSize = sizeof(MONITORINFOEX);
     ::GetMonitorInfo(monitor, &monitorInfo);
-    FloatRect screen = monitorInfo.rcWork;
+    FloatRect screen = static_cast<IntRect>(monitorInfo.rcWork);
 
     // Check that we don't go off the screen vertically

trunk/Source/WebKit2/WebProcess/InjectedBundle/DOM/InjectedBundleNodeHandle.cpp

@@ -115 +115 @@
 IntRect InjectedBundleNodeHandle::renderRect(bool* isReplaced) const
 {
-    return m_node.get()->renderRect(isReplaced);
+    return m_node.get()->pixelSnappedRenderRect(isReplaced);
 }
 

trunk/Source/WebKit2/WebProcess/Plugins/PDF/BuiltInPDFView.cpp

@@ -711 +711 @@
 }
 
-void BuiltInPDFView::invalidateScrollbarRect(Scrollbar* scrollbar, const LayoutRect& rect)
+void BuiltInPDFView::invalidateScrollbarRect(Scrollbar* scrollbar, const IntRect& rect)
 {
     IntRect dirtyRect = rect;

trunk/Source/WebKit2/WebProcess/WebPage/mac/WebPageMac.mm

@@ -359 +359 @@
     frame = result.innerNonSharedNode() ? result.innerNonSharedNode()->document()->frame() : m_page->focusController()->focusedOrMainFrame();
     
-    RefPtr<Range> range = frame->rangeForPoint(result.point());
+    RefPtr<Range> range = frame->rangeForPoint(result.roundedPoint());
     if (!range)
         return;