| 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 21 matching lines...) Expand all Loading... |
| 32 | 32 |
| 33 #include "core/dom/Document.h" | 33 #include "core/dom/Document.h" |
| 34 #include "core/frame/LocalFrame.h" | 34 #include "core/frame/LocalFrame.h" |
| 35 #include "core/frame/Settings.h" | 35 #include "core/frame/Settings.h" |
| 36 #include "platform/weborigin/SecurityOrigin.h" | 36 #include "platform/weborigin/SecurityOrigin.h" |
| 37 | 37 |
| 38 namespace blink { | 38 namespace blink { |
| 39 | 39 |
| 40 static inline bool canReferToParentFrameEncoding(const LocalFrame* frame, const
LocalFrame* parentFrame) | 40 static inline bool canReferToParentFrameEncoding(const LocalFrame* frame, const
LocalFrame* parentFrame) |
| 41 { | 41 { |
| 42 return parentFrame && parentFrame->document()->securityOrigin()->canAccess(f
rame->document()->securityOrigin()); | 42 return parentFrame && parentFrame->document()->getSecurityOrigin()->canAcces
s(frame->document()->getSecurityOrigin()); |
| 43 } | 43 } |
| 44 | 44 |
| 45 | 45 |
| 46 TextResourceDecoderBuilder::TextResourceDecoderBuilder(const AtomicString& mimeT
ype, const AtomicString& encoding) | 46 TextResourceDecoderBuilder::TextResourceDecoderBuilder(const AtomicString& mimeT
ype, const AtomicString& encoding) |
| 47 : m_mimeType(mimeType) | 47 : m_mimeType(mimeType) |
| 48 , m_encoding(encoding) | 48 , m_encoding(encoding) |
| 49 { | 49 { |
| 50 } | 50 } |
| 51 | 51 |
| 52 TextResourceDecoderBuilder::~TextResourceDecoderBuilder() | 52 TextResourceDecoderBuilder::~TextResourceDecoderBuilder() |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 setupEncoding(decoder.get(), document); | 98 setupEncoding(decoder.get(), document); |
| 99 return decoder.release(); | 99 return decoder.release(); |
| 100 } | 100 } |
| 101 | 101 |
| 102 void TextResourceDecoderBuilder::clear() | 102 void TextResourceDecoderBuilder::clear() |
| 103 { | 103 { |
| 104 m_encoding = nullAtom; | 104 m_encoding = nullAtom; |
| 105 } | 105 } |
| 106 | 106 |
| 107 } // namespace blink | 107 } // namespace blink |
| OLD | NEW |