OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2011, 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 1414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1425 { | 1425 { |
1426 instrumentBeginFrame(); | 1426 instrumentBeginFrame(); |
1427 m_client->willBeginCompositorFrame(); | 1427 m_client->willBeginCompositorFrame(); |
1428 } | 1428 } |
1429 | 1429 |
1430 void WebViewImpl::updateAnimations(double monotonicFrameBeginTime) | 1430 void WebViewImpl::updateAnimations(double monotonicFrameBeginTime) |
1431 { | 1431 { |
1432 #if ENABLE(REQUEST_ANIMATION_FRAME) | 1432 #if ENABLE(REQUEST_ANIMATION_FRAME) |
1433 TRACE_EVENT("WebViewImpl::updateAnimations", this, 0); | 1433 TRACE_EVENT("WebViewImpl::updateAnimations", this, 0); |
1434 | 1434 |
| 1435 WebFrameImpl* webframe = mainFrameImpl(); |
| 1436 if (!webframe) |
| 1437 return; |
| 1438 FrameView* view = webframe->frameView(); |
| 1439 if (!view) |
| 1440 return; |
| 1441 |
1435 // Create synthetic wheel events as necessary for fling. | 1442 // Create synthetic wheel events as necessary for fling. |
1436 if (m_gestureAnimation) { | 1443 if (m_gestureAnimation) { |
1437 if (m_gestureAnimation->animate(monotonicFrameBeginTime)) | 1444 if (m_gestureAnimation->animate(monotonicFrameBeginTime)) |
1438 scheduleAnimation(); | 1445 scheduleAnimation(); |
1439 else | 1446 else |
1440 m_gestureAnimation.clear(); | 1447 m_gestureAnimation.clear(); |
1441 } | 1448 } |
1442 | 1449 |
1443 if (!m_page) | |
1444 return; | |
1445 | |
1446 PageWidgetDelegate::animate(m_page.get(), monotonicFrameBeginTime); | 1450 PageWidgetDelegate::animate(m_page.get(), monotonicFrameBeginTime); |
1447 #endif | 1451 #endif |
1448 } | 1452 } |
1449 | 1453 |
1450 void WebViewImpl::layout() | 1454 void WebViewImpl::layout() |
1451 { | 1455 { |
1452 TRACE_EVENT("WebViewImpl::layout", this, 0); | 1456 TRACE_EVENT("WebViewImpl::layout", this, 0); |
1453 PageWidgetDelegate::layout(m_page.get()); | 1457 PageWidgetDelegate::layout(m_page.get()); |
1454 } | 1458 } |
1455 | 1459 |
(...skipping 2068 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3524 const WebMouseEvent& mouseEvent = static_cast<const WebMouseEvent&>(event); | 3528 const WebMouseEvent& mouseEvent = static_cast<const WebMouseEvent&>(event); |
3525 | 3529 |
3526 if (page()) | 3530 if (page()) |
3527 page()->pointerLockController()->dispatchLockedMouseEvent( | 3531 page()->pointerLockController()->dispatchLockedMouseEvent( |
3528 PlatformMouseEventBuilder(mainFrameImpl()->frameView(), mouseEvent), | 3532 PlatformMouseEventBuilder(mainFrameImpl()->frameView(), mouseEvent), |
3529 eventType); | 3533 eventType); |
3530 } | 3534 } |
3531 #endif | 3535 #endif |
3532 | 3536 |
3533 } // namespace WebKit | 3537 } // namespace WebKit |
OLD | NEW |