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

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

Issue 209323003: Merge recalcStyleForLayoutIgnoringPendingStylesheets into updateLayoutIgnorePendingStylesheets (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 9 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 | « no previous file | Source/core/dom/Document.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, 2010, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 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) 2010 Nokia Corporation and/or its subsidiary(-ies) 8 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies)
9 * Copyright (C) 2011 Google Inc. All rights reserved. 9 * Copyright (C) 2011 Google Inc. All rights reserved.
10 * 10 *
(...skipping 1095 matching lines...) Expand 10 before | Expand all | Expand 10 after
1106 virtual double timerAlignmentInterval() const OVERRIDE FINAL; 1106 virtual double timerAlignmentInterval() const OVERRIDE FINAL;
1107 1107
1108 void updateTitle(const String&); 1108 void updateTitle(const String&);
1109 void updateFocusAppearanceTimerFired(Timer<Document>*); 1109 void updateFocusAppearanceTimerFired(Timer<Document>*);
1110 void updateBaseURL(); 1110 void updateBaseURL();
1111 1111
1112 bool hasPendingStyleRecalc() const { return m_lifecycle.state() == DocumentL ifecycle::StyleRecalcPending; } 1112 bool hasPendingStyleRecalc() const { return m_lifecycle.state() == DocumentL ifecycle::StyleRecalcPending; }
1113 1113
1114 void executeScriptsWaitingForResourcesIfNeeded(); 1114 void executeScriptsWaitingForResourcesIfNeeded();
1115 1115
1116 void recalcStyleForLayoutIgnoringPendingStylesheets();
1117
1118 PassRefPtr<NodeList> handleZeroPadding(const HitTestRequest&, HitTestResult& ) const; 1116 PassRefPtr<NodeList> handleZeroPadding(const HitTestRequest&, HitTestResult& ) const;
1119 1117
1120 void loadEventDelayTimerFired(Timer<Document>*); 1118 void loadEventDelayTimerFired(Timer<Document>*);
1121 void pluginLoadingTimerFired(Timer<Document>*); 1119 void pluginLoadingTimerFired(Timer<Document>*);
1122 1120
1123 PageVisibilityState pageVisibilityState() const; 1121 PageVisibilityState pageVisibilityState() const;
1124 1122
1125 PassRefPtr<HTMLCollection> ensureCachedCollection(CollectionType); 1123 PassRefPtr<HTMLCollection> ensureCachedCollection(CollectionType);
1126 1124
1127 // Note that dispatching a window load event may cause the DOMWindow to be d etached from 1125 // Note that dispatching a window load event may cause the DOMWindow to be d etached from
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after
1401 inline bool Node::isDocumentNode() const 1399 inline bool Node::isDocumentNode() const
1402 { 1400 {
1403 return this == document(); 1401 return this == document();
1404 } 1402 }
1405 1403
1406 Node* eventTargetNodeForDocument(Document*); 1404 Node* eventTargetNodeForDocument(Document*);
1407 1405
1408 } // namespace WebCore 1406 } // namespace WebCore
1409 1407
1410 #endif // Document_h 1408 #endif // Document_h
OLDNEW
« no previous file with comments | « no previous file | Source/core/dom/Document.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698