Diff
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderApplet.cpp (104206 => 104207)
--- branches/subpixellayout/Source/WebCore/rendering/RenderApplet.cpp 2012-01-05 21:25:23 UTC (rev 104206)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderApplet.cpp 2012-01-05 21:37:08 UTC (rev 104207)
@@ -44,13 +44,13 @@
{
}
-LayoutSize RenderApplet::intrinsicSize() const
+IntSize RenderApplet::intrinsicSize() const
{
// FIXME: This doesn't make sense. We can't just start returning
// a different size once we've created the widget and expect
// layout and sizing to be correct. We should remove this and
// pass the appropriate intrinsic size in the constructor.
- return widget() ? LayoutSize(50, 50) : LayoutSize(150, 150);
+ return widget() ? IntSize(50, 50) : IntSize(150, 150);
}
void RenderApplet::createWidgetIfNecessary()
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderApplet.h (104206 => 104207)
--- branches/subpixellayout/Source/WebCore/rendering/RenderApplet.h 2012-01-05 21:25:23 UTC (rev 104206)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderApplet.h 2012-01-05 21:37:08 UTC (rev 104207)
@@ -46,7 +46,7 @@
virtual bool isApplet() const { return true; }
virtual void layout();
- virtual LayoutSize intrinsicSize() const;
+ virtual IntSize intrinsicSize() const;
#if USE(ACCELERATED_COMPOSITING)
virtual bool requiresLayer() const;
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderBox.h (104206 => 104207)
--- branches/subpixellayout/Source/WebCore/rendering/RenderBox.h 2012-01-05 21:25:23 UTC (rev 104206)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderBox.h 2012-01-05 21:37:08 UTC (rev 104207)
@@ -322,7 +322,7 @@
return document()->inQuirksMode() && style()->logicalHeight().isAuto() && !isFloatingOrPositioned() && (isRoot() || isBody());
}
- virtual LayoutSize intrinsicSize() const { return LayoutSize(); }
+ virtual IntSize intrinsicSize() const { return IntSize(); }
LayoutUnit intrinsicLogicalWidth() const { return style()->isHorizontalWritingMode() ? intrinsicSize().width() : intrinsicSize().height(); }
LayoutUnit intrinsicLogicalHeight() const { return style()->isHorizontalWritingMode() ? intrinsicSize().height() : intrinsicSize().width(); }
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderFlowThread.cpp (104206 => 104207)
--- branches/subpixellayout/Source/WebCore/rendering/RenderFlowThread.cpp 2012-01-05 21:25:23 UTC (rev 104206)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderFlowThread.cpp 2012-01-05 21:37:08 UTC (rev 104207)
@@ -451,7 +451,7 @@
renderFlowThreadOffset = toLayoutPoint(paintOffset - regionRect.location());
context->translate(renderFlowThreadOffset.x(), renderFlowThreadOffset.y());
- info.rect.moveBy(-flooredIntPoint(renderFlowThreadOffset)); // FIXME: Make Emil more consistent.
+ info.rect.moveBy(-roundedIntPoint(renderFlowThreadOffset));
layer()->paint(context, info.rect, 0, 0, region, RenderLayer::PaintLayerTemporaryClipRects);
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderImage.cpp (104206 => 104207)
--- branches/subpixellayout/Source/WebCore/rendering/RenderImage.cpp 2012-01-05 21:25:23 UTC (rev 104206)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderImage.cpp 2012-01-05 21:37:08 UTC (rev 104207)
@@ -175,7 +175,7 @@
imageDimensionsChanged(imageSizeChanged, rect);
}
-bool RenderImage::updateIntrinsicSizeIfNeeded(const LayoutSize& newSize, bool imageSizeChanged)
+bool RenderImage::updateIntrinsicSizeIfNeeded(const IntSize& newSize, bool imageSizeChanged)
{
if (newSize == intrinsicSize() && !imageSizeChanged)
return false;
@@ -440,7 +440,7 @@
int RenderImage::minimumReplacedHeight() const
{
- return m_imageResource->errorOccurred() ? intrinsicSize().height() : LayoutUnit(0);
+ return m_imageResource->errorOccurred() ? intrinsicSize().height() : 0;
}
HTMLMapElement* RenderImage::imageMap() const
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderImage.h (104206 => 104207)
--- branches/subpixellayout/Source/WebCore/rendering/RenderImage.h 2012-01-05 21:25:23 UTC (rev 104206)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderImage.h 2012-01-05 21:37:08 UTC (rev 104207)
@@ -94,7 +94,7 @@
IntSize imageSizeForError(CachedImage*) const;
void imageDimensionsChanged(bool imageSizeChanged, const IntRect* = 0);
- bool updateIntrinsicSizeIfNeeded(const LayoutSize&, bool imageSizeChanged);
+ bool updateIntrinsicSizeIfNeeded(const IntSize&, bool imageSizeChanged);
void paintAreaElementFocusRing(PaintInfo&);
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderRegion.cpp (104206 => 104207)
--- branches/subpixellayout/Source/WebCore/rendering/RenderRegion.cpp 2012-01-05 21:25:23 UTC (rev 104206)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderRegion.cpp 2012-01-05 21:37:08 UTC (rev 104207)
@@ -42,7 +42,7 @@
namespace WebCore {
RenderRegion::RenderRegion(Node* node, RenderFlowThread* flowThread)
- : RenderReplaced(node, LayoutSize())
+ : RenderReplaced(node, IntSize())
, m_flowThread(flowThread)
, m_parentFlowThread(0)
, m_isValid(false)
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderReplaced.cpp (104206 => 104207)
--- branches/subpixellayout/Source/WebCore/rendering/RenderReplaced.cpp 2012-01-05 21:25:23 UTC (rev 104206)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderReplaced.cpp 2012-01-05 21:37:08 UTC (rev 104207)
@@ -46,7 +46,7 @@
setReplaced(true);
}
-RenderReplaced::RenderReplaced(Node* node, const LayoutSize& intrinsicSize)
+RenderReplaced::RenderReplaced(Node* node, const IntSize& intrinsicSize)
: RenderBox(node)
, m_intrinsicSize(intrinsicSize)
, m_hasIntrinsicSize(true)
@@ -499,12 +499,12 @@
return false;
}
-LayoutSize RenderReplaced::intrinsicSize() const
+IntSize RenderReplaced::intrinsicSize() const
{
return m_intrinsicSize;
}
-void RenderReplaced::setIntrinsicSize(const LayoutSize& size)
+void RenderReplaced::setIntrinsicSize(const IntSize& size)
{
ASSERT(m_hasIntrinsicSize);
m_intrinsicSize = size;
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderReplaced.h (104206 => 104207)
--- branches/subpixellayout/Source/WebCore/rendering/RenderReplaced.h 2012-01-05 21:25:23 UTC (rev 104206)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderReplaced.h 2012-01-05 21:37:08 UTC (rev 104207)
@@ -29,7 +29,7 @@
class RenderReplaced : public RenderBox {
public:
RenderReplaced(Node*);
- RenderReplaced(Node*, const LayoutSize& intrinsicSize);
+ RenderReplaced(Node*, const IntSize& intrinsicSize);
virtual ~RenderReplaced();
virtual LayoutUnit computeReplacedLogicalWidth(bool includeMaxWidth = true) const;
@@ -42,7 +42,7 @@
virtual void layout();
- virtual LayoutSize intrinsicSize() const;
+ virtual IntSize intrinsicSize() const;
virtual int minimumReplacedHeight() const { return 0; }
@@ -52,7 +52,7 @@
virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
- void setIntrinsicSize(const LayoutSize&);
+ void setIntrinsicSize(const IntSize&);
virtual void intrinsicSizeChanged();
void setHasIntrinsicSize() { m_hasIntrinsicSize = true; }
@@ -84,7 +84,7 @@
virtual LayoutRect selectionRectForRepaint(RenderBoxModelObject* repaintContainer, bool clipToVisibleContent = true);
- LayoutSize m_intrinsicSize;
+ IntSize m_intrinsicSize;
bool m_hasIntrinsicSize;
};
Modified: branches/subpixellayout/Source/WebCore/rendering/RenderVideo.cpp (104206 => 104207)
--- branches/subpixellayout/Source/WebCore/rendering/RenderVideo.cpp 2012-01-05 21:25:23 UTC (rev 104206)
+++ branches/subpixellayout/Source/WebCore/rendering/RenderVideo.cpp 2012-01-05 21:37:08 UTC (rev 104207)
@@ -91,7 +91,7 @@
if (size.isEmpty() && node()->ownerDocument() && node()->ownerDocument()->isMediaDocument())
return;
- if (size == roundedIntSize(intrinsicSize()) /* FIXME: Make emil be more consistent */)
+ if (size == intrinsicSize())
return;
setIntrinsicSize(size);
@@ -146,7 +146,7 @@
// even if we know the video intrinsic size but aren't able to draw video frames yet
// (we don't want to scale the poster to the video size without keeping aspect ratio).
if (videoElement()->shouldDisplayPosterImage())
- m_cachedImageSize = roundedIntSize(intrinsicSize());
+ m_cachedImageSize = intrinsicSize();
// The intrinsic size is now that of the image, but in case we already had the
// intrinsic size of the video we call this here to restore the video size.
@@ -162,7 +162,7 @@
if (videoElement()->shouldDisplayPosterImage())
elementSize = m_cachedImageSize;
else
- elementSize = roundedIntSize(intrinsicSize());
+ elementSize = intrinsicSize();
IntRect contentRect = enclosingIntRect(contentBoxRect());
if (elementSize.isEmpty() || contentRect.isEmpty())
Modified: branches/subpixellayout/Source/WebKit/chromium/src/ChromeClientImpl.cpp (104206 => 104207)
--- branches/subpixellayout/Source/WebKit/chromium/src/ChromeClientImpl.cpp 2012-01-05 21:25:23 UTC (rev 104206)
+++ branches/subpixellayout/Source/WebKit/chromium/src/ChromeClientImpl.cpp 2012-01-05 21:37:08 UTC (rev 104207)
@@ -603,7 +603,7 @@
Widget* widget = toRenderWidget(object)->widget();
if (widget && widget->isPluginContainer()) {
WebPluginContainerImpl* plugin = static_cast<WebPluginContainerImpl*>(widget);
- url = "" // FIXME
+ url = ""
}
}
}
