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

Side by Side Diff: Source/core/loader/DocumentWriter.cpp

Issue 14323004: Make Frame's ScriptController an OwnPtr and remove the #include (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fix Created 7 years, 8 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/inspector/PageRuntimeAgent.cpp ('k') | Source/core/loader/NavigationScheduler.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) 2010. Adam Barth. All rights reserved. 2 * Copyright (C) 2010. Adam Barth. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 20 matching lines...) Expand all
31 31
32 #include "DOMImplementation.h" 32 #include "DOMImplementation.h"
33 #include "DOMWindow.h" 33 #include "DOMWindow.h"
34 #include "Frame.h" 34 #include "Frame.h"
35 #include "FrameLoader.h" 35 #include "FrameLoader.h"
36 #include "FrameLoaderClient.h" 36 #include "FrameLoaderClient.h"
37 #include "FrameLoaderStateMachine.h" 37 #include "FrameLoaderStateMachine.h"
38 #include "FrameView.h" 38 #include "FrameView.h"
39 #include "PluginDocument.h" 39 #include "PluginDocument.h"
40 #include "RawDataDocumentParser.h" 40 #include "RawDataDocumentParser.h"
41 #include "ScriptController.h"
41 #include "ScriptableDocumentParser.h" 42 #include "ScriptableDocumentParser.h"
42 #include "SecurityOrigin.h" 43 #include "SecurityOrigin.h"
43 #include "SegmentedString.h" 44 #include "SegmentedString.h"
44 #include "Settings.h" 45 #include "Settings.h"
45 #include "SinkDocument.h" 46 #include "SinkDocument.h"
46 #include "TextResourceDecoder.h" 47 #include "TextResourceDecoder.h"
47 48
48
49 namespace WebCore { 49 namespace WebCore {
50 50
51 static inline bool canReferToParentFrameEncoding(const Frame* frame, const Frame * parentFrame) 51 static inline bool canReferToParentFrameEncoding(const Frame* frame, const Frame * parentFrame)
52 { 52 {
53 return parentFrame && parentFrame->document()->securityOrigin()->canAccess(f rame->document()->securityOrigin()); 53 return parentFrame && parentFrame->document()->securityOrigin()->canAccess(f rame->document()->securityOrigin());
54 } 54 }
55 55
56 DocumentWriter::DocumentWriter(Frame* frame) 56 DocumentWriter::DocumentWriter(Frame* frame)
57 : m_frame(frame) 57 : m_frame(frame)
58 , m_hasReceivedSomeData(false) 58 , m_hasReceivedSomeData(false)
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after
250 m_encodingWasChosenByUser = userChosen; 250 m_encodingWasChosenByUser = userChosen;
251 } 251 }
252 252
253 void DocumentWriter::setDocumentWasLoadedAsPartOfNavigation() 253 void DocumentWriter::setDocumentWasLoadedAsPartOfNavigation()
254 { 254 {
255 ASSERT(m_parser && !m_parser->isStopped()); 255 ASSERT(m_parser && !m_parser->isStopped());
256 m_parser->setDocumentWasLoadedAsPartOfNavigation(); 256 m_parser->setDocumentWasLoadedAsPartOfNavigation();
257 } 257 }
258 258
259 } // namespace WebCore 259 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/inspector/PageRuntimeAgent.cpp ('k') | Source/core/loader/NavigationScheduler.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698