Revert of Add a FrameView lifecycle method that just updates layout, style and compositing.

Source/core/css/AffectedByFocusTest.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "core/HTMLNames.h"
 #include "core/dom/Element.h"
 #include "core/dom/ElementTraversal.h"
 #include "core/dom/NodeComputedStyle.h"
@@ skipping 33 matching lines @@
 void AffectedByFocusTest::SetUp()
 {
     m_dummyPageHolder = DummyPageHolder::create(IntSize(800, 600));
     m_document = toHTMLDocument(&m_dummyPageHolder->document());
     ASSERT(m_document);
 }
 
 void AffectedByFocusTest::setHtmlInnerHTML(const char* htmlContent)
 {
     document().documentElement()->setInnerHTML(String::fromUTF8(htmlContent), ASSERT_NO_EXCEPTION);
-    document().view()->updateAllLifecyclePhases();
+    document().view()->updateLayoutAndStyleForPainting();
 }
 
 void AffectedByFocusTest::checkElements(ElementResult expected[], unsigned expectedCount) const
 {
     unsigned i = 0;
     HTMLElement* element = document().body();
 
     for (; element && i < expectedCount; element = Traversal<HTMLElement>::next(*element), ++i) {
         ASSERT_TRUE(element->hasTagName(expected[i].tag));
         ASSERT(element->computedStyle());
@@ skipping 134 matching lines @@
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "</div>");
 
-    document().view()->updateAllLifecyclePhases();
+    document().view()->updateLayoutAndStyleForPainting();
 
     unsigned startCount = document().styleEngine().resolverAccessCount();
 
     document().getElementById("d")->focus();
-    document().view()->updateAllLifecyclePhases();
+    document().view()->updateLayoutAndStyleForPainting();
 
     unsigned accessCount = document().styleEngine().resolverAccessCount() - startCount;
 
     ASSERT_EQ(1U, accessCount);
 }
 
 TEST_F(AffectedByFocusTest, ChildrenOrSiblingsAffectedByFocusUpdate)
 {
     // Check that when focussing the outer div in the document below, you get a
     // style recalc for the whole subtree.
 
     setHtmlInnerHTML("<style>:focus div { border: 1px solid lime; }</style>"
         "<div id=d tabIndex=1>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "</div>");
 
-    document().view()->updateAllLifecyclePhases();
+    document().view()->updateLayoutAndStyleForPainting();
 
     unsigned startCount = document().styleEngine().resolverAccessCount();
 
     document().getElementById("d")->focus();
-    document().view()->updateAllLifecyclePhases();
+    document().view()->updateLayoutAndStyleForPainting();
 
     unsigned accessCount = document().styleEngine().resolverAccessCount() - startCount;
 
     ASSERT_EQ(11U, accessCount);
 }
 
 TEST_F(AffectedByFocusTest, InvalidationSetFocusUpdate)
 {
     // Check that when focussing the outer div in the document below, you get a
     // style recalc for the outer div and the class=a div only.
 
     setHtmlInnerHTML("<style>:focus .a { border: 1px solid lime; }</style>"
         "<div id=d tabIndex=1>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div class='a'></div>"
         "</div>");
 
-    document().view()->updateAllLifecyclePhases();
+    document().view()->updateLayoutAndStyleForPainting();
 
     unsigned startCount = document().styleEngine().resolverAccessCount();
 
     document().getElementById("d")->focus();
-    document().view()->updateAllLifecyclePhases();
+    document().view()->updateLayoutAndStyleForPainting();
 
     unsigned accessCount = document().styleEngine().resolverAccessCount() - startCount;
 
     ASSERT_EQ(2U, accessCount);
 }
 
 TEST_F(AffectedByFocusTest, NoInvalidationSetFocusUpdate)
 {
     // Check that when focussing the outer div in the document below, you get a
     // style recalc for the outer div only. The invalidation set for :focus will
     // include 'a', but the id=d div should be affectedByFocus, not childrenOrSiblingsAffectedByFocus.
 
     setHtmlInnerHTML("<style>#nomatch:focus .a { border: 1px solid lime; }</style>"
         "<div id=d tabIndex=1>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div></div>"
         "<div class='a'></div>"
         "</div>");
 
-    document().view()->updateAllLifecyclePhases();
+    document().view()->updateLayoutAndStyleForPainting();
 
     unsigned startCount = document().styleEngine().resolverAccessCount();
 
     document().getElementById("d")->focus();
-    document().view()->updateAllLifecyclePhases();
+    document().view()->updateLayoutAndStyleForPainting();
 
     unsigned accessCount = document().styleEngine().resolverAccessCount() - startCount;
 
     ASSERT_EQ(1U, accessCount);
 }
 
 } // namespace blink