| Index: third_party/WebKit/Source/core/input/GestureManager.cpp
|
| diff --git a/third_party/WebKit/Source/core/input/GestureManager.cpp b/third_party/WebKit/Source/core/input/GestureManager.cpp
|
| index 131f5d8b890a11e0152421081e9b67e22fa29536..1554c160209746c014aef38a7062dd7aeea547db 100644
|
| --- a/third_party/WebKit/Source/core/input/GestureManager.cpp
|
| +++ b/third_party/WebKit/Source/core/input/GestureManager.cpp
|
| @@ -175,9 +175,9 @@ WebInputEventResult GestureManager::HandleGestureTap(
|
| // FIXME: Use a hit-test cache to avoid unnecessary hit tests.
|
| // http://crbug.com/398920
|
| if (current_hit_test.InnerNode()) {
|
| - LocalFrame* main_frame = frame_->LocalFrameRoot();
|
| - if (main_frame && main_frame->View())
|
| - main_frame->View()->UpdateLifecycleToCompositingCleanPlusScrolling();
|
| + LocalFrame& main_frame = frame_->LocalFrameRoot();
|
| + if (main_frame.View())
|
| + main_frame.View()->UpdateLifecycleToCompositingCleanPlusScrolling();
|
| adjusted_point = frame_view->RootFrameToContents(
|
| FlooredIntPoint(gesture_event.PositionInRootFrame()));
|
| current_hit_test = EventHandlingUtil::HitTestResultInFrame(
|
| @@ -237,9 +237,9 @@ WebInputEventResult GestureManager::HandleGestureTap(
|
| // FIXME: Use a hit-test cache to avoid unnecessary hit tests.
|
| // http://crbug.com/398920
|
| if (current_hit_test.InnerNode()) {
|
| - LocalFrame* main_frame = frame_->LocalFrameRoot();
|
| - if (main_frame && main_frame->View())
|
| - main_frame->View()->UpdateAllLifecyclePhases();
|
| + LocalFrame& main_frame = frame_->LocalFrameRoot();
|
| + if (main_frame.View())
|
| + main_frame.View()->UpdateAllLifecyclePhases();
|
| adjusted_point = frame_view->RootFrameToContents(tapped_position);
|
| current_hit_test = EventHandlingUtil::HitTestResultInFrame(
|
| frame_, adjusted_point, hit_type);
|
|
|