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

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

Issue 22392008: Manual merge of http://src.chromium.org/viewvc/blink?view=revision&revision=155043 (Closed) Base URL: svn://svn.chromium.org/blink/branches/chromium/1547/
Patch Set: Created 7 years, 4 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/DocumentStyleSheetCollection.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 3950 matching lines...) Expand 10 before | Expand all | Expand 10 after
3961 } 3961 }
3962 3962
3963 void Document::popCurrentScript() 3963 void Document::popCurrentScript()
3964 { 3964 {
3965 ASSERT(!m_currentScriptStack.isEmpty()); 3965 ASSERT(!m_currentScriptStack.isEmpty());
3966 m_currentScriptStack.removeLast(); 3966 m_currentScriptStack.removeLast();
3967 } 3967 }
3968 3968
3969 void Document::applyXSLTransform(ProcessingInstruction* pi) 3969 void Document::applyXSLTransform(ProcessingInstruction* pi)
3970 { 3970 {
3971 ASSERT(!pi->isLoading());
3971 UseCounter::count(this, UseCounter::XSLProcessingInstruction); 3972 UseCounter::count(this, UseCounter::XSLProcessingInstruction);
3972 RefPtr<XSLTProcessor> processor = XSLTProcessor::create(); 3973 RefPtr<XSLTProcessor> processor = XSLTProcessor::create();
3973 processor->setXSLStyleSheet(static_cast<XSLStyleSheet*>(pi->sheet())); 3974 processor->setXSLStyleSheet(static_cast<XSLStyleSheet*>(pi->sheet()));
3974 String resultMIMEType; 3975 String resultMIMEType;
3975 String newSource; 3976 String newSource;
3976 String resultEncoding; 3977 String resultEncoding;
3977 if (!processor->transformToString(this, resultMIMEType, newSource, resultEnc oding)) 3978 if (!processor->transformToString(this, resultMIMEType, newSource, resultEnc oding))
3978 return; 3979 return;
3979 // FIXME: If the transform failed we should probably report an error (like M ozilla does). 3980 // FIXME: If the transform failed we should probably report an error (like M ozilla does).
3980 Frame* ownerFrame = frame(); 3981 Frame* ownerFrame = frame();
(...skipping 1237 matching lines...) Expand 10 before | Expand all | Expand 10 after
5218 { 5219 {
5219 return DocumentLifecycleNotifier::create(this); 5220 return DocumentLifecycleNotifier::create(this);
5220 } 5221 }
5221 5222
5222 DocumentLifecycleNotifier* Document::lifecycleNotifier() 5223 DocumentLifecycleNotifier* Document::lifecycleNotifier()
5223 { 5224 {
5224 return static_cast<DocumentLifecycleNotifier*>(ScriptExecutionContext::lifec ycleNotifier()); 5225 return static_cast<DocumentLifecycleNotifier*>(ScriptExecutionContext::lifec ycleNotifier());
5225 } 5226 }
5226 5227
5227 } // namespace WebCore 5228 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/dom/DocumentStyleSheetCollection.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698