| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 16 matching lines...) Expand all Loading... |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "core/loader/TextResourceDecoderBuilder.h" | 32 #include "core/loader/TextResourceDecoderBuilder.h" |
| 33 | 33 |
| 34 #include "core/dom/Document.h" | 34 #include "core/dom/Document.h" |
| 35 #include "core/frame/Frame.h" | 35 #include "core/frame/Frame.h" |
| 36 #include "core/page/Settings.h" | 36 #include "core/page/Settings.h" |
| 37 #include "weborigin/SecurityOrigin.h" | 37 #include "platform/weborigin/SecurityOrigin.h" |
| 38 | 38 |
| 39 namespace WebCore { | 39 namespace WebCore { |
| 40 | 40 |
| 41 static inline bool canReferToParentFrameEncoding(const Frame* frame, const Frame
* parentFrame) | 41 static inline bool canReferToParentFrameEncoding(const Frame* frame, const Frame
* parentFrame) |
| 42 { | 42 { |
| 43 return parentFrame && parentFrame->document()->securityOrigin()->canAccess(f
rame->document()->securityOrigin()); | 43 return parentFrame && parentFrame->document()->securityOrigin()->canAccess(f
rame->document()->securityOrigin()); |
| 44 } | 44 } |
| 45 | 45 |
| 46 | 46 |
| 47 TextResourceDecoderBuilder::TextResourceDecoderBuilder(const String& mimeType, c
onst String& encoding, bool encodingUserChoosen) | 47 TextResourceDecoderBuilder::TextResourceDecoderBuilder(const String& mimeType, c
onst String& encoding, bool encodingUserChoosen) |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 return decoder.release(); | 98 return decoder.release(); |
| 99 } | 99 } |
| 100 | 100 |
| 101 void TextResourceDecoderBuilder::clear() | 101 void TextResourceDecoderBuilder::clear() |
| 102 { | 102 { |
| 103 if (!m_encodingWasChosenByUser) | 103 if (!m_encodingWasChosenByUser) |
| 104 m_encoding = String(); | 104 m_encoding = String(); |
| 105 } | 105 } |
| 106 | 106 |
| 107 } | 107 } |
| OLD | NEW |