| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 return constUnwrap<Document>()->url(); | 75 return constUnwrap<Document>()->url(); |
| 76 } | 76 } |
| 77 | 77 |
| 78 WebSecurityOrigin WebDocument::securityOrigin() const | 78 WebSecurityOrigin WebDocument::securityOrigin() const |
| 79 { | 79 { |
| 80 if (!constUnwrap<Document>()) | 80 if (!constUnwrap<Document>()) |
| 81 return WebSecurityOrigin(); | 81 return WebSecurityOrigin(); |
| 82 return WebSecurityOrigin(constUnwrap<Document>()->securityOrigin()); | 82 return WebSecurityOrigin(constUnwrap<Document>()->securityOrigin()); |
| 83 } | 83 } |
| 84 | 84 |
| 85 bool WebDocument::isPrivilegedContext(WebString& errorMessage) const | 85 bool WebDocument::isSecureContext(WebString& errorMessage) const |
| 86 { | 86 { |
| 87 const Document* document = constUnwrap<Document>(); | 87 const Document* document = constUnwrap<Document>(); |
| 88 if (!document) | 88 if (!document) |
| 89 return false; | 89 return false; |
| 90 String message; | 90 String message; |
| 91 bool result = document->isPrivilegedContext(message); | 91 bool result = document->isSecureContext(message); |
| 92 errorMessage = message; | 92 errorMessage = message; |
| 93 return result; | 93 return result; |
| 94 } | 94 } |
| 95 | 95 |
| 96 WebString WebDocument::encoding() const | 96 WebString WebDocument::encoding() const |
| 97 { | 97 { |
| 98 return constUnwrap<Document>()->encodingName(); | 98 return constUnwrap<Document>()->encodingName(); |
| 99 } | 99 } |
| 100 | 100 |
| 101 WebString WebDocument::contentLanguage() const | 101 WebString WebDocument::contentLanguage() const |
| (...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 343 m_private = elem; | 343 m_private = elem; |
| 344 return *this; | 344 return *this; |
| 345 } | 345 } |
| 346 | 346 |
| 347 WebDocument::operator PassRefPtrWillBeRawPtr<Document>() const | 347 WebDocument::operator PassRefPtrWillBeRawPtr<Document>() const |
| 348 { | 348 { |
| 349 return toDocument(m_private.get()); | 349 return toDocument(m_private.get()); |
| 350 } | 350 } |
| 351 | 351 |
| 352 } // namespace blink | 352 } // namespace blink |
| OLD | NEW |