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

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

Issue 12287016: Merge 142492 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 10 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 | « LayoutTests/fast/parser/document-write-during-load-expected.txt ('k') | no next file » | 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 5753 matching lines...) Expand 10 before | Expand all | Expand 10 after
5764 5764
5765 LayoutRect visibleContentRect = view()->visibleContentRect(); 5765 LayoutRect visibleContentRect = view()->visibleContentRect();
5766 rect.move(-visibleContentRect.x(), -visibleContentRect.y()); 5766 rect.move(-visibleContentRect.x(), -visibleContentRect.y());
5767 adjustFloatRectForAbsoluteZoom(rect, renderer); 5767 adjustFloatRectForAbsoluteZoom(rect, renderer);
5768 if (inverseFrameScale != 1) 5768 if (inverseFrameScale != 1)
5769 rect.scale(inverseFrameScale); 5769 rect.scale(inverseFrameScale);
5770 } 5770 }
5771 5771
5772 bool Document::hasActiveParser() 5772 bool Document::hasActiveParser()
5773 { 5773 {
5774 return m_activeParserCount || (m_parser && m_parser->processingData()); 5774 return m_parser && m_parser->processingData();
5775 } 5775 }
5776 5776
5777 void Document::decrementActiveParserCount() 5777 void Document::decrementActiveParserCount()
5778 { 5778 {
5779 --m_activeParserCount; 5779 --m_activeParserCount;
5780 if (!frame())
5781 return;
5782 frame()->loader()->checkLoadComplete();
5783 } 5780 }
5784 5781
5785 void Document::setContextFeatures(PassRefPtr<ContextFeatures> features) 5782 void Document::setContextFeatures(PassRefPtr<ContextFeatures> features)
5786 { 5783 {
5787 m_contextFeatures = features; 5784 m_contextFeatures = features;
5788 } 5785 }
5789 5786
5790 static RenderObject* nearestCommonHoverAncestor(RenderObject* obj1, RenderObject * obj2) 5787 static RenderObject* nearestCommonHoverAncestor(RenderObject* obj1, RenderObject * obj2)
5791 { 5788 {
5792 if (!obj1 || !obj2) 5789 if (!obj1 || !obj2)
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
6048 else 6045 else
6049 m_templateDocument = Document::create(0, blankURL()); 6046 m_templateDocument = Document::create(0, blankURL());
6050 6047
6051 m_templateDocument->setTemplateDocumentHost(this); // balanced in dtor. 6048 m_templateDocument->setTemplateDocumentHost(this); // balanced in dtor.
6052 6049
6053 return m_templateDocument.get(); 6050 return m_templateDocument.get();
6054 } 6051 }
6055 #endif 6052 #endif
6056 6053
6057 } // namespace WebCore 6054 } // namespace WebCore
OLDNEW
« no previous file with comments | « LayoutTests/fast/parser/document-write-during-load-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698