DCHECK that paint properties are never null

third_party/WebKit/Source/core/paint/FramePainter.cpp

Index: third_party/WebKit/Source/core/paint/FramePainter.cpp
diff --git a/third_party/WebKit/Source/core/paint/FramePainter.cpp b/third_party/WebKit/Source/core/paint/FramePainter.cpp
index db2a9b975f08db308575a617b25e11539aaafe84..6fcc221b604d7627daad3a87fc16e5c0dcf569a8 100644
--- a/third_party/WebKit/Source/core/paint/FramePainter.cpp
+++ b/third_party/WebKit/Source/core/paint/FramePainter.cpp
@@ -94,11 +94,20 @@ void FramePainter::paint(GraphicsContext& context,
 
     Optional<ScopedPaintChunkProperties> scopedPaintChunkProperties;
     if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
-      if (TransformPaintPropertyNode* transform =
-              m_frameView->preTranslation()) {
+      if (const PropertyTreeState* contentsState =
+              m_frameView->totalPropertyTreeStateForContents()) {
+        // The scrollbar's property nodes are similar to the frame view's
+        // contents state but we want to exclude the content-specific
+        // properties. This prevents the scrollbars from scrolling, for example.
         PaintChunkProperties properties(
             context.getPaintController().currentPaintChunkProperties());
-        properties.transform = transform;
+        properties.transform = m_frameView->preTranslation();
+        properties.clip = m_frameView->contentClip()->parent();
+        properties.effect = contentsState->effect();
+        auto* scrollBarScroll = contentsState->scroll();
+        if (m_frameView->scroll())
+          scrollBarScroll = m_frameView->scroll()->parent();
+        properties.scroll = scrollBarScroll;
         scopedPaintChunkProperties.emplace(context.getPaintController(),
                                            *frameView().layoutView(),
                                            properties);