| 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 | 76 |
| 77 WebSecurityOrigin WebDocument::securityOrigin() const | 77 WebSecurityOrigin WebDocument::securityOrigin() const |
| 78 { | 78 { |
| 79 if (!constUnwrap<Document>()) | 79 if (!constUnwrap<Document>()) |
| 80 return WebSecurityOrigin(); | 80 return WebSecurityOrigin(); |
| 81 return WebSecurityOrigin(constUnwrap<Document>()->securityOrigin()); | 81 return WebSecurityOrigin(constUnwrap<Document>()->securityOrigin()); |
| 82 } | 82 } |
| 83 | 83 |
| 84 WebString WebDocument::encoding() const | 84 WebString WebDocument::encoding() const |
| 85 { | 85 { |
| 86 return constUnwrap<Document>()->encoding(); | 86 return constUnwrap<Document>()->encodingName(); |
| 87 } | 87 } |
| 88 | 88 |
| 89 WebString WebDocument::contentLanguage() const | 89 WebString WebDocument::contentLanguage() const |
| 90 { | 90 { |
| 91 return constUnwrap<Document>()->contentLanguage(); | 91 return constUnwrap<Document>()->contentLanguage(); |
| 92 } | 92 } |
| 93 | 93 |
| 94 WebURL WebDocument::openSearchDescriptionURL() const | 94 WebURL WebDocument::openSearchDescriptionURL() const |
| 95 { | 95 { |
| 96 return const_cast<Document*>(constUnwrap<Document>())->openSearchDescription
URL(); | 96 return const_cast<Document*>(constUnwrap<Document>())->openSearchDescription
URL(); |
| (...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 302 m_private = elem; | 302 m_private = elem; |
| 303 return *this; | 303 return *this; |
| 304 } | 304 } |
| 305 | 305 |
| 306 WebDocument::operator PassRefPtr<Document>() const | 306 WebDocument::operator PassRefPtr<Document>() const |
| 307 { | 307 { |
| 308 return toDocument(m_private.get()); | 308 return toDocument(m_private.get()); |
| 309 } | 309 } |
| 310 | 310 |
| 311 } // namespace WebKit | 311 } // namespace WebKit |
| OLD | NEW |