Title: [191991] trunk
- Revision
- 191991
- Author
- jiewen_...@apple.com
- Date
- 2015-11-03 16:05:21 -0800 (Tue, 03 Nov 2015)
Log Message
Null dereference loading Blink layout test scrollbars/custom-scrollbar-appearance-property.html
https://bugs.webkit.org/show_bug.cgi?id=149312
<rdar://problem/22748910>
Reviewed by Darin Adler.
Source/WebCore:
This is a merge from Blink r167503:
https://codereview.chromium.org/173433002
Test: scrollbars/custom-scrollbar-appearance-property.html
* rendering/RenderThemeMac.mm:
(WebCore::RenderThemeMac::paintSearchFieldCancelButton):
(WebCore::RenderThemeMac::paintSearchFieldResultsDecorationPart):
LayoutTests:
* scrollbars/custom-scrollbar-appearance-property-expected.txt: Added.
* scrollbars/custom-scrollbar-appearance-property.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (191990 => 191991)
--- trunk/LayoutTests/ChangeLog 2015-11-03 23:52:08 UTC (rev 191990)
+++ trunk/LayoutTests/ChangeLog 2015-11-04 00:05:21 UTC (rev 191991)
@@ -1,3 +1,14 @@
+2015-11-03 Jiewen Tan <jiewen_...@apple.com>
+
+ Null dereference loading Blink layout test scrollbars/custom-scrollbar-appearance-property.html
+ https://bugs.webkit.org/show_bug.cgi?id=149312
+ <rdar://problem/22748910>
+
+ Reviewed by Darin Adler.
+
+ * scrollbars/custom-scrollbar-appearance-property-expected.txt: Added.
+ * scrollbars/custom-scrollbar-appearance-property.html: Added.
+
2015-11-03 Ryan Haddad <ryanhad...@apple.com>
Correcting win test expectation for flaky test fast/text/multiple-feature-properties.html
Added: trunk/LayoutTests/scrollbars/custom-scrollbar-appearance-property-expected.txt (0 => 191991)
--- trunk/LayoutTests/scrollbars/custom-scrollbar-appearance-property-expected.txt (rev 0)
+++ trunk/LayoutTests/scrollbars/custom-scrollbar-appearance-property-expected.txt 2015-11-04 00:05:21 UTC (rev 191991)
@@ -0,0 +1,2 @@
+PASS, WebKit didn't crash.
+
Added: trunk/LayoutTests/scrollbars/custom-scrollbar-appearance-property.html (0 => 191991)
--- trunk/LayoutTests/scrollbars/custom-scrollbar-appearance-property.html (rev 0)
+++ trunk/LayoutTests/scrollbars/custom-scrollbar-appearance-property.html 2015-11-04 00:05:21 UTC (rev 191991)
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+::-webkit-scrollbar {
+ width: 16px;
+ height: 16px;
+ -webkit-appearance: searchfield-results-decoration;
+}
+
+::-webkit-scrollbar-track {
+ background-color: #E3E3E3;
+ -webkit-appearance: searchfield-cancel-button;
+}
+
+::-webkit-scrollbar-thumb {
+ background: black;
+}
+
+.scroll-container {
+ overflow: scroll;
+ width: 50px;
+ height: 50px;
+}
+
+.overflowing {
+ width: 200px;
+ height: 200px;
+}
+</style>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+PASS, WebKit didn't crash.
+<div class="scroll-container"><div class="overflowing"></div></div>
+</body>
+</html>
Modified: trunk/Source/WebCore/ChangeLog (191990 => 191991)
--- trunk/Source/WebCore/ChangeLog 2015-11-03 23:52:08 UTC (rev 191990)
+++ trunk/Source/WebCore/ChangeLog 2015-11-04 00:05:21 UTC (rev 191991)
@@ -1,3 +1,20 @@
+2015-11-03 Jiewen Tan <jiewen_...@apple.com>
+
+ Null dereference loading Blink layout test scrollbars/custom-scrollbar-appearance-property.html
+ https://bugs.webkit.org/show_bug.cgi?id=149312
+ <rdar://problem/22748910>
+
+ Reviewed by Darin Adler.
+
+ This is a merge from Blink r167503:
+ https://codereview.chromium.org/173433002
+
+ Test: scrollbars/custom-scrollbar-appearance-property.html
+
+ * rendering/RenderThemeMac.mm:
+ (WebCore::RenderThemeMac::paintSearchFieldCancelButton):
+ (WebCore::RenderThemeMac::paintSearchFieldResultsDecorationPart):
+
2015-11-03 Andreas Kling <akl...@apple.com>
ResourceUsageOverlay should show GC-owned malloc memory.
Modified: trunk/Source/WebCore/rendering/RenderThemeMac.mm (191990 => 191991)
--- trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-11-03 23:52:08 UTC (rev 191990)
+++ trunk/Source/WebCore/rendering/RenderThemeMac.mm 2015-11-04 00:05:21 UTC (rev 191991)
@@ -1689,6 +1689,8 @@
bool RenderThemeMac::paintSearchFieldCancelButton(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
{
+ if (!o.node())
+ return false;
Element* input = o.node()->shadowHost();
if (!input)
input = downcast<Element>(o.node());
@@ -1771,6 +1773,8 @@
bool RenderThemeMac::paintSearchFieldResultsDecorationPart(const RenderObject& o, const PaintInfo& paintInfo, const IntRect& r)
{
+ if (!o.node())
+ return false;
Node* input = o.node()->shadowHost();
if (!input)
input = o.node();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
