| 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 1510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1521 { | 1521 { |
| 1522 ASSERT(!hasPendingStyleRecalc()); | 1522 ASSERT(!hasPendingStyleRecalc()); |
| 1523 ASSERT(shouldScheduleLayoutTreeUpdate()); | 1523 ASSERT(shouldScheduleLayoutTreeUpdate()); |
| 1524 ASSERT(needsLayoutTreeUpdate()); | 1524 ASSERT(needsLayoutTreeUpdate()); |
| 1525 | 1525 |
| 1526 page()->animator().scheduleVisualUpdate(); | 1526 page()->animator().scheduleVisualUpdate(); |
| 1527 m_lifecycle.ensureStateAtMost(DocumentLifecycle::VisualUpdatePending); | 1527 m_lifecycle.ensureStateAtMost(DocumentLifecycle::VisualUpdatePending); |
| 1528 | 1528 |
| 1529 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Schedu
leStyleRecalculation", TRACE_EVENT_SCOPE_THREAD, "data", InspectorRecalculateSty
lesEvent::data(frame())); | 1529 TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "Schedu
leStyleRecalculation", TRACE_EVENT_SCOPE_THREAD, "data", InspectorRecalculateSty
lesEvent::data(frame())); |
| 1530 InspectorInstrumentation::didScheduleStyleRecalculation(this); | 1530 InspectorInstrumentation::didScheduleStyleRecalculation(this); |
| 1531 |
| 1532 ++m_styleVersion; |
| 1531 } | 1533 } |
| 1532 | 1534 |
| 1533 bool Document::hasPendingForcedStyleRecalc() const | 1535 bool Document::hasPendingForcedStyleRecalc() const |
| 1534 { | 1536 { |
| 1535 return hasPendingStyleRecalc() && !inStyleRecalc() && styleChangeType() >= S
ubtreeStyleChange; | 1537 return hasPendingStyleRecalc() && !inStyleRecalc() && styleChangeType() >= S
ubtreeStyleChange; |
| 1536 } | 1538 } |
| 1537 | 1539 |
| 1538 void Document::updateStyleInvalidationIfNeeded() | 1540 void Document::updateStyleInvalidationIfNeeded() |
| 1539 { | 1541 { |
| 1540 ScriptForbiddenScope forbidScript; | 1542 ScriptForbiddenScope forbidScript; |
| (...skipping 4195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5736 #ifndef NDEBUG | 5738 #ifndef NDEBUG |
| 5737 using namespace blink; | 5739 using namespace blink; |
| 5738 void showLiveDocumentInstances() | 5740 void showLiveDocumentInstances() |
| 5739 { | 5741 { |
| 5740 Document::WeakDocumentSet& set = Document::liveDocumentSet(); | 5742 Document::WeakDocumentSet& set = Document::liveDocumentSet(); |
| 5741 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); | 5743 fprintf(stderr, "There are %u documents currently alive:\n", set.size()); |
| 5742 for (Document* document : set) | 5744 for (Document* document : set) |
| 5743 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str
ing().utf8().data()); | 5745 fprintf(stderr, "- Document %p URL: %s\n", document, document->url().str
ing().utf8().data()); |
| 5744 } | 5746 } |
| 5745 #endif | 5747 #endif |
| OLD | NEW |