Title: [112255] trunk/Source/WebCore
- Revision
- 112255
- Author
- [email protected]
- Date
- 2012-03-27 05:13:17 -0700 (Tue, 27 Mar 2012)
Log Message
Revert RenderApplet::intrinsicSize to integers
https://bugs.webkit.org/show_bug.cgi?id=82206
Reviewed by Eric Seidel.
Intrinsic sizes originate either outside of WebCore, or from their initial values,
which are always integers. Reverting RenderApplet::intrinsicSize to integers, the
last spot improperly using LayoutUnits
No new tests. No change in behavior.
* rendering/RenderApplet.cpp:
(WebCore::RenderApplet::intrinsicSize):
* rendering/RenderApplet.h:
(RenderApplet):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (112254 => 112255)
--- trunk/Source/WebCore/ChangeLog 2012-03-27 12:00:52 UTC (rev 112254)
+++ trunk/Source/WebCore/ChangeLog 2012-03-27 12:13:17 UTC (rev 112255)
@@ -1,3 +1,22 @@
+2012-03-27 Levi Weintraub <[email protected]>
+
+ Revert RenderApplet::intrinsicSize to integers
+ https://bugs.webkit.org/show_bug.cgi?id=82206
+
+ Reviewed by Eric Seidel.
+
+ Intrinsic sizes originate either outside of WebCore, or from their initial values,
+ which are always integers. Reverting RenderApplet::intrinsicSize to integers, the
+ last spot improperly using LayoutUnits
+
+ No new tests. No change in behavior.
+
+ * rendering/RenderApplet.cpp:
+ (WebCore::RenderApplet::intrinsicSize):
+ * rendering/RenderApplet.h:
+ (RenderApplet):
+
+
2012-03-27 Alexis Menard <[email protected]>
Increase code sharing between CSSComputedStyleDeclaration and CSSPropertyLonghand.
Modified: trunk/Source/WebCore/rendering/RenderApplet.cpp (112254 => 112255)
--- trunk/Source/WebCore/rendering/RenderApplet.cpp 2012-03-27 12:00:52 UTC (rev 112254)
+++ trunk/Source/WebCore/rendering/RenderApplet.cpp 2012-03-27 12:13:17 UTC (rev 112255)
@@ -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: trunk/Source/WebCore/rendering/RenderApplet.h (112254 => 112255)
--- trunk/Source/WebCore/rendering/RenderApplet.h 2012-03-27 12:00:52 UTC (rev 112254)
+++ trunk/Source/WebCore/rendering/RenderApplet.h 2012-03-27 12:13:17 UTC (rev 112255)
@@ -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;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
