Title: [153760] branches/safari-537-branch/Source/WebCore
- Revision
- 153760
- Author
- [email protected]
- Date
- 2013-08-06 12:33:09 -0700 (Tue, 06 Aug 2013)
Log Message
Merged r153758. <rdar://problem/14627254>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (153759 => 153760)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-08-06 18:53:06 UTC (rev 153759)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-08-06 19:33:09 UTC (rev 153760)
@@ -1,3 +1,18 @@
+2013-08-06 Lucas Forschler <[email protected]>
+
+ Merge r153758
+
+ 2013-08-06 Brent Fulgham <[email protected]>
+
+ Improper Calculation of In-band Cue Colors
+ https://bugs.webkit.org/show_bug.cgi?id=119523
+
+ Reviewed by Eric Carlson.
+
+ * platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp:
+ (WebCore::makeRGBA32FromARGBCFArray): Remove redundant multiplication by
+ 255. The internal conversion logic already converts to bytes.
+
2013-08-05 Lucas Forschler <[email protected]>
Merge r153725
Modified: branches/safari-537-branch/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp (153759 => 153760)
--- branches/safari-537-branch/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp 2013-08-06 18:53:06 UTC (rev 153759)
+++ branches/safari-537-branch/Source/WebCore/platform/graphics/avfoundation/InbandTextTrackPrivateAVF.cpp 2013-08-06 19:33:09 UTC (rev 153760)
@@ -126,7 +126,7 @@
componentArray[i] = component;
}
- color = makeRGBA32FromFloats(componentArray[1] * 255, componentArray[2] * 255, componentArray[3] * 255, componentArray[0] * 255);
+ color = makeRGBA32FromFloats(componentArray[1], componentArray[2], componentArray[3], componentArray[0]);
return true;
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
