Title: [200843] releases/WebKitGTK/webkit-2.12/Source/WebCore
- Revision
- 200843
- Author
- [email protected]
- Date
- 2016-05-13 04:49:56 -0700 (Fri, 13 May 2016)
Log Message
Merge r200184 - REGRESSION(r199659): Web Process crash when RenderTheme::adjustMenuListStyle is called with a null element
https://bugs.webkit.org/show_bug.cgi?id=157127
Reviewed by Sergio Villar Senin.
This happens for example with tests fast/css/appearance-with-pseudo-elements-in-quirks-mode.html and
fast/css/appearance-with-pseudo-elements.html.
* rendering/RenderThemeGtk.cpp:
(WebCore::RenderThemeGtk::adjustMenuListStyle): Do not change the style color if the given element is nullptr.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (200842 => 200843)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-05-13 11:45:55 UTC (rev 200842)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-05-13 11:49:56 UTC (rev 200843)
@@ -1,3 +1,16 @@
+2016-04-28 Carlos Garcia Campos <[email protected]>
+
+ REGRESSION(r199659): Web Process crash when RenderTheme::adjustMenuListStyle is called with a null element
+ https://bugs.webkit.org/show_bug.cgi?id=157127
+
+ Reviewed by Sergio Villar Senin.
+
+ This happens for example with tests fast/css/appearance-with-pseudo-elements-in-quirks-mode.html and
+ fast/css/appearance-with-pseudo-elements.html.
+
+ * rendering/RenderThemeGtk.cpp:
+ (WebCore::RenderThemeGtk::adjustMenuListStyle): Do not change the style color if the given element is nullptr.
+
2016-04-27 Hunseop Jeong <[email protected]>
[EFL][GTK] Volume slider only changes volume when thumb is released, not while dragging
Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderThemeGtk.cpp (200842 => 200843)
--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderThemeGtk.cpp 2016-05-13 11:45:55 UTC (rev 200842)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderThemeGtk.cpp 2016-05-13 11:49:56 UTC (rev 200843)
@@ -803,7 +803,8 @@
// We cannot give a proper rendering when border radius is active, unfortunately.
style.resetBorderRadius();
- style.setColor(menuListColor(element));
+ if (element)
+ style.setColor(menuListColor(element));
}
void RenderThemeGtk::adjustMenuListButtonStyle(StyleResolver& styleResolver, RenderStyle& style, Element* e) const
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
