Removed a redundant line of code.
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Apr 2011 16:48:50 +0000 (16:48 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 7 Apr 2011 16:48:50 +0000 (16:48 +0000)
Reviewed by Adam Roben.

* rendering/RenderInline.cpp:
(WebCore::RenderInline::updateAlwaysCreateLineBoxes): No need to compare line gap values, as
this is covered by the earlier hasIdenticalAscentDescentAndLineGap() check.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@83180 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/rendering/RenderInline.cpp

index ff88af5..0588133 100644 (file)
@@ -1,3 +1,13 @@
+2011-04-07  Dan Bernstein  <mitz@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Removed a redundant line of code.
+
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::updateAlwaysCreateLineBoxes): No need to compare line gap values, as
+        this is covered by the earlier hasIdenticalAscentDescentAndLineGap() check.
+
 2011-04-07  Liang Qi  <liang.qi@nokia.com>
 
         Reviewed by Laszlo Gombos.
index df78916..ae18514 100644 (file)
@@ -184,7 +184,6 @@ void RenderInline::updateAlwaysCreateLineBoxes()
         parentStyle = parent()->style(true);
         RenderStyle* childStyle = style(true);
         alwaysCreateLineBoxes = !parentStyle->font().fontMetrics().hasIdenticalAscentDescentAndLineGap(childStyle->font().fontMetrics())
-        || parentStyle->font().fontMetrics().lineGap() != childStyle->font().fontMetrics().lineGap()
         || childStyle->verticalAlign() != BASELINE
         || parentStyle->lineHeight() != childStyle->lineHeight();
     }