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