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

Side by Side Diff: Source/core/dom/Document.cpp

Issue 23701014: Revert "Replace style sharing cousin list search with LRU" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix compiler error Created 7 years, 3 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/dom/ContainerNode.cpp ('k') | Source/core/dom/Element.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 1742 matching lines...) Expand 10 before | Expand all | Expand 10 after
1753 unscheduleStyleRecalc(); 1753 unscheduleStyleRecalc();
1754 1754
1755 // FIXME: SVG <use> element can schedule a recalc in the middle of an al ready running one. 1755 // FIXME: SVG <use> element can schedule a recalc in the middle of an al ready running one.
1756 // See StyleSheetCollections::updateActiveStyleSheets. 1756 // See StyleSheetCollections::updateActiveStyleSheets.
1757 if (m_styleSheetCollections->needsUpdateActiveStylesheetsOnStyleRecalc() ) 1757 if (m_styleSheetCollections->needsUpdateActiveStylesheetsOnStyleRecalc() )
1758 setNeedsStyleRecalc(); 1758 setNeedsStyleRecalc();
1759 1759
1760 m_inStyleRecalc = false; 1760 m_inStyleRecalc = false;
1761 1761
1762 // Pseudo element removal and similar may only work with these flags sti ll set. Reset them after the style recalc. 1762 // Pseudo element removal and similar may only work with these flags sti ll set. Reset them after the style recalc.
1763 if (m_styleResolver) { 1763 if (m_styleResolver)
1764 m_styleSheetCollections->resetCSSFeatureFlags(m_styleResolver->ruleF eatureSet()); 1764 m_styleSheetCollections->resetCSSFeatureFlags(m_styleResolver->ruleF eatureSet());
1765 m_styleResolver->clearStyleSharingList();
1766 }
1767 1765
1768 if (frameView) { 1766 if (frameView) {
1769 frameView->resumeScheduledEvents(); 1767 frameView->resumeScheduledEvents();
1770 frameView->endDeferredRepaints(); 1768 frameView->endDeferredRepaints();
1771 } 1769 }
1772 } 1770 }
1773 1771
1774 STYLE_STATS_PRINT(); 1772 STYLE_STATS_PRINT();
1775 STYLE_STATS_CLEAR(); 1773 STYLE_STATS_CLEAR();
1776 1774
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
2042 setRenderer(0); 2040 setRenderer(0);
2043 2041
2044 m_hoverNode = 0; 2042 m_hoverNode = 0;
2045 m_focusedElement = 0; 2043 m_focusedElement = 0;
2046 m_activeElement = 0; 2044 m_activeElement = 0;
2047 2045
2048 ContainerNode::detach(context); 2046 ContainerNode::detach(context);
2049 2047
2050 unscheduleStyleRecalc(); 2048 unscheduleStyleRecalc();
2051 2049
2052 clearStyleResolver();
2053
2054 if (render) 2050 if (render)
2055 render->destroy(); 2051 render->destroy();
2056 2052
2057 if (m_touchEventTargets && m_touchEventTargets->size() && parentDocument()) 2053 if (m_touchEventTargets && m_touchEventTargets->size() && parentDocument())
2058 parentDocument()->didRemoveEventTargetNode(this); 2054 parentDocument()->didRemoveEventTargetNode(this);
2059 2055
2060 // This is required, as our Frame might delete itself as soon as it detaches 2056 // This is required, as our Frame might delete itself as soon as it detaches
2061 // us. However, this violates Node::detach() semantics, as it's never 2057 // us. However, this violates Node::detach() semantics, as it's never
2062 // possible to re-attach. Eventually Document::detach() should be renamed, 2058 // possible to re-attach. Eventually Document::detach() should be renamed,
2063 // or this setting of the frame to 0 could be made explicit in each of the 2059 // or this setting of the frame to 0 could be made explicit in each of the
(...skipping 3391 matching lines...) Expand 10 before | Expand all | Expand 10 after
5455 { 5451 {
5456 return DocumentLifecycleNotifier::create(this); 5452 return DocumentLifecycleNotifier::create(this);
5457 } 5453 }
5458 5454
5459 DocumentLifecycleNotifier* Document::lifecycleNotifier() 5455 DocumentLifecycleNotifier* Document::lifecycleNotifier()
5460 { 5456 {
5461 return static_cast<DocumentLifecycleNotifier*>(ScriptExecutionContext::lifec ycleNotifier()); 5457 return static_cast<DocumentLifecycleNotifier*>(ScriptExecutionContext::lifec ycleNotifier());
5462 } 5458 }
5463 5459
5464 } // namespace WebCore 5460 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/dom/ContainerNode.cpp ('k') | Source/core/dom/Element.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698