Title: [100586] trunk/Source/WebCore
- Revision
- 100586
- Author
- [email protected]
- Date
- 2011-11-17 02:08:40 -0800 (Thu, 17 Nov 2011)
Log Message
2011-11-17 Nikolas Zimmermann <[email protected]>
Not reviewed. Fix 32bit builds.
* platform/ClockGeneric.cpp:
(ClockGeneric::now): Use narrowPrecisionToFloat.
* rendering/FilterEffectRenderer.cpp:
(WebCore::FilterEffectRenderer::build): Use it correctly.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (100585 => 100586)
--- trunk/Source/WebCore/ChangeLog 2011-11-17 10:04:48 UTC (rev 100585)
+++ trunk/Source/WebCore/ChangeLog 2011-11-17 10:08:40 UTC (rev 100586)
@@ -1,3 +1,12 @@
+2011-11-17 Nikolas Zimmermann <[email protected]>
+
+ Not reviewed. Fix 32bit builds.
+
+ * platform/ClockGeneric.cpp:
+ (ClockGeneric::now): Use narrowPrecisionToFloat.
+ * rendering/FilterEffectRenderer.cpp:
+ (WebCore::FilterEffectRenderer::build): Use it correctly.
+
2011-11-17 Dominic Mazzoni <[email protected]>
Accessibility: Chromium requires an AX notification when an iframe loads.
Modified: trunk/Source/WebCore/platform/ClockGeneric.cpp (100585 => 100586)
--- trunk/Source/WebCore/platform/ClockGeneric.cpp 2011-11-17 10:04:48 UTC (rev 100585)
+++ trunk/Source/WebCore/platform/ClockGeneric.cpp 2011-11-17 10:08:40 UTC (rev 100586)
@@ -81,6 +81,6 @@
float ClockGeneric::now() const
{
- return WTF::currentTime();
+ return narrowPrecisionToFloat(WTF::currentTime());
}
Modified: trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp (100585 => 100586)
--- trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp 2011-11-17 10:04:48 UTC (rev 100585)
+++ trunk/Source/WebCore/rendering/FilterEffectRenderer.cpp 2011-11-17 10:08:40 UTC (rev 100586)
@@ -86,24 +86,24 @@
case FilterOperation::GRAYSCALE: {
BasicColorMatrixFilterOperation* colorMatrixOperation = static_cast<BasicColorMatrixFilterOperation*>(filterOperation);
Vector<float> inputParameters;
- float _oneMinusAmount_ = clampTo(1 - narrowPrecisionToFloat(colorMatrixOperation->amount()), 0.0, 1.0);
+ double _oneMinusAmount_ = clampTo(1 - colorMatrixOperation->amount(), 0.0, 1.0);
// See https://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/index.html#grayscaleEquivalent
// for information on parameters.
- inputParameters.append(0.2126 + 0.7874 * oneMinusAmount);
- inputParameters.append(0.7152 - 0.7152 * oneMinusAmount);
- inputParameters.append(0.0722 - 0.0722 * oneMinusAmount);
+ inputParameters.append(narrowPrecisionToFloat(0.2126 + 0.7874 * oneMinusAmount));
+ inputParameters.append(narrowPrecisionToFloat(0.7152 - 0.7152 * oneMinusAmount));
+ inputParameters.append(narrowPrecisionToFloat(0.0722 - 0.0722 * oneMinusAmount));
endMatrixRow(inputParameters);
- inputParameters.append(0.2126 - 0.2126 * oneMinusAmount);
- inputParameters.append(0.7152 + 0.2848 * oneMinusAmount);
- inputParameters.append(0.0722 - 0.0722 * oneMinusAmount);
+ inputParameters.append(narrowPrecisionToFloat(0.2126 - 0.2126 * oneMinusAmount));
+ inputParameters.append(narrowPrecisionToFloat(0.7152 + 0.2848 * oneMinusAmount));
+ inputParameters.append(narrowPrecisionToFloat(0.0722 - 0.0722 * oneMinusAmount));
endMatrixRow(inputParameters);
- inputParameters.append(0.2126 - 0.2126 * oneMinusAmount);
- inputParameters.append(0.7152 - 0.7152 * oneMinusAmount);
- inputParameters.append(0.0722 + 0.9278 * oneMinusAmount);
+ inputParameters.append(narrowPrecisionToFloat(0.2126 - 0.2126 * oneMinusAmount));
+ inputParameters.append(narrowPrecisionToFloat(0.7152 - 0.7152 * oneMinusAmount));
+ inputParameters.append(narrowPrecisionToFloat(0.0722 + 0.9278 * oneMinusAmount));
endMatrixRow(inputParameters);
lastMatrixRow(inputParameters);
@@ -114,24 +114,24 @@
case FilterOperation::SEPIA: {
BasicColorMatrixFilterOperation* colorMatrixOperation = static_cast<BasicColorMatrixFilterOperation*>(filterOperation);
Vector<float> inputParameters;
- float _oneMinusAmount_ = clampTo(1 - narrowPrecisionToFloat(colorMatrixOperation->amount()), 0.0, 1.0);
+ double _oneMinusAmount_ = clampTo(1 - colorMatrixOperation->amount(), 0.0, 1.0);
// See https://dvcs.w3.org/hg/FXTF/raw-file/tip/filters/index.html#sepiaEquivalent
// for information on parameters.
- inputParameters.append(0.393 + 0.607 * oneMinusAmount);
- inputParameters.append(0.769 - 0.769 * oneMinusAmount);
- inputParameters.append(0.189 - 0.189 * oneMinusAmount);
+ inputParameters.append(narrowPrecisionToFloat(0.393 + 0.607 * oneMinusAmount));
+ inputParameters.append(narrowPrecisionToFloat(0.769 - 0.769 * oneMinusAmount));
+ inputParameters.append(narrowPrecisionToFloat(0.189 - 0.189 * oneMinusAmount));
endMatrixRow(inputParameters);
- inputParameters.append(0.349 - 0.349 * oneMinusAmount);
- inputParameters.append(0.686 + 0.314 * oneMinusAmount);
- inputParameters.append(0.168 - 0.168 * oneMinusAmount);
+ inputParameters.append(narrowPrecisionToFloat(0.349 - 0.349 * oneMinusAmount));
+ inputParameters.append(narrowPrecisionToFloat(0.686 + 0.314 * oneMinusAmount));
+ inputParameters.append(narrowPrecisionToFloat(0.168 - 0.168 * oneMinusAmount));
endMatrixRow(inputParameters);
- inputParameters.append(0.272 - 0.272 * oneMinusAmount);
- inputParameters.append(0.534 - 0.534 * oneMinusAmount);
- inputParameters.append(0.131 + 0.869 * oneMinusAmount);
+ inputParameters.append(narrowPrecisionToFloat(0.272 - 0.272 * oneMinusAmount));
+ inputParameters.append(narrowPrecisionToFloat(0.534 - 0.534 * oneMinusAmount));
+ inputParameters.append(narrowPrecisionToFloat(0.131 + 0.869 * oneMinusAmount));
endMatrixRow(inputParameters);
lastMatrixRow(inputParameters);
@@ -159,7 +159,7 @@
transferFunction.type = FECOMPONENTTRANSFER_TYPE_TABLE;
Vector<float> transferParameters;
transferParameters.append(narrowPrecisionToFloat(componentTransferOperation->amount()));
- transferParameters.append(1.0 - narrowPrecisionToFloat(componentTransferOperation->amount()));
+ transferParameters.append(narrowPrecisionToFloat(1 - componentTransferOperation->amount()));
transferFunction.tableValues = transferParameters;
ComponentTransferFunction nullFunction;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
