Title: [96832] trunk/Source/WebCore
- Revision
- 96832
- Author
- [email protected]
- Date
- 2011-10-06 10:53:18 -0700 (Thu, 06 Oct 2011)
Log Message
InlineBox's virtualLogicalHeight() partially limited to builds with SVG.
https://bugs.webkit.org/show_bug.cgi?id=69538
Patch by Andreas Kling <[email protected]> on 2011-10-06
Reviewed by Dan Bernstein.
Remove erroneous ENABLE(SVG) guards around the initialization and use
of InlineBox::hasVirtualLogicalHeight.
This variable is used by TrailingFloatsRootInlineBox and should always
be respected regardless of SVG support.
* rendering/InlineBox.cpp:
(WebCore::InlineBox::logicalHeight):
* rendering/InlineBox.h:
(WebCore::InlineBox::InlineBox):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (96831 => 96832)
--- trunk/Source/WebCore/ChangeLog 2011-10-06 17:42:50 UTC (rev 96831)
+++ trunk/Source/WebCore/ChangeLog 2011-10-06 17:53:18 UTC (rev 96832)
@@ -1,3 +1,21 @@
+2011-10-06 Andreas Kling <[email protected]>
+
+ InlineBox's virtualLogicalHeight() partially limited to builds with SVG.
+ https://bugs.webkit.org/show_bug.cgi?id=69538
+
+ Reviewed by Dan Bernstein.
+
+ Remove erroneous ENABLE(SVG) guards around the initialization and use
+ of InlineBox::hasVirtualLogicalHeight.
+
+ This variable is used by TrailingFloatsRootInlineBox and should always
+ be respected regardless of SVG support.
+
+ * rendering/InlineBox.cpp:
+ (WebCore::InlineBox::logicalHeight):
+ * rendering/InlineBox.h:
+ (WebCore::InlineBox::InlineBox):
+
2011-10-06 Carlos Garcia Campos <[email protected]>
[GTK] Implement cache model for WebKit2
Modified: trunk/Source/WebCore/rendering/InlineBox.cpp (96831 => 96832)
--- trunk/Source/WebCore/rendering/InlineBox.cpp 2011-10-06 17:42:50 UTC (rev 96831)
+++ trunk/Source/WebCore/rendering/InlineBox.cpp 2011-10-06 17:53:18 UTC (rev 96832)
@@ -143,10 +143,8 @@
LayoutUnit InlineBox::logicalHeight() const
{
-#if ENABLE(SVG)
if (hasVirtualLogicalHeight())
return virtualLogicalHeight();
-#endif
if (renderer()->isText())
return m_isText ? renderer()->style(m_firstLine)->fontMetrics().height() : 0;
Modified: trunk/Source/WebCore/rendering/InlineBox.h (96831 => 96832)
--- trunk/Source/WebCore/rendering/InlineBox.h 2011-10-06 17:42:50 UTC (rev 96831)
+++ trunk/Source/WebCore/rendering/InlineBox.h 2011-10-06 17:53:18 UTC (rev 96832)
@@ -45,9 +45,7 @@
, m_bidiEmbeddingLevel(0)
, m_dirty(false)
, m_extracted(false)
-#if ENABLE(SVG)
, m_hasVirtualLogicalHeight(false)
-#endif
, m_isHorizontal(true)
, m_endsWithBreak(false)
, m_hasSelectedChildrenOrCanHaveLeadingExpansion(false)
@@ -77,9 +75,7 @@
, m_bidiEmbeddingLevel(0)
, m_dirty(dirty)
, m_extracted(extracted)
-#if ENABLE(SVG)
, m_hasVirtualLogicalHeight(false)
-#endif
, m_isHorizontal(isHorizontal)
, m_endsWithBreak(false)
, m_hasSelectedChildrenOrCanHaveLeadingExpansion(false)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
