Various cleanups to compositing code

Various cleanups to compositing code

There's no reason to call a functiont that only ASSERTs in release builds. Also,
clean up some minor style issues.

Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=175419

[eseidel, 2014-06-03 06:34:48]

lgtm

[commit-bot: I haz the power, 2014-06-03 06:35:23]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/abarth@chromium.org/316513002/1

[commit-bot: I haz the power, 2014-06-03 07:46:08]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  linux_blink_dbg on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/linux_blink_dbg/builds/1...)

[commit-bot: I haz the power, 2014-06-03 08:00:25]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-03 08:00:25]

Try jobs failed on following builders:
  linux_blink_dbg on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/linux_blink_dbg/builds/1...)

[abarth-chromium, 2014-06-03 17:12:48]

The CQ bit was checked by abarth@chromium.org

[commit-bot: I haz the power, 2014-06-03 17:13:06]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/abarth@chromium.org/316513002/1

[commit-bot: I haz the power, 2014-06-03 17:17:30]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  linux_blink_dbg on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/linux_blink_dbg/builds/1...)

[commit-bot: I haz the power, 2014-06-03 17:27:03]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-03 17:27:03]

Try jobs failed on following builders:
  linux_blink_dbg on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/linux_blink_dbg/builds/1...)

[abarth-chromium, 2014-06-03 18:12:14]

The CQ bit was checked by abarth@chromium.org

[commit-bot: I haz the power, 2014-06-03 18:12:57]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/abarth@chromium.org/316513002/20001

[commit-bot: I haz the power, 2014-06-03 19:34:44]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  win_blink_rel on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/win_blink_rel/builds/10426)

[commit-bot: I haz the power, 2014-06-03 20:43:14]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-03 20:43:15]

Failed to apply patch for
Source/core/rendering/compositing/RenderLayerCompositor.cpp:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/core/rendering/compositing/RenderLayerCompositor.cpp
  Hunk #1 succeeded at 264 (offset -1 lines).
  Hunk #2 succeeded at 293 (offset -1 lines).
  Hunk #3 succeeded at 302 with fuzz 1 (offset -2 lines).
  Hunk #4 FAILED at 362.
  Hunk #5 succeeded at 393 (offset -4 lines).
  1 out of 5 hunks FAILED -- saving rejects to file
Source/core/rendering/compositing/RenderLayerCompositor.cpp.rej

Patch:       Source/core/rendering/compositing/RenderLayerCompositor.cpp
Index: Source/core/rendering/compositing/RenderLayerCompositor.cpp
diff --git a/Source/core/rendering/compositing/RenderLayerCompositor.cpp
b/Source/core/rendering/compositing/RenderLayerCompositor.cpp
index
6c27f8396f74d42896b0aa6b5a1b424e1c44b844..1933d4a9a9d5ad9247c6d4eddad77fa0fc3d3f10
100644
--- a/Source/core/rendering/compositing/RenderLayerCompositor.cpp
+++ b/Source/core/rendering/compositing/RenderLayerCompositor.cpp
@@ -265,9 +265,11 @@ void RenderLayerCompositor::updateIfNeededRecursive()
     // TODO: Figure out why this fails on Chrome OS login page.
crbug.com/365507
     // ASSERT(lifecycle().state() == DocumentLifecycle::CompositingClean);
 
+#if ASSERT_ENABLED
     assertNoUnresolvedDirtyBits();
     for (LocalFrame* child =
m_renderView.frameView()->frame().tree().firstChild(); child; child =
child->tree().nextSibling())
         child->contentRenderer()->compositor()->assertNoUnresolvedDirtyBits();
+#endif
 }
 
 void RenderLayerCompositor::setNeedsCompositingUpdate(CompositingUpdateType
updateType)
@@ -292,6 +294,8 @@ void
RenderLayerCompositor::setNeedsCompositingUpdate(CompositingUpdateType upda
     lifecycle().ensureStateAtMost(DocumentLifecycle::LayoutClean);
 }
 
+#if ASSERT_ENABLED
+
 void RenderLayerCompositor::assertNoUnresolvedDirtyBits()
 {
     ASSERT(!compositingLayersNeedRebuild());
@@ -300,6 +304,8 @@ void RenderLayerCompositor::assertNoUnresolvedDirtyBits()
     ASSERT(!m_needsToRecomputeCompositingRequirements);
 }
 
+#endif
+
 void RenderLayerCompositor::applyOverlayFullscreenVideoAdjustment()
 {
     if (!m_rootContentLayer)
@@ -356,7 +362,8 @@ void RenderLayerCompositor::updateIfNeeded()
     if (!hasAcceleratedCompositing())
         return;
 
-    bool needsToUpdateScrollingCoordinator = scrollingCoordinator() ?
scrollingCoordinator()->needsToUpdateAfterCompositingChange() : false;
+    bool needsToUpdateScrollingCoordinator = scrollingCoordinator() &&
scrollingCoordinator()->needsToUpdateAfterCompositingChange();
+
     if (updateType == CompositingUpdateNone &&
!needCompositingRequirementsUpdate && !needHierarchyAndGeometryUpdate &&
!needsToUpdateScrollingCoordinator)
         return;
 
@@ -391,8 +398,7 @@ void RenderLayerCompositor::updateIfNeeded()
 
         {
             TRACE_EVENT0("blink_rendering",
"RenderLayerCompositor::updateAfterCompositingChange");
-            const FrameView::ScrollableAreaSet* scrollableAreas =
m_renderView.frameView()->scrollableAreas();
-            if (scrollableAreas) {
+            if (const FrameView::ScrollableAreaSet* scrollableAreas =
m_renderView.frameView()->scrollableAreas()) {
                 for (FrameView::ScrollableAreaSet::iterator it =
scrollableAreas->begin(); it != scrollableAreas->end(); ++it)
                     (*it)->updateAfterCompositingChange();
             }

[abarth-chromium, 2014-06-03 22:06:33]

The CQ bit was checked by abarth@chromium.org

[commit-bot: I haz the power, 2014-06-03 22:07:06]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/abarth@chromium.org/316513002/40001

[commit-bot: I haz the power, 2014-06-03 23:52:56]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  blink_presubmit on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/blink_presubmit/builds/6849)
  linux_blink_dbg on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/linux_blink_dbg/builds/1...)

[abarth-chromium, 2014-06-04 00:18:35]

The CQ bit was checked by abarth@chromium.org

[commit-bot: I haz the power, 2014-06-04 00:18:54]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/abarth@chromium.org/316513002/40001

[commit-bot: I haz the power, 2014-06-04 01:22:58]

FYI, CQ is re-trying this CL (attempt #1).
The failing builders are:
  blink_presubmit on tryserver.blink
(http://build.chromium.org/p/tryserver.blink/builders/blink_presubmit/builds/6868)

[commit-bot: I haz the power, 2014-06-04 01:41:09]

Change committed as 175419