Changeset 93279 in webkit

Timestamp:

Aug 17, 2011 8:38:05 PM (13 years ago)

Author:

eae@chromium.org

Message:

Switch html/* to to new layout types
​https://bugs.webkit.org/show_bug.cgi?id=66347

Reviewed by Eric Seidel.

Convert HTML* and shadow element to new layout abstraction as a part of
the ongoing conversion work.

No new tests, no new functionality.

• html/HTMLAreaElement.cpp:

(WebCore::HTMLAreaElement::invalidateCachedRegion):
(WebCore::HTMLAreaElement::mapMouseEvent):
(WebCore::HTMLAreaElement::computePath):
(WebCore::HTMLAreaElement::computeRect):
(WebCore::HTMLAreaElement::getRegion):

• html/HTMLAreaElement.h:
• html/HTMLCanvasElement.cpp:

(WebCore::HTMLCanvasElement::paint):

• html/HTMLCanvasElement.h:
• html/HTMLMapElement.cpp:

(WebCore::HTMLMapElement::mapMouseEvent):

• html/HTMLMapElement.h:
• html/ImageDocument.cpp:

(WebCore::ImageDocumentParser::finish):
(WebCore::ImageDocument::scale):
(WebCore::ImageDocument::resizeImageToFit):
(WebCore::ImageDocument::imageFitsInWindow):

• html/ValidationMessage.cpp:

(WebCore::adjustBubblePosition):

• html/canvas/CanvasRenderingContext2D.cpp:

(WebCore::size):
(WebCore::CanvasRenderingContext2D::drawImage):

• html/shadow/MediaControlElements.cpp:

(WebCore::MediaControlPanelElement::startDrag):
(WebCore::MediaControlPanelElement::continueDrag):
(WebCore::MediaControlPanelElement::setPosition):
(WebCore::MediaControlPanelElement::defaultEventHandler):

• html/shadow/MediaControlElements.h:
• html/shadow/SliderThumbElement.cpp:

(WebCore::SliderThumbElement::dragFrom):
(WebCore::SliderThumbElement::setPositionFromPoint):

• html/shadow/SliderThumbElement.h:
• rendering/RenderImage.cpp:

(WebCore::RenderImage::nodeAtPoint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLAreaElement.cpp (modified) (4 diffs)
• html/HTMLAreaElement.h (modified) (4 diffs)
• html/HTMLCanvasElement.cpp (modified) (1 diff)
• html/HTMLCanvasElement.h (modified) (1 diff)
• html/HTMLMapElement.cpp (modified) (2 diffs)
• html/HTMLMapElement.h (modified) (2 diffs)
• html/ImageDocument.cpp (modified) (4 diffs)
• html/ValidationMessage.cpp (modified) (1 diff)
• html/canvas/CanvasRenderingContext2D.cpp (modified) (3 diffs)
• html/shadow/MediaControlElements.cpp (modified) (4 diffs)
• html/shadow/MediaControlElements.h (modified) (1 diff)
• html/shadow/SliderThumbElement.cpp (modified) (4 diffs)
• html/shadow/SliderThumbElement.h (modified) (2 diffs)
• rendering/RenderImage.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-17  Emil A Eklund  <eae@chromium.org>
+
+        Switch html/* to to new layout types
+        https://bugs.webkit.org/show_bug.cgi?id=66347
+
+        Reviewed by Eric Seidel.
+
+        Convert HTML* and shadow element to new layout abstraction as a part of
+        the ongoing conversion work.
+
+        No new tests, no new functionality.
+
+        * html/HTMLAreaElement.cpp:
+        (WebCore::HTMLAreaElement::invalidateCachedRegion):
+        (WebCore::HTMLAreaElement::mapMouseEvent):
+        (WebCore::HTMLAreaElement::computePath):
+        (WebCore::HTMLAreaElement::computeRect):
+        (WebCore::HTMLAreaElement::getRegion):
+        * html/HTMLAreaElement.h:
+        * html/HTMLCanvasElement.cpp:
+        (WebCore::HTMLCanvasElement::paint):
+        * html/HTMLCanvasElement.h:
+        * html/HTMLMapElement.cpp:
+        (WebCore::HTMLMapElement::mapMouseEvent):
+        * html/HTMLMapElement.h:
+        * html/ImageDocument.cpp:
+        (WebCore::ImageDocumentParser::finish):
+        (WebCore::ImageDocument::scale):
+        (WebCore::ImageDocument::resizeImageToFit):
+        (WebCore::ImageDocument::imageFitsInWindow):
+        * html/ValidationMessage.cpp:
+        (WebCore::adjustBubblePosition):
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::size):
+        (WebCore::CanvasRenderingContext2D::drawImage):
+        * html/shadow/MediaControlElements.cpp:
+        (WebCore::MediaControlPanelElement::startDrag):
+        (WebCore::MediaControlPanelElement::continueDrag):
+        (WebCore::MediaControlPanelElement::setPosition):
+        (WebCore::MediaControlPanelElement::defaultEventHandler):
+        * html/shadow/MediaControlElements.h:
+        * html/shadow/SliderThumbElement.cpp:
+        (WebCore::SliderThumbElement::dragFrom):
+        (WebCore::SliderThumbElement::setPositionFromPoint):
+        * html/shadow/SliderThumbElement.h:
+        * rendering/RenderImage.cpp:
+        (WebCore::RenderImage::nodeAtPoint):
+
 2011-08-17  David Grogan  <dgrogan@chromium.org>
 

trunk/Source/WebCore/html/HTMLAreaElement.cpp

@@ -76 +76 @@
 void HTMLAreaElement::invalidateCachedRegion()
 {
-    m_lastSize = IntSize(-1, -1);
-}
-
-bool HTMLAreaElement::mapMouseEvent(int x, int y, const IntSize& size, HitTestResult& result)
+    m_lastSize = LayoutSize(-1, -1);
+}
+
+bool HTMLAreaElement::mapMouseEvent(LayoutPoint location, const LayoutSize& size, HitTestResult& result)
 {
     if (m_lastSize != size) {
@@ -86 +86 @@
     }
 
-    if (!m_region->contains(IntPoint(x, y)))
+    if (!m_region->contains(location))
         return false;
     
@@ -103 +103 @@
 
     // Default should default to the size of the containing object.
-    IntSize size = m_lastSize;
+    LayoutSize size = m_lastSize;
     if (m_shape == Default)
         size = obj->absoluteOutlineBounds().size();
@@ -119 +119 @@
 }
     
-IntRect HTMLAreaElement::computeRect(RenderObject* obj) const
-{
-    return enclosingIntRect(computePath(obj).boundingRect());
-}
-
-Path HTMLAreaElement::getRegion(const IntSize& size) const
+LayoutRect HTMLAreaElement::computeRect(RenderObject* obj) const
+{
+    return enclosingLayoutRect(computePath(obj).boundingRect());
+}
+
+Path HTMLAreaElement::getRegion(const LayoutSize& size) const
 {
     if (!m_coords && m_shape != Default)
         return Path();
 
-    int width = size.width();
-    int height = size.height();
+    LayoutUnit width = size.width();
+    LayoutUnit height = size.height();
 
     // If element omits the shape attribute, select shape based on number of coordinates.

trunk/Source/WebCore/html/HTMLAreaElement.h

@@ -25 +25 @@
 
 #include "HTMLAnchorElement.h"
-#include "IntSize.h"
+#include "LayoutTypes.h"
 #include <wtf/OwnArrayPtr.h>
 
@@ -40 +40 @@
     bool isDefault() const { return m_shape == Default; }
 
-    bool mapMouseEvent(int x, int y, const IntSize&, HitTestResult&);
+    bool mapMouseEvent(LayoutPoint location, const LayoutSize&, HitTestResult&);
 
-    IntRect computeRect(RenderObject*) const;
+    LayoutRect computeRect(RenderObject*) const;
     Path computePath(RenderObject*) const;
 
@@ -61 +61 @@
     
     enum Shape { Default, Poly, Rect, Circle, Unknown };
-    Path getRegion(const IntSize&) const;
+    Path getRegion(const LayoutSize&) const;
     void invalidateCachedRegion();
 
@@ -67 +67 @@
     OwnArrayPtr<Length> m_coords;
     int m_coordsLen;
-    IntSize m_lastSize;
+    LayoutSize m_lastSize;
     Shape m_shape;
 };

trunk/Source/WebCore/html/HTMLCanvasElement.cpp

@@ -265 +265 @@
 }
 
-void HTMLCanvasElement::paint(GraphicsContext* context, const IntRect& r, bool useLowQualityScale)
+void HTMLCanvasElement::paint(GraphicsContext* context, const LayoutRect& r, bool useLowQualityScale)
 {
     // Clear the dirty rect

trunk/Source/WebCore/html/HTMLCanvasElement.h

@@ -98 +98 @@
     void didDraw(const FloatRect&);
 
-    void paint(GraphicsContext*, const IntRect&, bool useLowQualityScale = false);
+    void paint(GraphicsContext*, const LayoutRect&, bool useLowQualityScale = false);
 
     GraphicsContext* drawingContext() const;

trunk/Source/WebCore/html/HTMLMapElement.cpp

@@ -59 +59 @@
 }
 
-bool HTMLMapElement::mapMouseEvent(int x, int y, const IntSize& size, HitTestResult& result)
+bool HTMLMapElement::mapMouseEvent(LayoutPoint location, const LayoutSize& size, HitTestResult& result)
 {
     HTMLAreaElement* defaultArea = 0;
@@ -69 +69 @@
                 if (!defaultArea)
                     defaultArea = areaElt;
-            } else if (areaElt->mapMouseEvent(x, y, size, result))
+            } else if (areaElt->mapMouseEvent(location, size, result))
                 return true;
         }

trunk/Source/WebCore/html/HTMLMapElement.h

@@ -28 +28 @@
 namespace WebCore {
 
-class IntSize;
 class HitTestResult;
 class HTMLImageElement;
@@ -40 +39 @@
     const AtomicString& getName() const { return m_name; }
 
-    bool mapMouseEvent(int x, int y, const IntSize&, HitTestResult&);
+    bool mapMouseEvent(LayoutPoint location, const LayoutSize&, HitTestResult&);
     
     HTMLImageElement* imageElement();

trunk/Source/WebCore/html/ImageDocument.cpp

@@ -156 +156 @@
         // Report the natural image size in the page title, regardless of zoom
         // level.
-        IntSize size = cachedImage->imageSize(1.0f);
+        LayoutSize size = cachedImage->imageSize(1.0f);
         if (size.width()) {
             // Compute the title, we use the decoded filename of the resource, falling
@@ -236 +236 @@
         return 1;
 
-    IntSize imageSize = m_imageElement->cachedImage()->imageSize(pageZoomFactor(this));
-    IntSize windowSize = IntSize(view->width(), view->height());
+    LayoutSize imageSize = m_imageElement->cachedImage()->imageSize(pageZoomFactor(this));
+    LayoutSize windowSize = IntSize(view->width(), view->height());
     
     float widthScale = (float)windowSize.width() / imageSize.width();
@@ -250 +250 @@
         return;
 
-    IntSize imageSize = m_imageElement->cachedImage()->imageSize(pageZoomFactor(this));
+    LayoutSize imageSize = m_imageElement->cachedImage()->imageSize(pageZoomFactor(this));
 
     float scale = this->scale();
@@ -327 +327 @@
         return true;
 
-    IntSize imageSize = m_imageElement->cachedImage()->imageSize(pageZoomFactor(this));
-    IntSize windowSize = IntSize(view->width(), view->height());
+    LayoutSize imageSize = m_imageElement->cachedImage()->imageSize(pageZoomFactor(this));
+    LayoutSize windowSize = LayoutSize(view->width(), view->height());
     
     return imageSize.width() <= windowSize.width() && imageSize.height() <= windowSize.height();    

trunk/Source/WebCore/html/ValidationMessage.cpp

@@ -107 +107 @@
 }
 
-static void adjustBubblePosition(const IntRect& hostRect, HTMLElement* bubble)
+static void adjustBubblePosition(const LayoutRect& hostRect, HTMLElement* bubble)
 {
     ASSERT(bubble);

trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@ -1186 +1186 @@
 }
 
-static IntSize size(HTMLImageElement* image)
+static LayoutSize size(HTMLImageElement* image)
 {
     if (CachedImage* cachedImage = image->cachedImage())
@@ -1216 +1216 @@
         return;
     }
-    IntSize s = size(image);
+    LayoutSize s = size(image);
     drawImage(image, x, y, s.width(), s.height(), ec);
 }
@@ -1227 +1227 @@
         return;
     }
-    IntSize s = size(image);
+    LayoutSize s = size(image);
     drawImage(image, FloatRect(0, 0, s.width(), s.height()), FloatRect(x, y, width, height), ec);
 }

trunk/Source/WebCore/html/shadow/MediaControlElements.cpp

@@ -123 +123 @@
 }
 
-void MediaControlPanelElement::startDrag(const IntPoint& eventLocation)
+void MediaControlPanelElement::startDrag(const LayoutPoint& eventLocation)
 {
     if (!m_canBeDragged)
@@ -147 +147 @@
 }
 
-void MediaControlPanelElement::continueDrag(const IntPoint& eventLocation)
+void MediaControlPanelElement::continueDrag(const LayoutPoint& eventLocation)
 {
     if (!m_isBeingDragged)
         return;
 
-    IntSize distanceDragged = eventLocation - m_dragStartEventLocation;
+    LayoutSize distanceDragged = eventLocation - m_dragStartEventLocation;
     setPosition(m_dragStartPosition + distanceDragged);
 }
@@ -170 +170 @@
 }
 
-void MediaControlPanelElement::setPosition(const IntPoint& position)
+void MediaControlPanelElement::setPosition(const LayoutPoint& position)
 {
     CSSMutableStyleDeclaration* style = getInlineStyleDecl();
@@ -200 +200 @@
 
     if (event->isMouseEvent()) {
-        IntPoint location = static_cast<MouseEvent*>(event)->absoluteLocation();
+        LayoutPoint location = static_cast<MouseEvent*>(event)->absoluteLocation();
         if (event->type() == eventNames().mousedownEvent) {
             startDrag(location);

trunk/Source/WebCore/html/shadow/MediaControlElements.h

@@ -109 +109 @@
     virtual void defaultEventHandler(Event*);
 
-    void startDrag(const IntPoint& eventLocation);
-    void continueDrag(const IntPoint& eventLocation);
+    void startDrag(const LayoutPoint& eventLocation);
+    void continueDrag(const LayoutPoint& eventLocation);
     void endDrag();
 
-    void setPosition(const IntPoint&);
+    void setPosition(const LayoutPoint&);
 
     bool m_canBeDragged;
     bool m_isBeingDragged;
-    IntPoint m_dragStartPosition;
-    IntPoint m_dragStartEventLocation;
+    LayoutPoint m_dragStartPosition;
+    LayoutPoint m_dragStartEventLocation;
 };
 

trunk/Source/WebCore/html/shadow/SliderThumbElement.cpp

@@ -196 +196 @@
 }
 
-void SliderThumbElement::dragFrom(const IntPoint& point)
+void SliderThumbElement::dragFrom(const LayoutPoint& point)
 {
     setPositionFromPoint(point);
@@ -202 +202 @@
 }
 
-void SliderThumbElement::setPositionFromPoint(const IntPoint& point)
+void SliderThumbElement::setPositionFromPoint(const LayoutPoint& point)
 {
     HTMLInputElement* input = hostInput();
@@ -209 +209 @@
         return;
 
-    IntPoint offset = roundedIntPoint(input->renderer()->absoluteToLocal(point, false, true));
+    LayoutPoint offset = roundedLayoutPoint(input->renderer()->absoluteToLocal(point, false, true));
     bool isVertical = hasVerticalAppearance(input);
-    int trackSize;
-    int position;
-    int currentPosition;
+    LayoutUnit trackSize;
+    LayoutUnit position;
+    LayoutUnit currentPosition;
     // We need to calculate currentPosition from absolute points becaue the
     // renderer for this node is usually on a layer and renderBox()->x() and
     // y() are unusable.
-    IntPoint absoluteThumbOrigin = renderBox()->absoluteBoundingBoxRect().location();
-    IntPoint absoluteSliderContentOrigin = roundedIntPoint(input->renderer()->localToAbsolute());
+    LayoutPoint absoluteThumbOrigin = renderBox()->absoluteBoundingBoxRect().location();
+    LayoutPoint absoluteSliderContentOrigin = roundedLayoutPoint(input->renderer()->localToAbsolute());
     if (isVertical) {
         trackSize = input->renderBox()->contentHeight() - renderBox()->height();
@@ -228 +228 @@
         currentPosition = absoluteThumbOrigin.x() - absoluteSliderContentOrigin.x();
     }
-    position = max(0, min(position, trackSize));
+    position = max<LayoutUnit>(0, min(position, trackSize));
     if (position == currentPosition)
         return;

trunk/Source/WebCore/html/shadow/SliderThumbElement.h

@@ -53 +53 @@
     void setPositionFromValue();
 
-    void dragFrom(const IntPoint&);
+    void dragFrom(const LayoutPoint&);
     virtual void defaultEventHandler(Event*);
     virtual void detach();
@@ -68 +68 @@
     void startDragging();
     void stopDragging();
-    void setPositionFromPoint(const IntPoint&);
+    void setPositionFromPoint(const LayoutPoint&);
 
     bool m_inDragMode;

trunk/Source/WebCore/rendering/RenderImage.cpp

@@ -438 +438 @@
         if (HTMLMapElement* map = imageMap()) {
             IntRect contentBox = contentBoxRect();
-            float zoom = style()->effectiveZoom();
-            LayoutUnit mapX = roundedLayoutUnit((pointInContainer.x() - accumulatedOffset.x() - this->x() - contentBox.x()) / zoom);
-            LayoutUnit mapY = roundedLayoutUnit((pointInContainer.y() - accumulatedOffset.y() - this->y() - contentBox.y()) / zoom);
-            if (map->mapMouseEvent(mapX, mapY, contentBox.size(), tempResult))
+            float scaleFactor = 1 / style()->effectiveZoom();
+            LayoutPoint mapLocation(pointInContainer.x() - accumulatedOffset.x() - this->x() - contentBox.x(), pointInContainer.y() - accumulatedOffset.y() - this->y() - contentBox.y());
+            mapLocation.scale(scaleFactor, scaleFactor);
+            
+            if (map->mapMouseEvent(mapLocation, contentBox.size(), tempResult))
                 tempResult.setInnerNonSharedNode(node());
         }