ChangeLog

2011-08-16  Emil A Eklund  <eae@chromium.org>

        Switch html/* to to new layout types

        https://bugs.webkit.org/show_bug.cgi?id=66347

        Reviewed by NOBODY (OOPS!).

        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-16  Scott Byer  <scottbyer@chromium.org>

        Fix spelling error.

93178

Source/WebCore/html/HTMLAreaElement.cpp

@@void HTMLAreaElement::parseMappedAttribu

void HTMLAreaElement::invalidateCachedRegion()

{

78 m_lastSize = IntSize(-1, -1);

78 m_lastSize = LayoutSize(-1, -1);

7979}

8080

81 bool HTMLAreaElement::mapMouseEvent(int x, i~~nt y~~, const IntSize& size, HitTestResult& result)

81bool HTMLAreaElement::mapMouseEvent(LayoutPoint location, const LayoutSize& size, HitTestResult& result)

{

    if (m_lastSize != size) {

        m_region = adoptPtr(new Path(getRegion(size)));

        m_lastSize = size;

    }

88 if (!m_region->contains(I~~ntPoint(x, y)))~~

88 if (!m_region->contains(location))

        return false;

    result.setInnerNode(this);

@@Path HTMLAreaElement::computePath(Render

    FloatPoint absPos = obj->localToAbsolute();

    // Default should default to the size of the containing object.

105 IntSize size = m_lastSize;

105 LayoutSize size = m_lastSize;

    if (m_shape == Default)

        size = obj->absoluteOutlineBounds().size();

@@Path HTMLAreaElement::computePath(Render

    return p;

}

121 IntRect HTMLAreaElement::computeRect(RenderObject* obj) const

121LayoutRect HTMLAreaElement::computeRect(RenderObject* obj) const

122122{

123 return enclosingIntRect(computePath(obj).boundingRect());

123 return enclosingLayoutRect(computePath(obj).boundingRect());

124124}

125125

126 Path HTMLAreaElement::getRegion(const IntSize& size) const

126Path HTMLAreaElement::getRegion(const LayoutSize& size) const

{

    if (!m_coords && m_shape != Default)

        return Path();

131 int width = size.width();

132 int height = size.height();

131 LayoutUnit width = size.width();

132 LayoutUnit height = size.height();

    // If element omits the shape attribute, select shape based on number of coordinates.

    Shape shape = m_shape;

93161

Source/WebCore/html/HTMLAreaElement.h

#define HTMLAreaElement_h

#include "HTMLAnchorElement.h"

27 #include "In~~tSiz~~e.h"

27#include "LayoutTypes.h"

#include <wtf/OwnArrayPtr.h>

namespace WebCore {

@@public:

    bool isDefault() const { return m_shape == Default; }

42 bool mapMouseEvent(int x, i~~nt y~~, const IntSize&, HitTestResult&);

42 bool mapMouseEvent(LayoutPoint location, const LayoutSize&, HitTestResult&);

4343

44 IntRect computeRect(RenderObject*) const;

44 LayoutRect computeRect(RenderObject*) const;

    Path computePath(RenderObject*) const;

    // The parent map's image.

@@private:

    virtual void setFocus(bool);

    enum Shape { Default, Poly, Rect, Circle, Unknown };

63 Path getRegion(const IntSize&) const;

63 Path getRegion(const LayoutSize&) const;

    void invalidateCachedRegion();

    OwnPtr<Path> m_region;

    OwnArrayPtr<Length> m_coords;

    int m_coordsLen;

69 IntSize m_lastSize;

69 LayoutSize m_lastSize;

    Shape m_shape;

};

93161

Source/WebCore/html/HTMLCanvasElement.cpp

@@void HTMLCanvasElement::reset()

        (*it)->canvasResized(this);

}

267 void HTMLCanvasElement::paint(GraphicsContext* context, const IntRect& r, bool useLowQualityScale)

267void HTMLCanvasElement::paint(GraphicsContext* context, const LayoutRect& r, bool useLowQualityScale)

{

    // Clear the dirty rect

    m_dirtyRect = FloatRect();

93161

Source/WebCore/html/HTMLCanvasElement.h

@@public:

    // Used for rendering

    void didDraw(const FloatRect&);

100 void paint(GraphicsContext*, const IntRect&, bool useLowQualityScale = false);

100 void paint(GraphicsContext*, const LayoutRect&, bool useLowQualityScale = false);

    GraphicsContext* drawingContext() const;

    GraphicsContext* existingDrawingContext() const;

93161

Source/WebCore/html/HTMLMapElement.cpp

@@HTMLMapElement::~HTMLMapElement()

{

}

61 bool HTMLMapElement::mapMouseEvent(int x, i~~nt y~~, const IntSize& size, HitTestResult& result)

61bool HTMLMapElement::mapMouseEvent(LayoutPoint location, const LayoutSize& size, HitTestResult& result)

{

    HTMLAreaElement* defaultArea = 0;

    Node *node = this;

@@bool HTMLMapElement::mapMouseEvent(int x

            if (areaElt->isDefault()) {

                if (!defaultArea)

                    defaultArea = areaElt;

71 } else if (areaElt->mapMouseEvent(~~x, y~~, size, result))

71 } else if (areaElt->mapMouseEvent(location, size, result))

                return true;

        }

    }

93161

Source/WebCore/html/HTMLMapElement.h

namespace WebCore {

30 class IntSize;

class HitTestResult;

class HTMLImageElement;

@@public:

    const AtomicString& getName() const { return m_name; }

42 bool mapMouseEvent(int x, i~~nt y~~, const IntSize&, HitTestResult&);

41 bool mapMouseEvent(LayoutPoint location, const LayoutSize&, HitTestResult&);

    
    HTMLImageElement* imageElement();

    PassRefPtr<HTMLCollection> areas();

93161

Source/WebCore/html/ImageDocument.cpp

@@void ImageDocumentParser::finish()

        // Report the natural image size in the page title, regardless of zoom

        // level.

158 IntSize size = cachedImage->imageSize(1.0f);

158 LayoutSize size = cachedImage->imageSize(1.0f);

        if (size.width()) {

            // Compute the title, we use the decoded filename of the resource, falling

            // back on the (decoded) hostname if there is no path.

@@float ImageDocument::scale() const

    if (!view)

        return 1;

238 IntSize imageSize = m_imageElement->cachedImage()->imageSize(pageZoomFactor(this));

239 IntSize windowSize = IntSize(view->width(), view->height());

238 LayoutSize imageSize = m_imageElement->cachedImage()->imageSize(pageZoomFactor(this));

239 LayoutSize windowSize = IntSize(view->width(), view->height());

    
    float widthScale = (float)windowSize.width() / imageSize.width();

    float heightScale = (float)windowSize.height() / imageSize.height();

@@void ImageDocument::resizeImageToFit()

    if (!m_imageElement)

        return;

252 IntSize imageSize = m_imageElement->cachedImage()->imageSize(pageZoomFactor(this));

252 LayoutSize imageSize = m_imageElement->cachedImage()->imageSize(pageZoomFactor(this));

    float scale = this->scale();

    m_imageElement->setWidth(static_cast<int>(imageSize.width() * scale));

@@bool ImageDocument::imageFitsInWindow()

    if (!view)

        return true;

329 IntSize imageSize = m_imageElement->cachedImage()->imageSize(pageZoomFactor(this));

330 IntSize windowSize = IntSize(view->width(), view->height());

329 LayoutSize imageSize = m_imageElement->cachedImage()->imageSize(pageZoomFactor(this));

330 LayoutSize windowSize = LayoutSize(view->width(), view->height());

    
    return imageSize.width() <= windowSize.width() && imageSize.height() <= windowSize.height();    

}

93161

Source/WebCore/html/ValidationMessage.cpp

@@void ValidationMessage::setMessageDOMAnd

    }

}

109 static void adjustBubblePosition(const IntRect& hostRect, HTMLElement* bubble)

109static void adjustBubblePosition(const LayoutRect& hostRect, HTMLElement* bubble)

{

    ASSERT(bubble);

    if (hostRect.isEmpty())

93161

Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@void CanvasRenderingContext2D::applyShad

    c->setLegacyShadow(FloatSize(width, -height), state().m_shadowBlur, state().m_shadowColor, ColorSpaceDeviceRGB);

}

1182 static IntSize size(HTMLImageElement* image)

1182static LayoutSize size(HTMLImageElement* image)

{

    if (CachedImage* cachedImage = image->cachedImage())

        return cachedImage->imageSize(1.0f); // FIXME: Not sure about this.

@@void CanvasRenderingContext2D::drawImage

        ec = TYPE_MISMATCH_ERR;

        return;

    }

1212 IntSize s = size(image);

1212 LayoutSize s = size(image);

    drawImage(image, x, y, s.width(), s.height(), ec);

}

@@void CanvasRenderingContext2D::drawImage

        ec = TYPE_MISMATCH_ERR;

        return;

    }

1223 IntSize s = size(image);

1223 LayoutSize s = size(image);

    drawImage(image, FloatRect(0, 0, s.width(), s.height()), FloatRect(x, y, width, height), ec);

}

93161

Source/WebCore/html/shadow/MediaControlElements.cpp

@@const AtomicString& MediaControlPanelEle

    return id;

}

125 void MediaControlPanelElement::startDrag(const IntPoint& eventLocation)

125void MediaControlPanelElement::startDrag(const LayoutPoint& eventLocation)

{

    if (!m_canBeDragged)

        return;

@@void MediaControlPanelElement::startDrag

    m_isBeingDragged = true;

}

149 void MediaControlPanelElement::continueDrag(const IntPoint& eventLocation)

149void MediaControlPanelElement::continueDrag(const LayoutPoint& eventLocation)

{

    if (!m_isBeingDragged)

        return;

154 IntSize distanceDragged = eventLocation - m_dragStartEventLocation;

154 LayoutSize distanceDragged = eventLocation - m_dragStartEventLocation;

    setPosition(m_dragStartPosition + distanceDragged);

}

@@void MediaControlPanelElement::endDrag()

    frame->eventHandler()->setCapturingMouseEventsNode(0);

}

172 void MediaControlPanelElement::setPosition(const IntPoint& position)

172void MediaControlPanelElement::setPosition(const LayoutPoint& position)

{

    CSSMutableStyleDeclaration* style = getInlineStyleDecl();

@@void MediaControlPanelElement::defaultEv

    MediaControlElement::defaultEventHandler(event);

    if (event->isMouseEvent()) {

202 IntPoint location = static_cast<MouseEvent*>(event)->absoluteLocation();

202 LayoutPoint location = static_cast<MouseEvent*>(event)->absoluteLocation();

        if (event->type() == eventNames().mousedownEvent) {

            startDrag(location);

            event->setDefaultHandled();

93161

Source/WebCore/html/shadow/MediaControlElements.h

@@private:

    virtual const AtomicString& shadowPseudoId() const;

    virtual void defaultEventHandler(Event*);

111 void startDrag(const IntPoint& eventLocation);

112 void continueDrag(const IntPoint& eventLocation);

111 void startDrag(const LayoutPoint& eventLocation);

112 void continueDrag(const LayoutPoint& eventLocation);

113113 void endDrag();

114114

115 void setPosition(const IntPoint&);

115 void setPosition(const LayoutPoint&);

    bool m_canBeDragged;

    bool m_isBeingDragged;

119 IntPoint m_dragStartPosition;

120 IntPoint m_dragStartEventLocation;

119 LayoutPoint m_dragStartPosition;

120 LayoutPoint m_dragStartEventLocation;

};

// ----------------------------

93161

Source/WebCore/html/shadow/SliderThumbElement.cpp

@@Node* SliderThumbElement::focusDelegate(

    return hostInput();

}

198 void SliderThumbElement::dragFrom(const IntPoint& point)

198void SliderThumbElement::dragFrom(const LayoutPoint& point)

{

    setPositionFromPoint(point);

    startDragging();

}

204 void SliderThumbElement::setPositionFromPoint(const IntPoint& point)

204void SliderThumbElement::setPositionFromPoint(const LayoutPoint& point)

{

    HTMLInputElement* input = hostInput();

    if (!input->renderer() || !renderer())

        return;

211 IntPoint offset = roundedIntPoint(input->renderer()->absoluteToLocal(point, false, true));

211 LayoutPoint offset = roundedLayoutPoint(input->renderer()->absoluteToLocal(point, false, true));

212212 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.

219 IntPoint absoluteThumbOrigin = renderBox()->absoluteBoundingBoxRect().location();

220 IntPoint absoluteSliderContentOrigin = roundedIntPoint(input->renderer()->localToAbsolute());

219 LayoutPoint absoluteThumbOrigin = renderBox()->absoluteBoundingBoxRect().location();

220 LayoutPoint absoluteSliderContentOrigin = roundedLayoutPoint(input->renderer()->localToAbsolute());

    if (isVertical) {

        trackSize = input->renderBox()->contentHeight() - renderBox()->height();

        position = offset.y() - renderBox()->height() / 2;

@@void SliderThumbElement::setPositionFrom

        position = offset.x() - renderBox()->width() / 2;

        currentPosition = absoluteThumbOrigin.x() - absoluteSliderContentOrigin.x();

    }

230 position = max(0, min(position, trackSize));

230 position = max<LayoutUnit>(0, min(position, trackSize));

    if (position == currentPosition)

        return;

93161

Source/WebCore/html/shadow/SliderThumbElement.h

@@public:

    void setPositionFromValue();

55 void dragFrom(const IntPoint&);

55 void dragFrom(const LayoutPoint&);

    virtual void defaultEventHandler(Event*);

    virtual void detach();

    virtual const AtomicString& shadowPseudoId() const;

@@private:

    virtual Node* focusDelegate();

    void startDragging();

    void stopDragging();

70 void setPositionFromPoint(const IntPoint&);

70 void setPositionFromPoint(const LayoutPoint&);

    bool m_inDragMode;

};

93161

Source/WebCore/rendering/RenderImage.cpp

@@bool RenderImage::nodeAtPoint(const HitT

    if (tempResult.innerNode() && node()) {

        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());

            if (scaleFactor != 1.0f)

                mapLocation.scale(scaleFactor, scaleFactor);

            if (map->mapMouseEvent(mapLocation, contentBox.size(), tempResult))

                tempResult.setInnerNonSharedNode(node());

        }

    }

93161