| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2012 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 480 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 491 WebRect windowRect = windowRectInScreen(); | 491 WebRect windowRect = windowRectInScreen(); |
| 492 return IntRect(0, 0, windowRect.width, windowRect.height) | 492 return IntRect(0, 0, windowRect.width, windowRect.height) |
| 493 .contains(IntPoint(pointInWindow.x, pointInWindow.y)); | 493 .contains(IntPoint(pointInWindow.x, pointInWindow.y)); |
| 494 } | 494 } |
| 495 | 495 |
| 496 WebInputEventResult WebPagePopupImpl::handleInputEvent( | 496 WebInputEventResult WebPagePopupImpl::handleInputEvent( |
| 497 const WebInputEvent& event) { | 497 const WebInputEvent& event) { |
| 498 if (m_closing) | 498 if (m_closing) |
| 499 return WebInputEventResult::NotHandled; | 499 return WebInputEventResult::NotHandled; |
| 500 return PageWidgetDelegate::handleInputEvent( | 500 return PageWidgetDelegate::handleInputEvent( |
| 501 *this, event, m_page->deprecatedLocalMainFrame()); | 501 *this, WebCoalescedInputEvent(event), m_page->deprecatedLocalMainFrame()); |
| 502 } | 502 } |
| 503 | 503 |
| 504 void WebPagePopupImpl::setFocus(bool enable) { | 504 void WebPagePopupImpl::setFocus(bool enable) { |
| 505 if (!m_page) | 505 if (!m_page) |
| 506 return; | 506 return; |
| 507 m_page->focusController().setFocused(enable); | 507 m_page->focusController().setFocused(enable); |
| 508 if (enable) | 508 if (enable) |
| 509 m_page->focusController().setActive(true); | 509 m_page->focusController().setActive(true); |
| 510 } | 510 } |
| 511 | 511 |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 583 // A WebPagePopupImpl instance usually has two references. | 583 // A WebPagePopupImpl instance usually has two references. |
| 584 // - One owned by the instance itself. It represents the visible widget. | 584 // - One owned by the instance itself. It represents the visible widget. |
| 585 // - One owned by a WebViewImpl. It's released when the WebViewImpl ask the | 585 // - One owned by a WebViewImpl. It's released when the WebViewImpl ask the |
| 586 // WebPagePopupImpl to close. | 586 // WebPagePopupImpl to close. |
| 587 // We need them because the closing operation is asynchronous and the widget | 587 // We need them because the closing operation is asynchronous and the widget |
| 588 // can be closed while the WebViewImpl is unaware of it. | 588 // can be closed while the WebViewImpl is unaware of it. |
| 589 return adoptRef(new WebPagePopupImpl(client)).leakRef(); | 589 return adoptRef(new WebPagePopupImpl(client)).leakRef(); |
| 590 } | 590 } |
| 591 | 591 |
| 592 } // namespace blink | 592 } // namespace blink |
| OLD | NEW |