| 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) 2001 Dirk Mueller (mueller@kde.org) | 4 * (C) 2001 Dirk Mueller (mueller@kde.org) |
| 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) | 5 * (C) 2006 Alexey Proskuryakov (ap@webkit.org) |
| 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r
ights reserved. | 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All r
ights reserved. |
| 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) | 7 * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.t
orchmobile.com/) |
| 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. | 8 * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved. |
| 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) | 9 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies) |
| 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. | 10 * Copyright (C) Research In Motion Limited 2010-2011. All rights reserved. |
| (...skipping 3309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3320 newFocusedElement = 0; | 3320 newFocusedElement = 0; |
| 3321 } | 3321 } |
| 3322 | 3322 |
| 3323 if (view()) { | 3323 if (view()) { |
| 3324 Widget* oldWidget = widgetForElement(*oldFocusedElement); | 3324 Widget* oldWidget = widgetForElement(*oldFocusedElement); |
| 3325 if (oldWidget) | 3325 if (oldWidget) |
| 3326 oldWidget->setFocus(false); | 3326 oldWidget->setFocus(false); |
| 3327 else | 3327 else |
| 3328 view()->setFocus(false); | 3328 view()->setFocus(false); |
| 3329 } | 3329 } |
| 3330 | |
| 3331 // Autofill client may have modified the value of newFocusedElement, thu
s require | |
| 3332 // a layout update here, otherwise it will assert at newFocusedElement->
isFocusable(). | |
| 3333 // See crbug.com/251163. | |
| 3334 updateLayoutIgnorePendingStylesheets(); | |
| 3335 } | 3330 } |
| 3336 | 3331 |
| 3337 if (newFocusedElement && newFocusedElement->isFocusable()) { | 3332 if (newFocusedElement && newFocusedElement->isFocusable()) { |
| 3338 if (newFocusedElement->isRootEditableElement() && !acceptsEditingFocus(*
newFocusedElement)) { | 3333 if (newFocusedElement->isRootEditableElement() && !acceptsEditingFocus(*
newFocusedElement)) { |
| 3339 // delegate blocks focus change | 3334 // delegate blocks focus change |
| 3340 focusChangeBlocked = true; | 3335 focusChangeBlocked = true; |
| 3341 goto SetFocusedElementDone; | 3336 goto SetFocusedElementDone; |
| 3342 } | 3337 } |
| 3343 // Set focus on the new node | 3338 // Set focus on the new node |
| 3344 m_focusedElement = newFocusedElement; | 3339 m_focusedElement = newFocusedElement; |
| (...skipping 1869 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5214 } | 5209 } |
| 5215 | 5210 |
| 5216 FastTextAutosizer* Document::fastTextAutosizer() | 5211 FastTextAutosizer* Document::fastTextAutosizer() |
| 5217 { | 5212 { |
| 5218 if (!m_fastTextAutosizer && RuntimeEnabledFeatures::fastTextAutosizingEnable
d()) | 5213 if (!m_fastTextAutosizer && RuntimeEnabledFeatures::fastTextAutosizingEnable
d()) |
| 5219 m_fastTextAutosizer = FastTextAutosizer::create(this); | 5214 m_fastTextAutosizer = FastTextAutosizer::create(this); |
| 5220 return m_fastTextAutosizer.get(); | 5215 return m_fastTextAutosizer.get(); |
| 5221 } | 5216 } |
| 5222 | 5217 |
| 5223 } // namespace WebCore | 5218 } // namespace WebCore |
| OLD | NEW |