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

Side by Side Diff: Source/WebCore/loader/DocumentWriter.h

Issue 8083016: Merge 96260 - JavaScript generated documents don't inherit the cookie URL (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/874/
Patch Set: Created 9 years, 2 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/loader/DocumentWriter.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 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 42
43 class DocumentWriter { 43 class DocumentWriter {
44 WTF_MAKE_NONCOPYABLE(DocumentWriter); 44 WTF_MAKE_NONCOPYABLE(DocumentWriter);
45 public: 45 public:
46 DocumentWriter(Frame*); 46 DocumentWriter(Frame*);
47 47
48 // This is only called by ScriptController::executeIfJavaScriptURL 48 // This is only called by ScriptController::executeIfJavaScriptURL
49 // and always contains the result of evaluating a javascript: url. 49 // and always contains the result of evaluating a javascript: url.
50 void replaceDocument(const String&); 50 void replaceDocument(const String&);
51 51
52 enum SecurityOriginSource { CreateNewSecurityOrigin, InheritSecurityOrigin } ;
53
52 void begin(); 54 void begin();
53 void begin(const KURL&, bool dispatchWindowObjectAvailable = true, SecurityO rigin* forcedSecurityOrigin = 0); 55 void begin(const KURL&, bool dispatchWindowObjectAvailable = true, SecurityO riginSource = CreateNewSecurityOrigin);
54 void addData(const char* bytes, size_t length); 56 void addData(const char* bytes, size_t length);
55 void end(); 57 void end();
56 void endIfNotLoadingMainResource(); 58 void endIfNotLoadingMainResource();
57 59
58 void setFrame(Frame* frame) { m_frame = frame; } 60 void setFrame(Frame* frame) { m_frame = frame; }
59 61
60 String encoding() const; 62 String encoding() const;
61 void setEncoding(const String& encoding, bool userChosen); 63 void setEncoding(const String& encoding, bool userChosen);
62 64
63 // FIXME: It's really unforunate to need to expose this piece of state. 65 // FIXME: It's really unforunate to need to expose this piece of state.
(...skipping 23 matching lines...) Expand all
87 89
88 bool m_encodingWasChosenByUser; 90 bool m_encodingWasChosenByUser;
89 String m_encoding; 91 String m_encoding;
90 RefPtr<TextResourceDecoder> m_decoder; 92 RefPtr<TextResourceDecoder> m_decoder;
91 RefPtr<DocumentParser> m_parser; 93 RefPtr<DocumentParser> m_parser;
92 }; 94 };
93 95
94 } // namespace WebCore 96 } // namespace WebCore
95 97
96 #endif // DocumentWriter_h 98 #endif // DocumentWriter_h
OLDNEW
« no previous file with comments | « Source/WebCore/dom/Document.h ('k') | Source/WebCore/loader/DocumentWriter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698