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

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

Issue 853433002: Remove Document::shouldScheduleLayout. (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Remove redundant call. 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/frame/FrameView.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 /* 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 923 matching lines...) Expand 10 before | Expand all | Expand 10 after
934 934
935 bool Document::shouldScheduleRenderTreeUpdate() const 935 bool Document::shouldScheduleRenderTreeUpdate() const
936 { 936 {
937 if (!isActive()) 937 if (!isActive())
938 return false; 938 return false;
939 if (inStyleRecalc()) 939 if (inStyleRecalc())
940 return false; 940 return false;
941 // InPreLayout will recalc style itself. There's no reason to schedule anoth er recalc. 941 // InPreLayout will recalc style itself. There's no reason to schedule anoth er recalc.
942 if (m_lifecycle.state() == DocumentLifecycle::InPreLayout) 942 if (m_lifecycle.state() == DocumentLifecycle::InPreLayout)
943 return false; 943 return false;
944 if (!shouldScheduleLayout())
945 return false;
946 return true; 944 return true;
947 } 945 }
948 946
949 void Document::scheduleRenderTreeUpdate() 947 void Document::scheduleRenderTreeUpdate()
950 { 948 {
951 ASSERT(!hasPendingStyleRecalc()); 949 ASSERT(!hasPendingStyleRecalc());
952 ASSERT(shouldScheduleRenderTreeUpdate()); 950 ASSERT(shouldScheduleRenderTreeUpdate());
953 ASSERT(needsRenderTreeUpdate()); 951 ASSERT(needsRenderTreeUpdate());
954 952
955 page()->animator().scheduleVisualUpdate(); 953 page()->animator().scheduleVisualUpdate();
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after
1434 } 1432 }
1435 1433
1436 void Document::setParsing(bool b) 1434 void Document::setParsing(bool b)
1437 { 1435 {
1438 m_isParsing = b; 1436 m_isParsing = b;
1439 1437
1440 if (m_isParsing && !m_elementDataCache) 1438 if (m_isParsing && !m_elementDataCache)
1441 m_elementDataCache = ElementDataCache::create(); 1439 m_elementDataCache = ElementDataCache::create();
1442 } 1440 }
1443 1441
1444 bool Document::shouldScheduleLayout() const
1445 {
1446 return isActive();
1447 }
1448
1449 int Document::elapsedTime() const 1442 int Document::elapsedTime() const
1450 { 1443 {
1451 return static_cast<int>((currentTime() - m_startTime) * 1000); 1444 return static_cast<int>((currentTime() - m_startTime) * 1000);
1452 } 1445 }
1453 1446
1454 const KURL& Document::virtualURL() const 1447 const KURL& Document::virtualURL() const
1455 { 1448 {
1456 return m_url; 1449 return m_url;
1457 } 1450 }
1458 1451
(...skipping 1193 matching lines...) Expand 10 before | Expand all | Expand 10 after
2652 using namespace blink; 2645 using namespace blink;
2653 void showLiveDocumentInstances() 2646 void showLiveDocumentInstances()
2654 { 2647 {
2655 WeakDocumentSet& set = liveDocumentSet(); 2648 WeakDocumentSet& set = liveDocumentSet();
2656 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); 2649 fprintf(stderr, "There are %u documents currently alive:\n", set.size());
2657 for (WeakDocumentSet::const_iterator it = set.begin(); it != set.end(); ++it ) { 2650 for (WeakDocumentSet::const_iterator it = set.begin(); it != set.end(); ++it ) {
2658 fprintf(stderr, "- Document %p URL: %s\n", *it, (*it)->url().string().ut f8().data()); 2651 fprintf(stderr, "- Document %p URL: %s\n", *it, (*it)->url().string().ut f8().data());
2659 } 2652 }
2660 } 2653 }
2661 #endif 2654 #endif
OLDNEW
« no previous file with comments | « sky/engine/core/dom/Document.h ('k') | sky/engine/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698