Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 Loading... | |
| 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()) | 944 if (!isActive()) |
| 945 return false; | 945 return false; |
| 946 return true; | 946 return true; |
|
abarth-chromium
2015/01/13 07:17:41
return isActive()
esprehn
2015/01/13 07:31:29
Heh, there's already a check for isActive() in thi
| |
| 947 } | 947 } |
| 948 | 948 |
| 949 void Document::scheduleRenderTreeUpdate() | 949 void Document::scheduleRenderTreeUpdate() |
| 950 { | 950 { |
| 951 ASSERT(!hasPendingStyleRecalc()); | 951 ASSERT(!hasPendingStyleRecalc()); |
| 952 ASSERT(shouldScheduleRenderTreeUpdate()); | 952 ASSERT(shouldScheduleRenderTreeUpdate()); |
| 953 ASSERT(needsRenderTreeUpdate()); | 953 ASSERT(needsRenderTreeUpdate()); |
| 954 | 954 |
| 955 page()->animator().scheduleVisualUpdate(); | 955 page()->animator().scheduleVisualUpdate(); |
| 956 m_lifecycle.ensureStateAtMost(DocumentLifecycle::VisualUpdatePending); | 956 m_lifecycle.ensureStateAtMost(DocumentLifecycle::VisualUpdatePending); |
| (...skipping 477 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1434 } | 1434 } |
| 1435 | 1435 |
| 1436 void Document::setParsing(bool b) | 1436 void Document::setParsing(bool b) |
| 1437 { | 1437 { |
| 1438 m_isParsing = b; | 1438 m_isParsing = b; |
| 1439 | 1439 |
| 1440 if (m_isParsing && !m_elementDataCache) | 1440 if (m_isParsing && !m_elementDataCache) |
| 1441 m_elementDataCache = ElementDataCache::create(); | 1441 m_elementDataCache = ElementDataCache::create(); |
| 1442 } | 1442 } |
| 1443 | 1443 |
| 1444 bool Document::shouldScheduleLayout() const | |
| 1445 { | |
| 1446 return isActive(); | |
| 1447 } | |
| 1448 | |
| 1449 int Document::elapsedTime() const | 1444 int Document::elapsedTime() const |
| 1450 { | 1445 { |
| 1451 return static_cast<int>((currentTime() - m_startTime) * 1000); | 1446 return static_cast<int>((currentTime() - m_startTime) * 1000); |
| 1452 } | 1447 } |
| 1453 | 1448 |
| 1454 const KURL& Document::virtualURL() const | 1449 const KURL& Document::virtualURL() const |
| 1455 { | 1450 { |
| 1456 return m_url; | 1451 return m_url; |
| 1457 } | 1452 } |
| 1458 | 1453 |
| (...skipping 1193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 2652 using namespace blink; | 2647 using namespace blink; |
| 2653 void showLiveDocumentInstances() | 2648 void showLiveDocumentInstances() |
| 2654 { | 2649 { |
| 2655 WeakDocumentSet& set = liveDocumentSet(); | 2650 WeakDocumentSet& set = liveDocumentSet(); |
| 2656 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); | 2651 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); |
| 2657 for (WeakDocumentSet::const_iterator it = set.begin(); it != set.end(); ++it ) { | 2652 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()); | 2653 fprintf(stderr, "- Document %p URL: %s\n", *it, (*it)->url().string().ut f8().data()); |
| 2659 } | 2654 } |
| 2660 } | 2655 } |
| 2661 #endif | 2656 #endif |
| OLD | NEW |