Changeset 277193 in webkit

Timestamp:

May 7, 2021, 11:48:46 AM (5 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r276739. rdar://problem/77581103

Don't create custom scrollbars for fullscreen placeholders.
​https://bugs.webkit.org/show_bug.cgi?id=225141
Source/WebCore:

<rdar://64800098>

Reviewed by Darin Adler.

We can end up calling RenderScrollbar::createCustomScrollbar with
element = nullptr from RenderLayer::createScrollbar,
when the renderer is a RenderFullscreenPlaceholder.

We don't need to bother with scrollbars for the placeholder, so check to
make sure we have a valid element before creating custom scollbars.

Test: fullscreen/full-screen-crash-custom-scrollbars.html

• rendering/RenderLayer.cpp: (WebCore::RenderLayer::createScrollbar):

LayoutTests:

Reviewed by Darin Adler.

• fullscreen/full-screen-crash-custom-scrollbars-expected.txt: Added.
• fullscreen/full-screen-crash-custom-scrollbars.html: Added.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@276739 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-611-branch

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fullscreen/full-screen-crash-custom-scrollbars-expected.txt (added)
• LayoutTests/fullscreen/full-screen-crash-custom-scrollbars.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (1 diff)

branches/safari-611-branch/LayoutTests/ChangeLog

@@ +1 @@
+2021-05-07  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r276739. rdar://problem/77581103
+
+    Don't create custom scrollbars for fullscreen placeholders.
+    https://bugs.webkit.org/show_bug.cgi?id=225141
+    Source/WebCore:
+    
+    <rdar://64800098>
+    
+    Reviewed by Darin Adler.
+    
+    We can end up calling RenderScrollbar::createCustomScrollbar with
+    `element = nullptr` from RenderLayer::createScrollbar,
+    when the renderer is a RenderFullscreenPlaceholder.
+    
+    We don't need to bother with scrollbars for the placeholder, so check to
+    make sure we have a valid element before creating custom scollbars.
+    
+    Test: fullscreen/full-screen-crash-custom-scrollbars.html
+    
+    * rendering/RenderLayer.cpp:
+    (WebCore::RenderLayer::createScrollbar):
+    
+    LayoutTests:
+    
+    Reviewed by Darin Adler.
+    
+    * fullscreen/full-screen-crash-custom-scrollbars-expected.txt: Added.
+    * fullscreen/full-screen-crash-custom-scrollbars.html: Added.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276739 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-04-28  Cameron McCormack  <heycam@apple.com>
+
+            Don't create custom scrollbars for fullscreen placeholders.
+            https://bugs.webkit.org/show_bug.cgi?id=225141
+
+            Reviewed by Darin Adler.
+
+            * fullscreen/full-screen-crash-custom-scrollbars-expected.txt: Added.
+            * fullscreen/full-screen-crash-custom-scrollbars.html: Added.
+
 2021-05-07  Russell Epstein  <repstein@apple.com>
 

branches/safari-611-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2021-05-07  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r276739. rdar://problem/77581103
+
+    Don't create custom scrollbars for fullscreen placeholders.
+    https://bugs.webkit.org/show_bug.cgi?id=225141
+    Source/WebCore:
+    
+    <rdar://64800098>
+    
+    Reviewed by Darin Adler.
+    
+    We can end up calling RenderScrollbar::createCustomScrollbar with
+    `element = nullptr` from RenderLayer::createScrollbar,
+    when the renderer is a RenderFullscreenPlaceholder.
+    
+    We don't need to bother with scrollbars for the placeholder, so check to
+    make sure we have a valid element before creating custom scollbars.
+    
+    Test: fullscreen/full-screen-crash-custom-scrollbars.html
+    
+    * rendering/RenderLayer.cpp:
+    (WebCore::RenderLayer::createScrollbar):
+    
+    LayoutTests:
+    
+    Reviewed by Darin Adler.
+    
+    * fullscreen/full-screen-crash-custom-scrollbars-expected.txt: Added.
+    * fullscreen/full-screen-crash-custom-scrollbars.html: Added.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276739 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-04-28  Cameron McCormack  <heycam@apple.com>
+
+            Don't create custom scrollbars for fullscreen placeholders.
+            https://bugs.webkit.org/show_bug.cgi?id=225141
+            <rdar://64800098>
+
+            Reviewed by Darin Adler.
+
+            We can end up calling RenderScrollbar::createCustomScrollbar with
+            `element = nullptr` from RenderLayerScrollableArea::createScrollbar,
+            when the renderer is a RenderFullscreenPlaceholder.
+
+            We don't need to bother with scrollbars for the placeholder, so check to
+            make sure we have a valid element before creating custom scollbars.
+
+            Test: fullscreen/full-screen-crash-custom-scrollbars.html
+
+            * rendering/RenderLayerScrollableArea.cpp:
+            (WebCore::RenderLayerScrollableArea::createScrollbar):
+
 2021-05-07  Russell Epstein  <repstein@apple.com>
 

branches/safari-611-branch/Source/WebCore/rendering/RenderLayer.cpp

@@ -3510 +3510 @@
     auto& actualRenderer = *rendererForScrollbar(renderer());
     bool hasCustomScrollbarStyle = is<RenderBox>(actualRenderer) && downcast<RenderBox>(actualRenderer).style().hasPseudoStyle(PseudoId::Scrollbar);
-    if (hasCustomScrollbarStyle)
-        widget = RenderScrollbar::createCustomScrollbar(*this, orientation, downcast<RenderBox>(actualRenderer).element());
+    auto element = downcast<RenderBox>(actualRenderer).element();
+    if (hasCustomScrollbarStyle && element)
+        widget = RenderScrollbar::createCustomScrollbar(*this, orientation, element);
     else {
         widget = Scrollbar::createNativeScrollbar(*this, orientation, ScrollbarControlSize::Regular);