| 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 738 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 749 m_animateScheduled = true; | 749 m_animateScheduled = true; |
| 750 m_delegate->postDelayedTask(new HostMethodTask(this, &WebTestProxyBase::
animateNow), 1); | 750 m_delegate->postDelayedTask(new HostMethodTask(this, &WebTestProxyBase::
animateNow), 1); |
| 751 } | 751 } |
| 752 } | 752 } |
| 753 | 753 |
| 754 void WebTestProxyBase::animateNow() | 754 void WebTestProxyBase::animateNow() |
| 755 { | 755 { |
| 756 if (m_animateScheduled) { | 756 if (m_animateScheduled) { |
| 757 m_animateScheduled = false; | 757 m_animateScheduled = false; |
| 758 webWidget()->animate(0.0); | 758 webWidget()->animate(0.0); |
| 759 webWidget()->layout(); |
| 759 } | 760 } |
| 760 } | 761 } |
| 761 | 762 |
| 762 void WebTestProxyBase::show(WebNavigationPolicy) | 763 void WebTestProxyBase::show(WebNavigationPolicy) |
| 763 { | 764 { |
| 764 invalidateAll(); | 765 invalidateAll(); |
| 765 } | 766 } |
| 766 | 767 |
| 767 void WebTestProxyBase::setWindowRect(const WebRect& rect) | 768 void WebTestProxyBase::setWindowRect(const WebRect& rect) |
| 768 { | 769 { |
| (...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1372 | 1373 |
| 1373 void WebTestProxyBase::resetInputMethod() | 1374 void WebTestProxyBase::resetInputMethod() |
| 1374 { | 1375 { |
| 1375 // If a composition text exists, then we need to let the browser process | 1376 // If a composition text exists, then we need to let the browser process |
| 1376 // to cancel the input method's ongoing composition session. | 1377 // to cancel the input method's ongoing composition session. |
| 1377 if (m_webWidget) | 1378 if (m_webWidget) |
| 1378 m_webWidget->confirmComposition(); | 1379 m_webWidget->confirmComposition(); |
| 1379 } | 1380 } |
| 1380 | 1381 |
| 1381 } | 1382 } |
| OLD | NEW |