Changeset 93269 in webkit

Timestamp:

Aug 17, 2011 5:36:48 PM (13 years ago)

Author:

leviw@chromium.org

Message:

Switch Document, DocumentMarker, Clipboard, and Range to new layout types
​https://bugs.webkit.org/show_bug.cgi?id=66330

Reviewed by Eric Seidel.

Converting the remaining DOM classes to use the LayoutUnit abstraction.

No new tests, no new behavior.

• dom/Clipboard.h:

(WebCore::Clipboard::dragLocation):

• dom/Document.cpp:

(WebCore::Document::nodesFromRect):
(WebCore::nodeFromPoint):
(WebCore::Document::caretRangeFromPoint):
(WebCore::Document::prepareMouseEvent):

• dom/Document.h:
• dom/DocumentMarkerController.cpp:

(WebCore::DocumentMarkerController::markerContainingPoint):
(WebCore::DocumentMarkerController::renderedRectsForMarkers):
(WebCore::DocumentMarkerController::invalidateRenderedRectsForMarkersInRect):

• dom/DocumentMarkerController.h:
• dom/Range.cpp:

(WebCore::adjustFloatQuadsForScrollAndAbsoluteZoomAndPageScale):

• dom/RenderedDocumentMarker.h:

(WebCore::RenderedDocumentMarker::contains):
(WebCore::RenderedDocumentMarker::setRenderedRect):
(WebCore::RenderedDocumentMarker::renderedRect):
(WebCore::RenderedDocumentMarker::invalidMarkerRect):
(WebCore::RenderedDocumentMarker::invalidate):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Clipboard.h (modified) (2 diffs)
• dom/Document.cpp (modified) (4 diffs)
• dom/Document.h (modified) (1 diff)
• dom/DocumentMarkerController.cpp (modified) (3 diffs)
• dom/DocumentMarkerController.h (modified) (3 diffs)
• dom/Range.cpp (modified) (1 diff)
• dom/RenderedDocumentMarker.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-17  Levi Weintraub  <leviw@chromium.org>
+
+        Switch Document, DocumentMarker, Clipboard, and Range to new layout types
+        https://bugs.webkit.org/show_bug.cgi?id=66330
+
+        Reviewed by Eric Seidel.
+
+        Converting the remaining DOM classes to use the LayoutUnit abstraction.
+
+        No new tests, no new behavior.
+
+        * dom/Clipboard.h:
+        (WebCore::Clipboard::dragLocation):
+        * dom/Document.cpp:
+        (WebCore::Document::nodesFromRect):
+        (WebCore::nodeFromPoint):
+        (WebCore::Document::caretRangeFromPoint):
+        (WebCore::Document::prepareMouseEvent):
+        * dom/Document.h:
+        * dom/DocumentMarkerController.cpp:
+        (WebCore::DocumentMarkerController::markerContainingPoint):
+        (WebCore::DocumentMarkerController::renderedRectsForMarkers):
+        (WebCore::DocumentMarkerController::invalidateRenderedRectsForMarkersInRect):
+        * dom/DocumentMarkerController.h:
+        * dom/Range.cpp:
+        (WebCore::adjustFloatQuadsForScrollAndAbsoluteZoomAndPageScale):
+        * dom/RenderedDocumentMarker.h:
+        (WebCore::RenderedDocumentMarker::contains):
+        (WebCore::RenderedDocumentMarker::setRenderedRect):
+        (WebCore::RenderedDocumentMarker::renderedRect):
+        (WebCore::RenderedDocumentMarker::invalidMarkerRect):
+        (WebCore::RenderedDocumentMarker::invalidate):
+
 2011-08-17  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebCore/dom/Clipboard.h

@@ -70 +70 @@
         virtual PassRefPtr<FileList> files() const = 0;
 
-        IntPoint dragLocation() const { return m_dragLoc; }
+        LayoutPoint dragLocation() const { return m_dragLoc; }
         CachedImage* dragImage() const { return m_dragImage.get(); }
-        virtual void setDragImage(CachedImage*, const IntPoint&) = 0;
+        virtual void setDragImage(CachedImage*, const LayoutPoint&) = 0;
         Node* dragImageElement() const { return m_dragImageElement.get(); }
-        virtual void setDragImageElement(Node*, const IntPoint&) = 0;
+        virtual void setDragImageElement(Node*, const LayoutPoint&) = 0;
         
-        virtual DragImageRef createDragImage(IntPoint& dragLocation) const = 0;
+        virtual DragImageRef createDragImage(LayoutPoint& dragLocation) const = 0;
 #if ENABLE(DRAG_SUPPORT)
         virtual void declareAndWriteDragImage(Element*, const KURL&, const String& title, Frame*) = 0;
@@ -118 +118 @@
         
     protected:
-        IntPoint m_dragLoc;
+        LayoutPoint m_dragLoc;
         CachedResourceHandle<CachedImage> m_dragImage;
         RefPtr<Node> m_dragImageElement;

trunk/Source/WebCore/dom/Document.cpp

@@ -1128 +1128 @@
 
     float zoomFactor = frame->pageZoomFactor();
-    IntPoint point = roundedIntPoint(FloatPoint(centerX * zoomFactor + view()->scrollX(), centerY * zoomFactor + view()->scrollY()));
+    LayoutPoint point = roundedLayoutPoint(FloatPoint(centerX * zoomFactor + view()->scrollX(), centerY * zoomFactor + view()->scrollY()));
 
     int type = HitTestRequest::ReadOnly | HitTestRequest::Active;
@@ -1167 +1167 @@
 }
 
-static Node* nodeFromPoint(Frame* frame, RenderView* renderView, int x, int y, IntPoint* localPoint = 0)
+static Node* nodeFromPoint(Frame* frame, RenderView* renderView, int x, int y, LayoutPoint* localPoint = 0)
 {
     if (!frame)
@@ -1207 +1207 @@
     if (!renderer())
         return 0;
-    IntPoint localPoint;
+    LayoutPoint localPoint;
     Node* node = nodeFromPoint(frame(), renderView(), x, y, &localPoint);
     if (!node)
@@ -2637 +2637 @@
 }
 
-MouseEventWithHitTestResults Document::prepareMouseEvent(const HitTestRequest& request, const IntPoint& documentPoint, const PlatformMouseEvent& event)
+MouseEventWithHitTestResults Document::prepareMouseEvent(const HitTestRequest& request, const LayoutPoint& documentPoint, const PlatformMouseEvent& event)
 {
     ASSERT(!renderer() || renderer()->isRenderView());
 
     if (!renderer())
-        return MouseEventWithHitTestResults(event, HitTestResult(IntPoint()));
+        return MouseEventWithHitTestResults(event, HitTestResult(LayoutPoint()));
 
     HitTestResult result(documentPoint);

trunk/Source/WebCore/dom/Document.h

@@ -676 +676 @@
     void resetActiveLinkColor();
     
-    MouseEventWithHitTestResults prepareMouseEvent(const HitTestRequest&, const IntPoint&, const PlatformMouseEvent&);
+    MouseEventWithHitTestResults prepareMouseEvent(const HitTestRequest&, const LayoutPoint&, const PlatformMouseEvent&);
 
     StyleSheetList* styleSheets();

trunk/Source/WebCore/dom/DocumentMarkerController.cpp

@@ -292 +292 @@
 }
 
-DocumentMarker* DocumentMarkerController::markerContainingPoint(const IntPoint& point, DocumentMarker::MarkerType markerType)
+DocumentMarker* DocumentMarkerController::markerContainingPoint(const LayoutPoint& point, DocumentMarker::MarkerType markerType)
 {
     if (!possiblyHasMarkers(markerType))
@@ -376 +376 @@
 }
 
-Vector<IntRect> DocumentMarkerController::renderedRectsForMarkers(DocumentMarker::MarkerType markerType)
-{
-    Vector<IntRect> result;
+Vector<LayoutRect> DocumentMarkerController::renderedRectsForMarkers(DocumentMarker::MarkerType markerType)
+{
+    Vector<LayoutRect> result;
 
     if (!possiblyHasMarkers(markerType))
@@ -508 +508 @@
 }
 
-void DocumentMarkerController::invalidateRenderedRectsForMarkersInRect(const IntRect& r)
+void DocumentMarkerController::invalidateRenderedRectsForMarkersInRect(const LayoutRect& r)
 {
     // outer loop: process each markered node in the document

trunk/Source/WebCore/dom/DocumentMarkerController.h

@@ -29 +29 @@
 
 #include "DocumentMarker.h"
+#include "LayoutTypes.h"
 #include <wtf/HashMap.h>
 #include <wtf/Vector.h>
@@ -34 +35 @@
 namespace WebCore {
 
-class IntPoint;
-class IntRect;
 class Node;
 class Range;
@@ -65 +64 @@
     void removeMarkers(Node*, DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers());
     void repaintMarkers(DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers());
-    void invalidateRenderedRectsForMarkersInRect(const IntRect&);
+    void invalidateRenderedRectsForMarkersInRect(const LayoutRect&);
     void shiftMarkers(Node*, unsigned startOffset, int delta);
     void setMarkersActive(Range*, bool);
     void setMarkersActive(Node*, unsigned startOffset, unsigned endOffset, bool);
 
-    DocumentMarker* markerContainingPoint(const IntPoint&, DocumentMarker::MarkerType);
+    DocumentMarker* markerContainingPoint(const LayoutPoint&, DocumentMarker::MarkerType);
     Vector<DocumentMarker*> markersFor(Node*);
     Vector<DocumentMarker*> markersInRange(Range*, DocumentMarker::MarkerTypes);
     Vector<DocumentMarker> markersForNode(Node*);
-    Vector<IntRect> renderedRectsForMarkers(DocumentMarker::MarkerType);
+    Vector<LayoutRect> renderedRectsForMarkers(DocumentMarker::MarkerType);
     void clearDescriptionOnMarkersIntersectingRange(Range*, DocumentMarker::MarkerTypes);
 

trunk/Source/WebCore/dom/Range.cpp

@@ -1974 +1974 @@
     }
 
-    IntRect visibleContentRect = view->visibleContentRect();
+    LayoutRect visibleContentRect = view->visibleContentRect();
     for (size_t i = 0; i < quads.size(); ++i) {
         quads[i].move(-visibleContentRect.x(), -visibleContentRect.y());

trunk/Source/WebCore/dom/RenderedDocumentMarker.h

@@ -41 +41 @@
 
     bool isRendered() const { return invalidMarkerRect() != m_renderedRect; }
-    bool contains(const IntPoint& point) const { return isRendered() && m_renderedRect.contains(point); }
-    void setRenderedRect(const IntRect& r) { m_renderedRect = r; }
-    const IntRect& renderedRect() const { return m_renderedRect; }
-    void invalidate(const IntRect&);
+    bool contains(const LayoutPoint& point) const { return isRendered() && m_renderedRect.contains(point); }
+    void setRenderedRect(const LayoutRect& r) { m_renderedRect = r; }
+    const LayoutRect& renderedRect() const { return m_renderedRect; }
+    void invalidate(const LayoutRect&);
     void invalidate() { m_renderedRect = invalidMarkerRect(); }
 
 private:
-    static const IntRect& invalidMarkerRect()
+    static const LayoutRect& invalidMarkerRect()
     {
-        static const IntRect rect = IntRect(-1, -1, -1, -1);
+        static const LayoutRect rect = LayoutRect(-1, -1, -1, -1);
         return rect;
     }
 
-    IntRect m_renderedRect;
+    LayoutRect m_renderedRect;
 };
 
-inline void RenderedDocumentMarker::invalidate(const IntRect& r)
+inline void RenderedDocumentMarker::invalidate(const LayoutRect& r)
 {
     if (m_renderedRect.intersects(r))