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

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

Issue 6709024: Merge 80797 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/648/
Patch Set: Created 9 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
« no previous file with comments | « Source/WebCore/dom/Document.h ('k') | Source/WebCore/dom/Node.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 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
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 Google Inc. All rights reserved. 8 * Copyright (C) 2008, 2009 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 * 10 *
(...skipping 352 matching lines...) Expand 10 before | Expand all | Expand 10 after
363 private: 363 private:
364 DocumentWeakReference(Document* document) 364 DocumentWeakReference(Document* document)
365 : m_document(document) 365 : m_document(document)
366 { 366 {
367 ASSERT(isMainThread()); 367 ASSERT(isMainThread());
368 } 368 }
369 369
370 Document* m_document; 370 Document* m_document;
371 }; 371 };
372 372
373 uint64_t Document::s_globalTreeVersion = 0;
374
373 Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML, con st KURL& baseURL) 375 Document::Document(Frame* frame, const KURL& url, bool isXHTML, bool isHTML, con st KURL& baseURL)
374 : ContainerNode(0) 376 : ContainerNode(0)
375 , m_compatibilityMode(NoQuirksMode) 377 , m_compatibilityMode(NoQuirksMode)
376 , m_compatibilityModeLocked(false) 378 , m_compatibilityModeLocked(false)
377 , m_domTreeVersion(0) 379 , m_domTreeVersion(++s_globalTreeVersion)
378 , m_styleSheets(StyleSheetList::create(this)) 380 , m_styleSheets(StyleSheetList::create(this))
379 , m_readyState(Complete) 381 , m_readyState(Complete)
380 , m_styleRecalcTimer(this, &Document::styleRecalcTimerFired) 382 , m_styleRecalcTimer(this, &Document::styleRecalcTimerFired)
381 , m_pendingStyleRecalcShouldForce(false) 383 , m_pendingStyleRecalcShouldForce(false)
382 , m_frameElementsShouldIgnoreScrolling(false) 384 , m_frameElementsShouldIgnoreScrolling(false)
383 , m_containsValidityStyleRules(false) 385 , m_containsValidityStyleRules(false)
384 , m_updateFocusAppearanceRestoresSelection(false) 386 , m_updateFocusAppearanceRestoresSelection(false)
385 , m_ignoreDestructiveWriteCount(0) 387 , m_ignoreDestructiveWriteCount(0)
386 , m_title("") 388 , m_title("")
387 , m_rawTitle("") 389 , m_rawTitle("")
(...skipping 4665 matching lines...) Expand 10 before | Expand all | Expand 10 after
5053 // This functions is used for checking such possibility of FOUCs. 5055 // This functions is used for checking such possibility of FOUCs.
5054 // Note that the implementation considers only empty or <head> only contents as a FOUC cause 5056 // Note that the implementation considers only empty or <head> only contents as a FOUC cause
5055 // rather than missing <body>, because non-HTML document like SVG and arbitr ary XML from foreign namespace 5057 // rather than missing <body>, because non-HTML document like SVG and arbitr ary XML from foreign namespace
5056 // should be painted even if there is no <body>. 5058 // should be painted even if there is no <body>.
5057 if (didLayoutWithPendingStylesheets()) 5059 if (didLayoutWithPendingStylesheets())
5058 return true; 5060 return true;
5059 return !hasHeadSibling(this); 5061 return !hasHeadSibling(this);
5060 } 5062 }
5061 5063
5062 } // namespace WebCore 5064 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/dom/Document.h ('k') | Source/WebCore/dom/Node.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698