[blink] Use early returns in baseBackgroundColor(Override) setters.

third_party/WebKit/Source/core/frame/FrameView.cpp

 /*
  * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
  *                     1999 Lars Knoll <knoll@kde.org>
  *                     1999 Antti Koivisto <koivisto@kde.org>
  *                     2000 Dirk Mueller <mueller@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  *           (C) 2006 Graham Dennis (graham.dennis@gmail.com)
  *           (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
@@ skipping 142 matching lines @@
 
 using namespace HTMLNames;
 
 // The maximum number of updatePlugins iterations that should be done before
 // returning.
 static const unsigned maxUpdatePluginsIterations = 2;
 static const double resourcePriorityUpdateDelayAfterScroll = 0.250;
 
 static bool s_initialTrackAllPaintInvalidations = false;
 
+static void setNeedsCompositingUpdate(LayoutViewItem layoutViewItem,

[chrishtr, 2017/04/06 17:33:46]

I don't see much point in making this a helper method - inline instead?

[Eric Seckler, 2017/04/06 17:40:29]

It was one before - I just moved it. Since it's used in a couple of places, keep
it?

[chrishtr, 2017/04/06 17:42:53]

Oh, didn't see that. Ignore my comment.

+                                      CompositingUpdateType updateType) {
+  if (PaintLayerCompositor* compositor =
+          !layoutViewItem.isNull() ? layoutViewItem.compositor() : nullptr)
+    compositor->setNeedsCompositingUpdate(updateType);
+}
+
 FrameView::FrameView(LocalFrame& frame)
     : m_frame(frame),
       m_displayMode(WebDisplayModeBrowser),
       m_canHaveScrollbars(true),
       m_hasPendingLayout(false),
       m_inSynchronousPostLayout(false),
       m_postLayoutTasksTimer(
           TaskRunnerHelper::get(TaskType::UnspecedTimer, &frame),
           this,
           &FrameView::postLayoutTimerFired),
@@ skipping 2162 matching lines @@
 
 bool FrameView::hasOpaqueBackground() const {
   return !m_baseBackgroundColor.hasAlpha();
 }
 
 Color FrameView::baseBackgroundColor() const {
   return m_baseBackgroundColor;
 }
 
 void FrameView::setBaseBackgroundColor(const Color& backgroundColor) {
+  if (m_baseBackgroundColor == backgroundColor)
+    return;
+
   m_baseBackgroundColor = backgroundColor;
 
-  if (!layoutViewItem().isNull() &&
-      layoutViewItem().layer()->hasCompositedLayerMapping()) {
-    CompositedLayerMapping* compositedLayerMapping =
-        layoutViewItem().layer()->compositedLayerMapping();
-    compositedLayerMapping->updateContentsOpaque();
-    if (compositedLayerMapping->mainGraphicsLayer())
-      compositedLayerMapping->mainGraphicsLayer()->setNeedsDisplay();

[chrishtr, 2017/04/06 17:33:46]

You still need setNeedsDisplay in order to force invalidation of the graphics
layer backing. setNeedsCompositingUpdate just forces the compositing step
to recompute things like the graphics layer tree and opacity settings.

[Eric Seckler, 2017/04/06 17:40:29]

Thanks, will do!

-  }
   recalculateScrollbarOverlayColorTheme(documentBackgroundColor());
-
-  if (!shouldThrottleRendering())
-    page()->animator().scheduleVisualUpdate(m_frame.get());
+  setNeedsCompositingUpdate(layoutViewItem(), CompositingUpdateRebuildTree);
 }
 
 void FrameView::updateBaseBackgroundColorRecursively(
     const Color& baseBackgroundColor) {
   forAllNonThrottledFrameViews([baseBackgroundColor](FrameView& frameView) {
     frameView.setBaseBackgroundColor(baseBackgroundColor);
   });
 }
 
 void FrameView::scrollToFragmentAnchor() {
@@ skipping 2266 matching lines @@
 
 IntPoint FrameView::convertFromContainingFrameViewBaseToScrollbar(
     const Scrollbar& scrollbar,
     const IntPoint& parentPoint) const {
   IntPoint newPoint = parentPoint;
   // Scrollbars won't be transformed within us
   newPoint.moveBy(-scrollbar.location());
   return newPoint;
 }
 
-static void setNeedsCompositingUpdate(LayoutViewItem layoutViewItem,
-                                      CompositingUpdateType updateType) {
-  if (PaintLayerCompositor* compositor =
-          !layoutViewItem.isNull() ? layoutViewItem.compositor() : nullptr)
-    compositor->setNeedsCompositingUpdate(updateType);
-}
-
 void FrameView::setParentVisible(bool visible) {
   if (isParentVisible() == visible)
     return;
 
   // As parent visibility changes, we may need to recomposite this frame view
   // and potentially child frame views.
   setNeedsCompositingUpdate(layoutViewItem(), CompositingUpdateRebuildTree);
 
   FrameViewBase::setParentVisible(visible);
 
@@ skipping 605 matching lines @@
 void FrameView::setAnimationHost(
     std::unique_ptr<CompositorAnimationHost> host) {
   m_animationHost = std::move(host);
 }
 
 LayoutUnit FrameView::caretWidth() const {
   return LayoutUnit(getHostWindow()->windowToViewportScalar(1));
 }
 
 }  // namespace blink