Null dereference loading Blink layout test scrollbars/custom-scrollba…

…r-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. Canonical link: https://commits.webkit.org/169076@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@191991 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Nov 4, 2015 · dcba02abbf271e8f9e85f45eb11ab4547476e63e · dcba02a
1 parent ea1cab1
commit dcba02abbf271e8f9e85f45eb11ab4547476e63e
Showing 5 changed files with 74 additions and 0 deletions.
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2015-11-03  Jiewen Tan  <jiewen_tan@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  <ryanhaddad@apple.com>
 
         Correcting win test expectation for flaky test fast/text/multiple-feature-properties.html

diff --git a/LayoutTests/scrollbars/custom-scrollbar-appearance-property-expected.txt b/LayoutTests/scrollbars/custom-scrollbar-appearance-property-expected.txt
@@ -0,0 +1,2 @@
+PASS, WebKit didn't crash.
+
diff --git a/LayoutTests/scrollbars/custom-scrollbar-appearance-property.html b/LayoutTests/scrollbars/custom-scrollbar-appearance-property.html
@@ -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>
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,20 @@
+2015-11-03  Jiewen Tan  <jiewen_tan@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  <akling@apple.com>
 
         ResourceUsageOverlay should show GC-owned malloc memory.

diff --git a/Source/WebCore/rendering/RenderThemeMac.mm b/Source/WebCore/rendering/RenderThemeMac.mm
@@ -1689,6 +1689,8 @@ static void TrackGradientInterpolate(void*, const CGFloat* inData, CGFloat* outD
 
 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 @@ static void TrackGradientInterpolate(void*, const CGFloat* inData, CGFloat* outD
 
 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();