Title: [199407] releases/WebKitGTK/webkit-2.12/Source/WebCore
- Revision
- 199407
- Author
- [email protected]
- Date
- 2016-04-12 23:35:49 -0700 (Tue, 12 Apr 2016)
Log Message
Merge r198305 - Fix assertion failure on drive.google.com after r196052
https://bugs.webkit.org/show_bug.cgi?id=155562
Reviewed by Jer Noble.
* rendering/RenderGeometryMap.cpp:
(WebCore::RenderGeometryMap::mapToContainer):
Change float equality check to areEssentiallyEqual.
This assertion was failing because rendererMappedResult was (944.335693, 232.047409)
but result was (944.335693, 232.047394). They differ by (0, 0.000015).
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (199406 => 199407)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-13 06:34:46 UTC (rev 199406)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-13 06:35:49 UTC (rev 199407)
@@ -1,3 +1,16 @@
+2016-03-16 Alex Christensen <[email protected]>
+
+ Fix assertion failure on drive.google.com after r196052
+ https://bugs.webkit.org/show_bug.cgi?id=155562
+
+ Reviewed by Jer Noble.
+
+ * rendering/RenderGeometryMap.cpp:
+ (WebCore::RenderGeometryMap::mapToContainer):
+ Change float equality check to areEssentiallyEqual.
+ This assertion was failing because rendererMappedResult was (944.335693, 232.047409)
+ but result was (944.335693, 232.047394). They differ by (0, 0.000015).
+
2016-03-16 Jiewen Tan <[email protected]>
URL Parsing should signal failure for illegal IDN
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderGeometryMap.cpp (199406 => 199407)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderGeometryMap.cpp 2016-04-13 06:34:46 UTC (rev 199406)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderGeometryMap.cpp 2016-04-13 06:35:49 UTC (rev 199407)
@@ -116,7 +116,7 @@
TransformState transformState(TransformState::ApplyTransformDirection, p);
mapToContainer(transformState, container);
result = transformState.lastPlanarPoint();
- ASSERT(rendererMappedResult == result);
+ ASSERT(areEssentiallyEqual(rendererMappedResult, result));
}
return result;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
