| Index: third_party/WebKit/Source/web/ChromeClientImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/ChromeClientImpl.cpp b/third_party/WebKit/Source/web/ChromeClientImpl.cpp
|
| index fe305d710d0976991055240956d2968d912944f3..fcd9cb7a8461f10e88bd7f708d675a918ba7dc3e 100644
|
| --- a/third_party/WebKit/Source/web/ChromeClientImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/ChromeClientImpl.cpp
|
| @@ -454,7 +454,7 @@ bool ChromeClientImpl::ShouldReportDetailedMessageForSource(
|
| LocalFrame& local_frame,
|
| const String& url) {
|
| WebLocalFrameImpl* webframe =
|
| - WebLocalFrameImpl::FromFrame(local_frame.LocalFrameRoot());
|
| + WebLocalFrameImpl::FromFrame(&local_frame.LocalFrameRoot());
|
| return webframe && webframe->Client() &&
|
| webframe->Client()->ShouldReportDetailedMessageForSource(url);
|
| }
|
| @@ -555,7 +555,7 @@ void ChromeClientImpl::InvalidateRect(const IntRect& update_rect) {
|
| }
|
|
|
| void ChromeClientImpl::ScheduleAnimation(LocalFrame* frame) {
|
| - frame = frame->LocalFrameRoot();
|
| + frame = &frame->LocalFrameRoot();
|
| // If the frame is still being created, it might not yet have a WebWidget.
|
| // FIXME: Is this the right thing to do? Is there a way to avoid having
|
| // a local frame root that doesn't have a WebWidget? During initialization
|
| @@ -572,10 +572,10 @@ IntRect ChromeClientImpl::ViewportToScreen(
|
|
|
| DCHECK(frame_view_base->IsFrameView());
|
| const FrameView* view = ToFrameView(frame_view_base);
|
| - LocalFrame* frame = view->GetFrame().LocalFrameRoot();
|
| + LocalFrame& frame = view->GetFrame().LocalFrameRoot();
|
|
|
| WebWidgetClient* client =
|
| - WebLocalFrameImpl::FromFrame(frame)->FrameWidget()->Client();
|
| + WebLocalFrameImpl::FromFrame(&frame)->FrameWidget()->Client();
|
|
|
| if (client) {
|
| client->ConvertViewportToWindow(&screen_rect);
|
| @@ -781,9 +781,9 @@ void ChromeClientImpl::SetCursor(const WebCursorInfo& cursor,
|
| return;
|
| #endif
|
|
|
| - LocalFrame* local_root = local_frame->LocalFrameRoot();
|
| + LocalFrame& local_root = local_frame->LocalFrameRoot();
|
| if (WebFrameWidgetBase* widget =
|
| - WebLocalFrameImpl::FromFrame(local_root)->FrameWidget())
|
| + WebLocalFrameImpl::FromFrame(&local_root)->FrameWidget())
|
| widget->Client()->DidChangeCursor(cursor);
|
| }
|
|
|
| @@ -878,9 +878,9 @@ void ChromeClientImpl::FullscreenElementChanged(Element* from_element,
|
| }
|
|
|
| void ChromeClientImpl::ClearCompositedSelection(LocalFrame* frame) {
|
| - LocalFrame* local_root = frame->LocalFrameRoot();
|
| + LocalFrame& local_root = frame->LocalFrameRoot();
|
| WebFrameWidgetBase* widget =
|
| - WebLocalFrameImpl::FromFrame(local_root)->FrameWidget();
|
| + WebLocalFrameImpl::FromFrame(&local_root)->FrameWidget();
|
| WebWidgetClient* client = widget->Client();
|
| if (!client)
|
| return;
|
| @@ -892,9 +892,9 @@ void ChromeClientImpl::ClearCompositedSelection(LocalFrame* frame) {
|
| void ChromeClientImpl::UpdateCompositedSelection(
|
| LocalFrame* frame,
|
| const CompositedSelection& selection) {
|
| - LocalFrame* local_root = frame->LocalFrameRoot();
|
| + LocalFrame& local_root = frame->LocalFrameRoot();
|
| WebFrameWidgetBase* widget =
|
| - WebLocalFrameImpl::FromFrame(local_root)->FrameWidget();
|
| + WebLocalFrameImpl::FromFrame(&local_root)->FrameWidget();
|
| WebWidgetClient* client = widget->Client();
|
| if (!client)
|
| return;
|
| @@ -1055,16 +1055,16 @@ void ChromeClientImpl::SetTouchAction(LocalFrame* frame,
|
| }
|
|
|
| bool ChromeClientImpl::RequestPointerLock(LocalFrame* frame) {
|
| - LocalFrame* local_root = frame->LocalFrameRoot();
|
| - return WebLocalFrameImpl::FromFrame(local_root)
|
| + LocalFrame& local_root = frame->LocalFrameRoot();
|
| + return WebLocalFrameImpl::FromFrame(&local_root)
|
| ->FrameWidget()
|
| ->Client()
|
| ->RequestPointerLock();
|
| }
|
|
|
| void ChromeClientImpl::RequestPointerUnlock(LocalFrame* frame) {
|
| - LocalFrame* local_root = frame->LocalFrameRoot();
|
| - return WebLocalFrameImpl::FromFrame(local_root)
|
| + LocalFrame& local_root = frame->LocalFrameRoot();
|
| + return WebLocalFrameImpl::FromFrame(&local_root)
|
| ->FrameWidget()
|
| ->Client()
|
| ->RequestPointerUnlock();
|
|
|