Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) | 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) |
| 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) | 3 * (C) 1999 Antti Koivisto (koivisto@kde.org) |
| 4 * (C) 2000 Simon Hausmann (hausmann@kde.org) | 4 * (C) 2000 Simon Hausmann (hausmann@kde.org) |
| 5 * (C) 2001 Dirk Mueller (mueller@kde.org) | 5 * (C) 2001 Dirk Mueller (mueller@kde.org) |
| 6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. | 6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. |
| 7 * | 7 * |
| 8 * This library is free software; you can redistribute it and/or | 8 * This library is free software; you can redistribute it and/or |
| 9 * modify it under the terms of the GNU Library General Public | 9 * modify it under the terms of the GNU Library General Public |
| 10 * License as published by the Free Software Foundation; either | 10 * License as published by the Free Software Foundation; either |
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 69 | 69 |
| 70 return true; | 70 return true; |
| 71 } | 71 } |
| 72 | 72 |
| 73 void HTMLFrameElementBase::openURL(bool lockBackForwardList) | 73 void HTMLFrameElementBase::openURL(bool lockBackForwardList) |
| 74 { | 74 { |
| 75 if (!isURLAllowed()) | 75 if (!isURLAllowed()) |
| 76 return; | 76 return; |
| 77 | 77 |
| 78 if (m_URL.isEmpty()) | 78 if (m_URL.isEmpty()) |
| 79 m_URL = blankURL().string(); | 79 m_URL = AtomicString(blankURL().string()); |
|
eseidel
2013/12/31 23:22:35
KURL::toAtomicString().
Inactive
2014/01/01 19:26:29
Yes, planning to add this KURL method in a follow-
| |
| 80 | 80 |
| 81 Frame* parentFrame = document().frame(); | 81 Frame* parentFrame = document().frame(); |
| 82 if (!parentFrame) | 82 if (!parentFrame) |
| 83 return; | 83 return; |
| 84 | 84 |
| 85 // Support for <frame src="javascript:string"> | 85 // Support for <frame src="javascript:string"> |
| 86 KURL scriptURL; | 86 KURL scriptURL; |
| 87 KURL url = document().completeURL(m_URL); | 87 KURL url = document().completeURL(m_URL); |
| 88 if (protocolIsJavaScript(m_URL)) { | 88 if (protocolIsJavaScript(m_URL)) { |
| 89 scriptURL = url; | 89 scriptURL = url; |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 221 | 221 |
| 222 int HTMLFrameElementBase::height() | 222 int HTMLFrameElementBase::height() |
| 223 { | 223 { |
| 224 document().updateLayoutIgnorePendingStylesheets(); | 224 document().updateLayoutIgnorePendingStylesheets(); |
| 225 if (!renderBox()) | 225 if (!renderBox()) |
| 226 return 0; | 226 return 0; |
| 227 return renderBox()->height(); | 227 return renderBox()->height(); |
| 228 } | 228 } |
| 229 | 229 |
| 230 } // namespace WebCore | 230 } // namespace WebCore |
| OLD | NEW |