Diff
Modified: trunk/Source/WebCore/ChangeLog (106883 => 106884)
--- trunk/Source/WebCore/ChangeLog 2012-02-07 01:33:27 UTC (rev 106883)
+++ trunk/Source/WebCore/ChangeLog 2012-02-07 01:36:25 UTC (rev 106884)
@@ -1,3 +1,67 @@
+2012-02-06 Levi Weintraub <[email protected]>
+
+ Correct usage of LayoutUnits in dom, editing, page, accessibility, inspector, and loader
+ https://bugs.webkit.org/show_bug.cgi?id=77891
+
+ Reviewed by Darin Adler.
+
+ Updating the usage of LayoutUnits in the dom, editing, page, accessibility, inspector, and loader
+ directories to properly use LayoutUnits vs ints.
+
+ No new tests. No new behavior.
+
+ * accessibility/AccessibilityObject.h:
+ (WebCore::AccessibilityObject::boundsForVisiblePositionRange):
+ (WebCore::AccessibilityObject::doAXBoundsForRange):
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::isOffScreen):
+ (WebCore::AccessibilityRenderObject::clickPoint):
+ (WebCore::AccessibilityRenderObject::boundsForVisiblePositionRange):
+ (WebCore::AccessibilityRenderObject::doAXBoundsForRange):
+ (WebCore::AccessibilityRenderObject::accessibilityImageMapHitTest):
+ * accessibility/AccessibilityRenderObject.h:
+ (AccessibilityRenderObject):
+ * accessibility/AccessibilitySlider.cpp:
+ (WebCore::AccessibilitySlider::elementAccessibilityHitTest):
+ * accessibility/AccessibilitySlider.h:
+ (AccessibilitySlider):
+ * accessibility/mac/WebAccessibilityObjectWrapper.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityShowContextMenu]):
+ * css/CSSComputedStyleDeclaration.cpp:
+ (WebCore::computedTransform):
+ (WebCore::CSSComputedStyleDeclaration::getPropertyCSSValue):
+ * dom/Clipboard.h:
+ (WebCore::Clipboard::dragLocation):
+ (Clipboard):
+ * dom/DocumentMarkerController.cpp:
+ (WebCore::DocumentMarkerController::renderedRectsForMarkers):
+ * dom/DocumentMarkerController.h:
+ * dom/Element.cpp:
+ (WebCore::Element::screenRect):
+ * dom/Element.h:
+ (Element):
+ * editing/Editor.cpp:
+ (WebCore::Editor::rangeForPoint):
+ (WebCore::Editor::firstRectForRange):
+ * editing/RenderedPosition.cpp:
+ (WebCore::RenderedPosition::absoluteRect):
+ * editing/RenderedPosition.h:
+ (WebCore::RenderedPosition::absoluteRect):
+ (RenderedPosition):
+ * editing/VisiblePosition.h:
+ (VisiblePosition):
+ * inspector/DOMNodeHighlighter.cpp:
+ * loader/SubframeLoader.cpp:
+ (WebCore::SubframeLoader::createJavaAppletWidget):
+ * loader/SubframeLoader.h:
+ (SubframeLoader):
+ * page/EventHandler.cpp:
+ (WebCore::EventHandler::handleMousePressEvent):
+ * page/Frame.cpp:
+ (WebCore::Frame::nodeImage):
+ * page/win/FrameCGWin.cpp:
+ (WebCore::Frame::nodeImage):
+
2012-02-05 Kentaro Hara <[email protected]>
Rename [DontCheckEnums], [ReturnsNew], [DoNotCheckDomainSecurityOnGet],
Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (106883 => 106884)
--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2012-02-07 01:33:27 UTC (rev 106883)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2012-02-07 01:36:25 UTC (rev 106884)
@@ -584,7 +584,7 @@
VisiblePositionRange visiblePositionRangeForRange(const PlainTextRange&) const;
String stringForVisiblePositionRange(const VisiblePositionRange&) const;
- virtual LayoutRect boundsForVisiblePositionRange(const VisiblePositionRange&) const { return LayoutRect(); }
+ virtual IntRect boundsForVisiblePositionRange(const VisiblePositionRange&) const { return IntRect(); }
int lengthForVisiblePositionRange(const VisiblePositionRange&) const;
virtual void setSelectedVisiblePositionRange(const VisiblePositionRange&) const { }
@@ -615,7 +615,7 @@
PlainTextRange doAXStyleRangeForIndex(unsigned) const;
virtual String doAXStringForRange(const PlainTextRange&) const { return String(); }
- virtual LayoutRect doAXBoundsForRange(const PlainTextRange&) const { return LayoutRect(); }
+ virtual IntRect doAXBoundsForRange(const PlainTextRange&) const { return IntRect(); }
String listMarkerTextForNodeAndPosition(Node*, const VisiblePosition&) const;
unsigned doAXLineForIndex(unsigned);
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (106883 => 106884)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2012-02-07 01:33:27 UTC (rev 106883)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2012-02-07 01:36:25 UTC (rev 106884)
@@ -709,7 +709,7 @@
ASSERT(m_renderer);
LayoutRect contentRect = m_renderer->absoluteClippedOverflowRect();
FrameView* view = m_renderer->frame()->view();
- FloatRect viewRect = view->visibleContentRect();
+ IntRect viewRect = view->visibleContentRect();
viewRect.intersect(contentRect);
return viewRect.isEmpty();
}
@@ -1499,7 +1499,7 @@
return rect.size();
}
-LayoutPoint AccessibilityRenderObject::clickPoint()
+IntPoint AccessibilityRenderObject::clickPoint()
{
// Headings are usually much wider than their textual content. If the mid point is used, often it can be wrong.
if (isHeading() && children().size() == 1)
@@ -1511,11 +1511,11 @@
VisibleSelection visSelection = selection();
VisiblePositionRange range = VisiblePositionRange(visSelection.visibleStart(), visSelection.visibleEnd());
- LayoutRect bounds = boundsForVisiblePositionRange(range);
+ IntRect bounds = boundsForVisiblePositionRange(range);
#if PLATFORM(MAC)
bounds.setLocation(m_renderer->document()->view()->screenToContents(bounds.location()));
#endif
- return LayoutPoint(bounds.x() + (bounds.width() / 2), bounds.y() - (bounds.height() / 2));
+ return IntPoint(bounds.x() + (bounds.width() / 2), bounds.y() - (bounds.height() / 2));
}
AccessibilityObject* AccessibilityRenderObject::internalLinkElement() const
@@ -2594,10 +2594,10 @@
return axObjectForNode->isTextControl();
}
-LayoutRect AccessibilityRenderObject::boundsForVisiblePositionRange(const VisiblePositionRange& visiblePositionRange) const
+IntRect AccessibilityRenderObject::boundsForVisiblePositionRange(const VisiblePositionRange& visiblePositionRange) const
{
if (visiblePositionRange.isNull())
- return LayoutRect();
+ return IntRect();
// Create a mutable VisiblePositionRange.
VisiblePositionRange range(visiblePositionRange);
@@ -2811,14 +2811,14 @@
// The bounding rectangle of the text associated with this accessibility object that is
// specified by the given range. This is the bounding rectangle a sighted user would see
// on the display screen, in pixels.
-LayoutRect AccessibilityRenderObject::doAXBoundsForRange(const PlainTextRange& range) const
+IntRect AccessibilityRenderObject::doAXBoundsForRange(const PlainTextRange& range) const
{
if (allowsTextRanges())
return boundsForVisiblePositionRange(visiblePositionRangeForRange(range));
- return LayoutRect();
+ return IntRect();
}
-AccessibilityObject* AccessibilityRenderObject::accessibilityImageMapHitTest(HTMLAreaElement* area, const IntPoint& point) const
+AccessibilityObject* AccessibilityRenderObject::accessibilityImageMapHitTest(HTMLAreaElement* area, const LayoutPoint& point) const
{
if (!area)
return 0;
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h (106883 => 106884)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h 2012-02-07 01:33:27 UTC (rev 106883)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h 2012-02-07 01:36:25 UTC (rev 106884)
@@ -154,7 +154,7 @@
void updateAccessibilityRole();
// Should be called on the root accessibility object to kick off a hit test.
- virtual AccessibilityObject* accessibilityHitTest(const IntPoint&) const;
+ virtual AccessibilityObject* accessibilityHitTest(const LayoutPoint&) const;
virtual Element* actionElement() const;
Element* mouseButtonListener() const;
@@ -166,7 +166,7 @@
virtual LayoutRect boundingBoxRect() const;
virtual LayoutRect elementRect() const;
virtual LayoutSize size() const;
- virtual LayoutPoint clickPoint();
+ virtual IntPoint clickPoint();
void setRenderer(RenderObject* renderer) { m_renderer = renderer; }
virtual RenderObject* renderer() const { return m_renderer; }
@@ -228,7 +228,7 @@
virtual VisiblePositionRange visiblePositionRange() const;
virtual VisiblePositionRange visiblePositionRangeForLine(unsigned) const;
- virtual LayoutRect boundsForVisiblePositionRange(const VisiblePositionRange&) const;
+ virtual IntRect boundsForVisiblePositionRange(const VisiblePositionRange&) const;
virtual void setSelectedVisiblePositionRange(const VisiblePositionRange&) const;
virtual bool supportsARIAFlowTo() const;
virtual void ariaFlowToElements(AccessibilityChildrenVector&) const;
@@ -250,7 +250,7 @@
virtual PlainTextRange doAXRangeForIndex(unsigned) const;
virtual String doAXStringForRange(const PlainTextRange&) const;
- virtual LayoutRect doAXBoundsForRange(const PlainTextRange&) const;
+ virtual IntRect doAXBoundsForRange(const PlainTextRange&) const;
virtual String stringValueForMSAA() const;
virtual String stringRoleForMSAA() const;
Modified: trunk/Source/WebCore/accessibility/AccessibilitySlider.cpp (106883 => 106884)
--- trunk/Source/WebCore/accessibility/AccessibilitySlider.cpp 2012-02-07 01:33:27 UTC (rev 106883)
+++ trunk/Source/WebCore/accessibility/AccessibilitySlider.cpp 2012-02-07 01:36:25 UTC (rev 106884)
@@ -101,7 +101,7 @@
return element()->getAttribute(attribute);
}
-AccessibilityObject* AccessibilitySlider::elementAccessibilityHitTest(const IntPoint& point) const
+AccessibilityObject* AccessibilitySlider::elementAccessibilityHitTest(const LayoutPoint& point) const
{
if (m_children.size()) {
ASSERT(m_children.size() == 1);
Modified: trunk/Source/WebCore/accessibility/AccessibilitySlider.h (106883 => 106884)
--- trunk/Source/WebCore/accessibility/AccessibilitySlider.h 2012-02-07 01:33:27 UTC (rev 106883)
+++ trunk/Source/WebCore/accessibility/AccessibilitySlider.h 2012-02-07 01:36:25 UTC (rev 106884)
@@ -48,7 +48,7 @@
private:
HTMLInputElement* element() const;
virtual bool accessibilityIsIgnored() const;
- virtual AccessibilityObject* elementAccessibilityHitTest(const IntPoint&) const;
+ virtual AccessibilityObject* elementAccessibilityHitTest(const LayoutPoint&) const;
virtual AccessibilityRole roleValue() const { return SliderRole; }
virtual bool isSlider() const { return true; }
Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.mm (106883 => 106884)
--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.mm 2012-02-07 01:33:27 UTC (rev 106883)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapper.mm 2012-02-07 01:36:25 UTC (rev 106884)
@@ -2605,7 +2605,7 @@
return;
// Simulate a click in the middle of the object.
- LayoutPoint clickPoint = m_object->clickPoint();
+ IntPoint clickPoint = m_object->clickPoint();
PlatformMouseEvent mouseEvent(clickPoint, clickPoint, RightButton, PlatformEvent::MousePressed, 1, false, false, false, false, currentTime());
bool handled = frame->eventHandler()->sendContextMenuEvent(mouseEvent);
Modified: trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp (106883 => 106884)
--- trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2012-02-07 01:33:27 UTC (rev 106883)
+++ trunk/Source/WebCore/css/CSSComputedStyleDeclaration.cpp 2012-02-07 01:36:25 UTC (rev 106884)
@@ -668,7 +668,7 @@
if (!renderer || style->transform().operations().isEmpty())
return cssValuePool->createIdentifierValue(CSSValueNone);
- IntRect box = sizingBox(renderer);
+ LayoutRect box = sizingBox(renderer);
TransformationMatrix transform;
style->applyTransform(transform, box.size(), RenderStyle::ExcludeTransformOrigin);
@@ -2113,7 +2113,7 @@
case CSSPropertyWebkitPerspectiveOrigin: {
RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
if (renderer) {
- IntRect box = sizingBox(renderer);
+ LayoutRect box = sizingBox(renderer);
list->append(zoomAdjustedPixelValue(style->perspectiveOriginX().calcMinValue(box.width()), style.get(), cssValuePool));
list->append(zoomAdjustedPixelValue(style->perspectiveOriginY().calcMinValue(box.height()), style.get(), cssValuePool));
}
Modified: trunk/Source/WebCore/dom/Clipboard.h (106883 => 106884)
--- trunk/Source/WebCore/dom/Clipboard.h 2012-02-07 01:33:27 UTC (rev 106883)
+++ trunk/Source/WebCore/dom/Clipboard.h 2012-02-07 01:36:25 UTC (rev 106884)
@@ -69,13 +69,13 @@
virtual HashSet<String> types() const = 0;
virtual PassRefPtr<FileList> files() const = 0;
- LayoutPoint dragLocation() const { return m_dragLoc; }
+ IntPoint dragLocation() const { return m_dragLoc; }
CachedImage* dragImage() const { return m_dragImage.get(); }
- virtual void setDragImage(CachedImage*, const LayoutPoint&) = 0;
+ virtual void setDragImage(CachedImage*, const IntPoint&) = 0;
Node* dragImageElement() const { return m_dragImageElement.get(); }
- virtual void setDragImageElement(Node*, const LayoutPoint&) = 0;
+ virtual void setDragImageElement(Node*, const IntPoint&) = 0;
- virtual DragImageRef createDragImage(LayoutPoint& dragLocation) const = 0;
+ virtual DragImageRef createDragImage(IntPoint& dragLocation) const = 0;
#if ENABLE(DRAG_SUPPORT)
virtual void declareAndWriteDragImage(Element*, const KURL&, const String& title, Frame*) = 0;
#endif
@@ -117,7 +117,7 @@
ClipboardType m_clipboardType;
protected:
- LayoutPoint m_dragLoc;
+ IntPoint m_dragLoc;
CachedResourceHandle<CachedImage> m_dragImage;
RefPtr<Node> m_dragImageElement;
};
Modified: trunk/Source/WebCore/dom/DocumentMarkerController.cpp (106883 => 106884)
--- trunk/Source/WebCore/dom/DocumentMarkerController.cpp 2012-02-07 01:33:27 UTC (rev 106883)
+++ trunk/Source/WebCore/dom/DocumentMarkerController.cpp 2012-02-07 01:36:25 UTC (rev 106884)
@@ -377,9 +377,9 @@
return foundMarkers;
}
-Vector<LayoutRect> DocumentMarkerController::renderedRectsForMarkers(DocumentMarker::MarkerType markerType)
+Vector<IntRect> DocumentMarkerController::renderedRectsForMarkers(DocumentMarker::MarkerType markerType)
{
- Vector<LayoutRect> result;
+ Vector<IntRect> result;
if (!possiblyHasMarkers(markerType))
return result;
Modified: trunk/Source/WebCore/dom/DocumentMarkerController.h (106883 => 106884)
--- trunk/Source/WebCore/dom/DocumentMarkerController.h 2012-02-07 01:33:27 UTC (rev 106883)
+++ trunk/Source/WebCore/dom/DocumentMarkerController.h 2012-02-07 01:36:25 UTC (rev 106884)
@@ -72,7 +72,7 @@
Vector<DocumentMarker*> markersFor(Node*, DocumentMarker::MarkerTypes = DocumentMarker::AllMarkers());
Vector<DocumentMarker*> markersInRange(Range*, DocumentMarker::MarkerTypes);
Vector<DocumentMarker> markersForNode(Node*);
- Vector<LayoutRect> renderedRectsForMarkers(DocumentMarker::MarkerType);
+ Vector<IntRect> renderedRectsForMarkers(DocumentMarker::MarkerType);
void clearDescriptionOnMarkersIntersectingRange(Range*, DocumentMarker::MarkerTypes);
#ifndef NDEBUG
Modified: trunk/Source/WebCore/dom/Element.cpp (106883 => 106884)
--- trunk/Source/WebCore/dom/Element.cpp 2012-02-07 01:33:27 UTC (rev 106883)
+++ trunk/Source/WebCore/dom/Element.cpp 2012-02-07 01:36:25 UTC (rev 106884)
@@ -566,10 +566,10 @@
return ClientRect::create(result);
}
-LayoutRect Element::screenRect() const
+IntRect Element::screenRect() const
{
if (!renderer())
- return LayoutRect();
+ return IntRect();
// FIXME: this should probably respect transforms
return renderer()->view()->frameView()->contentsToScreen(renderer()->absoluteBoundingBoxRectIgnoringTransforms());
}
Modified: trunk/Source/WebCore/dom/Element.h (106883 => 106884)
--- trunk/Source/WebCore/dom/Element.h 2012-02-07 01:33:27 UTC (rev 106883)
+++ trunk/Source/WebCore/dom/Element.h 2012-02-07 01:36:25 UTC (rev 106884)
@@ -187,7 +187,7 @@
PassRefPtr<ClientRect> getBoundingClientRect();
// Returns the absolute bounding box translated into screen coordinates:
- LayoutRect screenRect() const;
+ IntRect screenRect() const;
void removeAttribute(const String& name);
void removeAttributeNS(const String& namespaceURI, const String& localName);
Modified: trunk/Source/WebCore/editing/Editor.cpp (106883 => 106884)
--- trunk/Source/WebCore/editing/Editor.cpp 2012-02-07 01:33:27 UTC (rev 106883)
+++ trunk/Source/WebCore/editing/Editor.cpp 2012-02-07 01:36:25 UTC (rev 106884)
@@ -2318,7 +2318,7 @@
m_spellingCorrector->deletedAutocorrectionAtPosition(position, originalString);
}
-PassRefPtr<Range> Editor::rangeForPoint(const LayoutPoint& windowPoint)
+PassRefPtr<Range> Editor::rangeForPoint(const IntPoint& windowPoint)
{
Document* document = m_frame->documentAtPoint(windowPoint);
if (!document)
@@ -2633,7 +2633,7 @@
IntRect Editor::firstRectForRange(Range* range) const
{
- int extraWidthToEndOfLine = 0;
+ LayoutUnit extraWidthToEndOfLine = 0;
ASSERT(range->startContainer());
ASSERT(range->endContainer());
Modified: trunk/Source/WebCore/editing/RenderedPosition.cpp (106883 => 106884)
--- trunk/Source/WebCore/editing/RenderedPosition.cpp 2012-02-07 01:33:27 UTC (rev 106883)
+++ trunk/Source/WebCore/editing/RenderedPosition.cpp 2012-02-07 01:36:25 UTC (rev 106884)
@@ -224,7 +224,7 @@
return createLegacyEditingPosition(prevLeafChild()->renderer()->node(), prevLeafChild()->caretRightmostOffset());
}
-LayoutRect RenderedPosition::absoluteRect(int* extraWidthToEndOfLine) const
+LayoutRect RenderedPosition::absoluteRect(LayoutUnit* extraWidthToEndOfLine) const
{
if (isNull())
return LayoutRect();
Modified: trunk/Source/WebCore/editing/RenderedPosition.h (106883 => 106884)
--- trunk/Source/WebCore/editing/RenderedPosition.h 2012-02-07 01:33:27 UTC (rev 106883)
+++ trunk/Source/WebCore/editing/RenderedPosition.h 2012-02-07 01:36:25 UTC (rev 106884)
@@ -68,7 +68,7 @@
Position positionAtRightBoundaryOfBiDiRun() const;
LayoutRect absoluteRect() const { return absoluteRect(0); }
- LayoutRect absoluteRect(int& extraWidthToEndOfLine) const { return absoluteRect(&extraWidthToEndOfLine); }
+ LayoutRect absoluteRect(LayoutUnit& extraWidthToEndOfLine) const { return absoluteRect(&extraWidthToEndOfLine); }
private:
bool operator==(const RenderedPosition&) const { return false; }
@@ -81,7 +81,7 @@
bool atLeftBoundaryOfBidiRun(ShouldMatchBidiLevel, unsigned char bidiLevelOfRun) const;
bool atRightBoundaryOfBidiRun(ShouldMatchBidiLevel, unsigned char bidiLevelOfRun) const;
- LayoutRect absoluteRect(int* extraWidthToEndOfLine) const;
+ LayoutRect absoluteRect(LayoutUnit* extraWidthToEndOfLine) const;
RenderObject* m_renderer;
InlineBox* m_inlineBox;
Modified: trunk/Source/WebCore/editing/VisiblePosition.h (106883 => 106884)
--- trunk/Source/WebCore/editing/VisiblePosition.h 2012-02-07 01:33:27 UTC (rev 106883)
+++ trunk/Source/WebCore/editing/VisiblePosition.h 2012-02-07 01:36:25 UTC (rev 106884)
@@ -93,7 +93,7 @@
}
// Rect is local to the returned renderer
- IntRect localCaretRect(RenderObject*&) const;
+ LayoutRect localCaretRect(RenderObject*&) const;
// Bounds of (possibly transformed) caret in absolute coords
IntRect absoluteCaretBounds() const;
// Abs x/y position of the caret ignoring transforms.
Modified: trunk/Source/WebCore/inspector/DOMNodeHighlighter.cpp (106883 => 106884)
--- trunk/Source/WebCore/inspector/DOMNodeHighlighter.cpp 2012-02-07 01:33:27 UTC (rev 106883)
+++ trunk/Source/WebCore/inspector/DOMNodeHighlighter.cpp 2012-02-07 01:36:25 UTC (rev 106884)
@@ -288,8 +288,8 @@
titleRect.inflate(rectInflatePx);
// The initial offsets needed to compensate for a 1px-thick border stroke (which is not a part of the rectangle).
- LayoutUnit dx = -borderWidthPx;
- LayoutUnit dy = borderWidthPx;
+ int dx = -borderWidthPx;
+ int dy = borderWidthPx;
// If the tip sticks beyond the right of visibleRect, right-align the tip with the said boundary.
if (titleRect.maxX() + dx > visibleRect.maxX())
Modified: trunk/Source/WebCore/loader/SubframeLoader.cpp (106883 => 106884)
--- trunk/Source/WebCore/loader/SubframeLoader.cpp 2012-02-07 01:33:27 UTC (rev 106883)
+++ trunk/Source/WebCore/loader/SubframeLoader.cpp 2012-02-07 01:36:25 UTC (rev 106884)
@@ -191,7 +191,7 @@
}
#endif // ENABLE(PLUGIN_PROXY_FOR_VIDEO)
-PassRefPtr<Widget> SubframeLoader::createJavaAppletWidget(const IntSize& size, HTMLAppletElement* element, const HashMap<String, String>& args)
+PassRefPtr<Widget> SubframeLoader::createJavaAppletWidget(const LayoutSize& size, HTMLAppletElement* element, const HashMap<String, String>& args)
{
String baseURLString;
String codeBaseURLString;
Modified: trunk/Source/WebCore/loader/SubframeLoader.h (106883 => 106884)
--- trunk/Source/WebCore/loader/SubframeLoader.h 2012-02-07 01:33:27 UTC (rev 106883)
+++ trunk/Source/WebCore/loader/SubframeLoader.h 2012-02-07 01:36:25 UTC (rev 106884)
@@ -32,6 +32,7 @@
#define SubframeLoader_h
#include "FrameLoaderTypes.h"
+#include "LayoutTypes.h"
#include "PlatformString.h"
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
@@ -71,7 +72,7 @@
PassRefPtr<Widget> loadMediaPlayerProxyPlugin(Node*, const KURL&, const Vector<String>& paramNames, const Vector<String>& paramValues);
#endif
- PassRefPtr<Widget> createJavaAppletWidget(const IntSize&, HTMLAppletElement*, const HashMap<String, String>& args);
+ PassRefPtr<Widget> createJavaAppletWidget(const LayoutSize&, HTMLAppletElement*, const HashMap<String, String>& args);
bool allowPlugins(ReasonForCallingAllowPlugins);
Modified: trunk/Source/WebCore/page/EventHandler.cpp (106883 => 106884)
--- trunk/Source/WebCore/page/EventHandler.cpp 2012-02-07 01:33:27 UTC (rev 106883)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2012-02-07 01:36:25 UTC (rev 106884)
@@ -1481,7 +1481,7 @@
HitTestRequest request(HitTestRequest::Active);
// Save the document point we generate in case the window coordinate is invalidated by what happens
// when we dispatch the event.
- IntPoint documentPoint = documentPointForWindowPoint(m_frame, mouseEvent.position());
+ LayoutPoint documentPoint = documentPointForWindowPoint(m_frame, mouseEvent.position());
MouseEventWithHitTestResults mev = m_frame->document()->prepareMouseEvent(request, documentPoint, mouseEvent);
if (!targetNode(mev)) {
Modified: trunk/Source/WebCore/page/Frame.cpp (106883 => 106884)
--- trunk/Source/WebCore/page/Frame.cpp 2012-02-07 01:33:27 UTC (rev 106883)
+++ trunk/Source/WebCore/page/Frame.cpp 2012-02-07 01:36:25 UTC (rev 106884)
@@ -1071,7 +1071,7 @@
m_doc->updateLayout();
m_view->setNodeToDraw(node); // Enable special sub-tree drawing mode.
- IntRect topLevelRect;
+ LayoutRect topLevelRect;
IntRect paintingRect = renderer->paintingRootRect(topLevelRect);
OwnPtr<ImageBuffer> buffer(ImageBuffer::create(paintingRect.size()));
Modified: trunk/Source/WebCore/page/win/FrameCGWin.cpp (106883 => 106884)
--- trunk/Source/WebCore/page/win/FrameCGWin.cpp 2012-02-07 01:33:27 UTC (rev 106883)
+++ trunk/Source/WebCore/page/win/FrameCGWin.cpp 2012-02-07 01:36:25 UTC (rev 106884)
@@ -97,7 +97,7 @@
if (!renderer)
return 0;
- IntRect topLevelRect;
+ LayoutRect topLevelRect;
IntRect paintingRect = renderer->paintingRootRect(topLevelRect);
document()->updateLayout();
