Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(212)

Side by Side Diff: Source/core/css/DragUpdateTest.cpp

Issue 1216543005: Revert of Add a FrameView lifecycle method that just updates layout, style and compositing. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/css/AffectedByFocusTest.cpp ('k') | Source/core/dom/DocumentTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "config.h" 5 #include "config.h"
6 #include "core/dom/Element.h" 6 #include "core/dom/Element.h"
7 #include "core/dom/StyleEngine.h" 7 #include "core/dom/StyleEngine.h"
8 #include "core/frame/FrameView.h" 8 #include "core/frame/FrameView.h"
9 #include "core/html/HTMLDocument.h" 9 #include "core/html/HTMLDocument.h"
10 #include "core/html/HTMLElement.h" 10 #include "core/html/HTMLElement.h"
(...skipping 11 matching lines...) Expand all
22 OwnPtr<DummyPageHolder> dummyPageHolder = DummyPageHolder::create(IntSize(80 0, 600)); 22 OwnPtr<DummyPageHolder> dummyPageHolder = DummyPageHolder::create(IntSize(80 0, 600));
23 HTMLDocument& document = toHTMLDocument(dummyPageHolder->document()); 23 HTMLDocument& document = toHTMLDocument(dummyPageHolder->document());
24 document.documentElement()->setInnerHTML("<style>div {width:100px;height:100 px} div:-webkit-drag { background-color: green }</style>" 24 document.documentElement()->setInnerHTML("<style>div {width:100px;height:100 px} div:-webkit-drag { background-color: green }</style>"
25 "<div>" 25 "<div>"
26 "<span></span>" 26 "<span></span>"
27 "<span></span>" 27 "<span></span>"
28 "<span></span>" 28 "<span></span>"
29 "<span></span>" 29 "<span></span>"
30 "</div>", ASSERT_NO_EXCEPTION); 30 "</div>", ASSERT_NO_EXCEPTION);
31 31
32 document.view()->updateAllLifecyclePhases(); 32 document.view()->updateLayoutAndStyleForPainting();
33 unsigned startCount = document.styleEngine().resolverAccessCount(); 33 unsigned startCount = document.styleEngine().resolverAccessCount();
34 34
35 document.documentElement()->layoutObject()->updateDragState(true); 35 document.documentElement()->layoutObject()->updateDragState(true);
36 document.view()->updateAllLifecyclePhases(); 36 document.view()->updateLayoutAndStyleForPainting();
37 37
38 unsigned accessCount = document.styleEngine().resolverAccessCount() - startC ount; 38 unsigned accessCount = document.styleEngine().resolverAccessCount() - startC ount;
39 39
40 ASSERT_EQ(1U, accessCount); 40 ASSERT_EQ(1U, accessCount);
41 } 41 }
42 42
43 TEST(DragUpdateTest, ChildrenOrSiblingsAffectedByDragUpdate) 43 TEST(DragUpdateTest, ChildrenOrSiblingsAffectedByDragUpdate)
44 { 44 {
45 // Check that when dragging the div in the document below, you get a 45 // Check that when dragging the div in the document below, you get a
46 // full subtree style recalc. 46 // full subtree style recalc.
(...skipping 13 matching lines...) Expand all
60 60
61 document.documentElement()->layoutObject()->updateDragState(true); 61 document.documentElement()->layoutObject()->updateDragState(true);
62 document.updateLayout(); 62 document.updateLayout();
63 63
64 unsigned accessCount = document.styleEngine().resolverAccessCount() - startC ount; 64 unsigned accessCount = document.styleEngine().resolverAccessCount() - startC ount;
65 65
66 ASSERT_EQ(5U, accessCount); 66 ASSERT_EQ(5U, accessCount);
67 } 67 }
68 68
69 } // namespace blink 69 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/css/AffectedByFocusTest.cpp ('k') | Source/core/dom/DocumentTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698