| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/shell/renderer/test_runner/WebTestProxy.h" | 5 #include "content/shell/renderer/test_runner/WebTestProxy.h" |
| 6 | 6 |
| 7 #include <cctype> | 7 #include <cctype> |
| 8 | 8 |
| 9 #include "content/shell/renderer/test_runner/AccessibilityController.h" | 9 #include "content/shell/renderer/test_runner/AccessibilityController.h" |
| 10 #include "content/shell/renderer/test_runner/EventSender.h" | 10 #include "content/shell/renderer/test_runner/EventSender.h" |
| (...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 731 | 731 |
| 732 void WebTestProxyBase::animateNow() | 732 void WebTestProxyBase::animateNow() |
| 733 { | 733 { |
| 734 if (m_animateScheduled) { | 734 if (m_animateScheduled) { |
| 735 m_animateScheduled = false; | 735 m_animateScheduled = false; |
| 736 webWidget()->animate(0.0); | 736 webWidget()->animate(0.0); |
| 737 webWidget()->layout(); | 737 webWidget()->layout(); |
| 738 } | 738 } |
| 739 } | 739 } |
| 740 | 740 |
| 741 bool WebTestProxyBase::isCompositorFramePending() const |
| 742 { |
| 743 return m_animateScheduled || !m_paintRect.isEmpty(); |
| 744 } |
| 745 |
| 741 void WebTestProxyBase::show(WebNavigationPolicy) | 746 void WebTestProxyBase::show(WebNavigationPolicy) |
| 742 { | 747 { |
| 743 invalidateAll(); | 748 invalidateAll(); |
| 744 } | 749 } |
| 745 | 750 |
| 746 void WebTestProxyBase::setWindowRect(const WebRect& rect) | 751 void WebTestProxyBase::setWindowRect(const WebRect& rect) |
| 747 { | 752 { |
| 748 invalidateAll(); | 753 invalidateAll(); |
| 749 discardBackingStore(); | 754 discardBackingStore(); |
| 750 } | 755 } |
| (...skipping 596 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1347 | 1352 |
| 1348 void WebTestProxyBase::resetInputMethod() | 1353 void WebTestProxyBase::resetInputMethod() |
| 1349 { | 1354 { |
| 1350 // If a composition text exists, then we need to let the browser process | 1355 // If a composition text exists, then we need to let the browser process |
| 1351 // to cancel the input method's ongoing composition session. | 1356 // to cancel the input method's ongoing composition session. |
| 1352 if (m_webWidget) | 1357 if (m_webWidget) |
| 1353 m_webWidget->confirmComposition(); | 1358 m_webWidget->confirmComposition(); |
| 1354 } | 1359 } |
| 1355 | 1360 |
| 1356 } | 1361 } |
| OLD | NEW |