Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). | 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 204 if (toNode && toNode->isElementNode() && toElement(toNode)->isLiveLink() && toNode->shouldHaveFocusAppearance()) | 204 if (toNode && toNode->isElementNode() && toElement(toNode)->isLiveLink() && toNode->shouldHaveFocusAppearance()) |
| 205 focusURL = toElement(toNode)->hrefURL(); | 205 focusURL = toElement(toNode)->hrefURL(); |
| 206 m_webView->client()->setKeyboardFocusURL(focusURL); | 206 m_webView->client()->setKeyboardFocusURL(focusURL); |
| 207 } | 207 } |
| 208 | 208 |
| 209 void ChromeClientImpl::focusedFrameChanged(LocalFrame* frame) | 209 void ChromeClientImpl::focusedFrameChanged(LocalFrame* frame) |
| 210 { | 210 { |
| 211 WebLocalFrameImpl* webframe = WebLocalFrameImpl::fromFrame(frame); | 211 WebLocalFrameImpl* webframe = WebLocalFrameImpl::fromFrame(frame); |
| 212 if (webframe && webframe->client()) | 212 if (webframe && webframe->client()) |
| 213 webframe->client()->frameFocused(); | 213 webframe->client()->frameFocused(); |
| 214 | |
| 215 m_webView->client()->focusedFrameChanged(); | |
|
dcheng
2015/09/17 21:54:08
How come we can't just piggyback off the WebFrameC
dmazzoni
2015/09/17 22:11:57
That goes to only the frame that got focus.
To av
| |
| 214 } | 216 } |
| 215 | 217 |
| 216 namespace { | 218 namespace { |
| 217 | 219 |
| 218 void updatePolicyForEvent(const WebInputEvent* inputEvent, NavigationPolicy* pol icy) | 220 void updatePolicyForEvent(const WebInputEvent* inputEvent, NavigationPolicy* pol icy) |
| 219 { | 221 { |
| 220 if (!inputEvent) | 222 if (!inputEvent) |
| 221 return; | 223 return; |
| 222 | 224 |
| 223 unsigned short buttonNumber = 0; | 225 unsigned short buttonNumber = 0; |
| (...skipping 771 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 995 for (const auto& observer : observers) | 997 for (const auto& observer : observers) |
| 996 observer->willOpenPopup(); | 998 observer->willOpenPopup(); |
| 997 } | 999 } |
| 998 | 1000 |
| 999 FloatSize ChromeClientImpl::elasticOverscroll() const | 1001 FloatSize ChromeClientImpl::elasticOverscroll() const |
| 1000 { | 1002 { |
| 1001 return m_webView->elasticOverscroll(); | 1003 return m_webView->elasticOverscroll(); |
| 1002 } | 1004 } |
| 1003 | 1005 |
| 1004 } // namespace blink | 1006 } // namespace blink |
| OLD | NEW |