Title: [213796] releases/WebKitGTK/webkit-2.16/Source/WebCore
- Revision
- 213796
- Author
- [email protected]
- Date
- 2017-03-13 02:46:42 -0700 (Mon, 13 Mar 2017)
Log Message
Merge r213219 - [Cairo] Incorrectly determining height in GraphicsContext::roundToDevicePixels()
https://bugs.webkit.org/show_bug.cgi?id=169031
Reviewed by Carlos Garcia Campos.
We should compare if height is between -1 and 0 and not mixing height
and width together.
* platform/graphics/cairo/GraphicsContextCairo.cpp:
(WebCore::GraphicsContext::roundToDevicePixels):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (213795 => 213796)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-03-13 09:46:34 UTC (rev 213795)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-03-13 09:46:42 UTC (rev 213796)
@@ -1,5 +1,18 @@
2017-03-01 Tomas Popela <[email protected]>
+ [Cairo] Incorrectly determining height in GraphicsContext::roundToDevicePixels()
+ https://bugs.webkit.org/show_bug.cgi?id=169031
+
+ Reviewed by Carlos Garcia Campos.
+
+ We should compare if height is between -1 and 0 and not mixing height
+ and width together.
+
+ * platform/graphics/cairo/GraphicsContextCairo.cpp:
+ (WebCore::GraphicsContext::roundToDevicePixels):
+
+2017-03-01 Tomas Popela <[email protected]>
+
Unreviewed compiler warning fix after r213218
* platform/gtk/PlatformKeyboardEventGtk.cpp:
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp (213795 => 213796)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2017-03-13 09:46:34 UTC (rev 213795)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2017-03-13 09:46:42 UTC (rev 213796)
@@ -727,7 +727,7 @@
width = 1;
else
width = round(width);
- if (height > -1 && width < 0)
+ if (height > -1 && height < 0)
height = -1;
else if (height > 0 && height < 1)
height = 1;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
