| 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 194 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 205 url_ = AtomicString(str); | 205 url_ = AtomicString(str); |
| 206 | 206 |
| 207 if (isConnected()) | 207 if (isConnected()) |
| 208 OpenURL(false); | 208 OpenURL(false); |
| 209 } | 209 } |
| 210 | 210 |
| 211 bool HTMLFrameElementBase::SupportsFocus() const { | 211 bool HTMLFrameElementBase::SupportsFocus() const { |
| 212 return true; | 212 return true; |
| 213 } | 213 } |
| 214 | 214 |
| 215 void HTMLFrameElementBase::SetFocused(bool received) { | 215 void HTMLFrameElementBase::SetFocused(bool received, WebFocusType focus_type) { |
| 216 HTMLFrameOwnerElement::SetFocused(received); | 216 HTMLFrameOwnerElement::SetFocused(received, focus_type); |
| 217 if (Page* page = GetDocument().GetPage()) { | 217 if (Page* page = GetDocument().GetPage()) { |
| 218 if (received) { | 218 if (received) { |
| 219 page->GetFocusController().SetFocusedFrame(ContentFrame()); | 219 page->GetFocusController().SetFocusedFrame(ContentFrame()); |
| 220 } else if (page->GetFocusController().FocusedFrame() == ContentFrame()) { | 220 } else if (page->GetFocusController().FocusedFrame() == ContentFrame()) { |
| 221 // Focus may have already been given to another frame, don't take it away. | 221 // Focus may have already been given to another frame, don't take it away. |
| 222 page->GetFocusController().SetFocusedFrame(nullptr); | 222 page->GetFocusController().SetFocusedFrame(nullptr); |
| 223 } | 223 } |
| 224 } | 224 } |
| 225 } | 225 } |
| 226 | 226 |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 | 271 |
| 272 if (contentDocument()) { | 272 if (contentDocument()) { |
| 273 contentDocument()->WillChangeFrameOwnerProperties( | 273 contentDocument()->WillChangeFrameOwnerProperties( |
| 274 margin_width_, margin_height, scrolling_mode_, IsDisplayNone()); | 274 margin_width_, margin_height, scrolling_mode_, IsDisplayNone()); |
| 275 } | 275 } |
| 276 margin_height_ = margin_height; | 276 margin_height_ = margin_height; |
| 277 FrameOwnerPropertiesChanged(); | 277 FrameOwnerPropertiesChanged(); |
| 278 } | 278 } |
| 279 | 279 |
| 280 } // namespace blink | 280 } // namespace blink |
| OLD | NEW |