Modified: trunk/Source/WebCore/ChangeLog (182954 => 182955)
--- trunk/Source/WebCore/ChangeLog 2015-04-17 17:07:18 UTC (rev 182954)
+++ trunk/Source/WebCore/ChangeLog 2015-04-17 17:30:43 UTC (rev 182955)
@@ -1,3 +1,17 @@
+2015-04-17 Said Abou-Hallawa <sabouhall...@apple.com>
+
+ Fix review comments for https://bugs.webkit.org/show_bug.cgi?id=143590
+ following http://trac.webkit.org/changeset/182876.
+
+ Reviewed by Daniel Bates.
+
+ * ChangeLog:
+ Fixed typo.
+
+ * style/StyleFontSizeFunctions.cpp:
+ (WebCore::Style::computedFontSizeFromSpecifiedSize):
+ Fixed a typo in an enum definition and changed the name of an argument.
+
2015-04-17 Philippe Normand <pnorm...@igalia.com>
[GStreamer] Silent WebAudio buffers support
@@ -489,7 +503,7 @@
When enabling the minimum font size perf, the computed font size is set
to the minimum font size if the computed value is smaller than the minimum.
The bug happens because the SVG text element applies its scaling on the
- computed value after applying the minimum fort size rule. This means the
+ computed value after applying the minimum font size rule. This means the
final computed value for the font size will be the scaling of the minimum
font size and not minimum font size itself. What we need is to postpone
applying the minimum font size rules, till the SVG scaling is applied.
Modified: trunk/Source/WebCore/style/StyleFontSizeFunctions.cpp (182954 => 182955)
--- trunk/Source/WebCore/style/StyleFontSizeFunctions.cpp 2015-04-17 17:07:18 UTC (rev 182954)
+++ trunk/Source/WebCore/style/StyleFontSizeFunctions.cpp 2015-04-17 17:30:43 UTC (rev 182955)
@@ -40,12 +40,12 @@
namespace Style {
enum MinimumFontSizeRule {
- DonNotApplyMinimumFontSize,
+ DoNotApplyMinimumFontSize,
DoNotUseSmartMinimumForFontSize,
UseSmartMinimumForFontFize
};
-static float computedFontSizeFromSpecifiedSize(float specifiedSize, bool isAbsoluteSize, float zoomFactor, MinimumFontSizeRule minimumForFontSizeRule, const Settings* settings)
+static float computedFontSizeFromSpecifiedSize(float specifiedSize, bool isAbsoluteSize, float zoomFactor, MinimumFontSizeRule minimumSizeRule, const Settings* settings)
{
// Text with a 0px font size should not be visible and therefore needs to be
// exempt from minimum font size rules. Acid3 relies on this for pixel-perfect
@@ -67,7 +67,7 @@
if (!settings)
return 1.0f;
- if (minimumForFontSizeRule == DonNotApplyMinimumFontSize)
+ if (minimumSizeRule == DoNotApplyMinimumFontSize)
return specifiedSize;
int minSize = settings->minimumFontSize();
@@ -82,7 +82,7 @@
// after zooming. The font size must either be relative to the user default or the original size
// must have been acceptable. In other words, we only apply the smart minimum whenever we're positive
// doing so won't disrupt the layout.
- if (minimumForFontSizeRule == UseSmartMinimumForFontFize && zoomedSize < minLogicalSize && (specifiedSize >= minLogicalSize || !isAbsoluteSize))
+ if (minimumSizeRule == UseSmartMinimumForFontFize && zoomedSize < minLogicalSize && (specifiedSize >= minLogicalSize || !isAbsoluteSize))
zoomedSize = minLogicalSize;
// Also clamp to a reasonable maximum to prevent insane font sizes from causing crashes on various
@@ -98,7 +98,7 @@
if (Frame* frame = document.frame())
zoomFactor *= frame->textZoomFactor();
}
- return computedFontSizeFromSpecifiedSize(specifiedSize, isAbsoluteSize, zoomFactor, useSVGZoomRules ? DonNotApplyMinimumFontSize : UseSmartMinimumForFontFize, document.settings());
+ return computedFontSizeFromSpecifiedSize(specifiedSize, isAbsoluteSize, zoomFactor, useSVGZoomRules ? DoNotApplyMinimumFontSize : UseSmartMinimumForFontFize, document.settings());
}
float computedFontSizeFromSpecifiedSizeForSVGInlineText(float specifiedSize, bool isAbsoluteSize, float zoomFactor, const Document& document)
