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

Side by Side Diff: sky/engine/core/dom/Document.cpp

Issue 865383003: Consolidate callers to scheduleVisualUpdate. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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
« no previous file with comments | « sky/engine/core/dom/Document.h ('k') | sky/engine/core/editing/FrameSelection.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/) 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t orchmobile.com/)
8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved.
(...skipping 930 matching lines...) Expand 10 before | Expand all | Expand 10 after
941 return false; 941 return false;
942 return true; 942 return true;
943 } 943 }
944 944
945 void Document::scheduleRenderTreeUpdate() 945 void Document::scheduleRenderTreeUpdate()
946 { 946 {
947 ASSERT(!hasPendingStyleRecalc()); 947 ASSERT(!hasPendingStyleRecalc());
948 ASSERT(shouldScheduleRenderTreeUpdate()); 948 ASSERT(shouldScheduleRenderTreeUpdate());
949 ASSERT(needsRenderTreeUpdate()); 949 ASSERT(needsRenderTreeUpdate());
950 950
951 page()->animator().scheduleVisualUpdate(); 951 scheduleVisualUpdate();
952
953 // TODO(esprehn): We should either rename this state, or change the other
954 // users of scheduleVisualUpdate() so they don't expect different states.
952 m_lifecycle.ensureStateAtMost(DocumentLifecycle::VisualUpdatePending); 955 m_lifecycle.ensureStateAtMost(DocumentLifecycle::VisualUpdatePending);
953 956
954 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Schedu leStyleRecalculation", TRACE_EVENT_SCOPE_PROCESS, "frame", frame()); 957 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Schedu leStyleRecalculation", TRACE_EVENT_SCOPE_PROCESS, "frame", frame());
955 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), " CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::current CallStack()); 958 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), " CallStack", TRACE_EVENT_SCOPE_PROCESS, "stack", InspectorCallStackEvent::current CallStack());
956 } 959 }
957 960
961 void Document::scheduleVisualUpdate()
962 {
963 page()->animator().scheduleVisualUpdate();
964 }
965
958 void Document::updateDistributionIfNeeded() 966 void Document::updateDistributionIfNeeded()
959 { 967 {
960 ScriptForbiddenScope forbidScript; 968 ScriptForbiddenScope forbidScript;
961 969
962 if (!childNeedsDistributionRecalc()) 970 if (!childNeedsDistributionRecalc())
963 return; 971 return;
964 TRACE_EVENT0("blink", "Document::updateDistributionIfNeeded"); 972 TRACE_EVENT0("blink", "Document::updateDistributionIfNeeded");
965 recalcDistribution(); 973 recalcDistribution();
966 } 974 }
967 975
(...skipping 1643 matching lines...) Expand 10 before | Expand all | Expand 10 after
2611 using namespace blink; 2619 using namespace blink;
2612 void showLiveDocumentInstances() 2620 void showLiveDocumentInstances()
2613 { 2621 {
2614 WeakDocumentSet& set = liveDocumentSet(); 2622 WeakDocumentSet& set = liveDocumentSet();
2615 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 2623 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
2616 for (WeakDocumentSet::const_iterator it = set.begin(); it != set.end(); ++it ) { 2624 for (WeakDocumentSet::const_iterator it = set.begin(); it != set.end(); ++it ) {
2617 fprintf(stderr, "- Document %p URL: %s\n", *it, (*it)->url().string().ut f8().data()); 2625 fprintf(stderr, "- Document %p URL: %s\n", *it, (*it)->url().string().ut f8().data());
2618 } 2626 }
2619 } 2627 }
2620 #endif 2628 #endif
OLDNEW
« no previous file with comments | « sky/engine/core/dom/Document.h ('k') | sky/engine/core/editing/FrameSelection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698