Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Side by Side Diff: content/browser/frame_host/render_widget_host_view_guest.cc

Issue 2015373002: Fix webview crash on attempt to scroll. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixed content_tests (handle case when view is not available), added expected event into Fling test … Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/browser/frame_host/render_widget_host_view_guest.h" 5 #include "content/browser/frame_host/render_widget_host_view_guest.h"
6 6
7 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 } // namespace 67 } // namespace
68 68
69 RenderWidgetHostViewGuest::RenderWidgetHostViewGuest( 69 RenderWidgetHostViewGuest::RenderWidgetHostViewGuest(
70 RenderWidgetHost* widget_host, 70 RenderWidgetHost* widget_host,
71 BrowserPluginGuest* guest, 71 BrowserPluginGuest* guest,
72 base::WeakPtr<RenderWidgetHostViewBase> platform_view) 72 base::WeakPtr<RenderWidgetHostViewBase> platform_view)
73 : RenderWidgetHostViewChildFrame(widget_host), 73 : RenderWidgetHostViewChildFrame(widget_host),
74 // |guest| is NULL during test. 74 // |guest| is NULL during test.
75 guest_(guest ? guest->AsWeakPtr() : base::WeakPtr<BrowserPluginGuest>()), 75 guest_(guest ? guest->AsWeakPtr() : base::WeakPtr<BrowserPluginGuest>()),
76 platform_view_(platform_view) { 76 platform_view_(platform_view) {
77 gfx::NativeView view = GetNativeView();
78 if (view)
79 UpdateScreenInfo(view);
77 } 80 }
78 81
79 RenderWidgetHostViewGuest::~RenderWidgetHostViewGuest() {} 82 RenderWidgetHostViewGuest::~RenderWidgetHostViewGuest() {}
80 83
81 bool RenderWidgetHostViewGuest::OnMessageReceivedFromEmbedder( 84 bool RenderWidgetHostViewGuest::OnMessageReceivedFromEmbedder(
82 const IPC::Message& message, 85 const IPC::Message& message,
83 RenderWidgetHostImpl* embedder) { 86 RenderWidgetHostImpl* embedder) {
84 bool handled = true; 87 bool handled = true;
85 IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(RenderWidgetHostViewGuest, message, 88 IPC_BEGIN_MESSAGE_MAP_WITH_PARAM(RenderWidgetHostViewGuest, message,
86 embedder) 89 embedder)
(...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 gesture_event.data.scrollUpdate.inertialPhase == 603 gesture_event.data.scrollUpdate.inertialPhase ==
601 blink::WebGestureEvent::MomentumPhase) { 604 blink::WebGestureEvent::MomentumPhase) {
602 return; 605 return;
603 } 606 }
604 host_->ForwardGestureEvent(gesture_event); 607 host_->ForwardGestureEvent(gesture_event);
605 return; 608 return;
606 } 609 }
607 } 610 }
608 611
609 } // namespace content 612 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698