| Index: third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
|
| index a2be5873f8a5f343773a77898d6b10e475f85254..b021705641bc68ceed7cd314cba1f9c003992dd3 100644
|
| --- a/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp
|
| @@ -209,7 +209,7 @@ void WebFrameWidgetImpl::updateMainFrameLayoutSize()
|
| if (!m_localRoot)
|
| return;
|
|
|
| - RefPtrWillBeRawPtr<FrameView> view = m_localRoot->frameView();
|
| + RawPtr<FrameView> view = m_localRoot->frameView();
|
| if (!view)
|
| return;
|
|
|
| @@ -332,7 +332,7 @@ WebInputEventResult WebFrameWidgetImpl::handleInputEvent(const WebInputEvent& in
|
| if (m_mouseCaptureNode && WebInputEvent::isMouseEventType(inputEvent.type)) {
|
| TRACE_EVENT1("input", "captured mouse event", "type", inputEvent.type);
|
| // Save m_mouseCaptureNode since mouseCaptureLost() will clear it.
|
| - RefPtrWillBeRawPtr<Node> node = m_mouseCaptureNode;
|
| + RawPtr<Node> node = m_mouseCaptureNode;
|
|
|
| // Not all platforms call mouseCaptureLost() directly.
|
| if (inputEvent.type == WebInputEvent::MouseUp)
|
| @@ -412,7 +412,7 @@ void WebFrameWidgetImpl::setFocus(bool enable)
|
| page()->focusController().setFocused(enable);
|
| if (enable) {
|
| page()->focusController().setActive(true);
|
| - RefPtrWillBeRawPtr<LocalFrame> focusedFrame = page()->focusController().focusedFrame();
|
| + RawPtr<LocalFrame> focusedFrame = page()->focusController().focusedFrame();
|
| if (focusedFrame) {
|
| Element* element = focusedFrame->document()->focusedElement();
|
| if (element && focusedFrame->selection().selection().isNone()) {
|
| @@ -757,7 +757,7 @@ WebInputEventResult WebFrameWidgetImpl::handleKeyEvent(const WebKeyboardEvent& e
|
| // event.
|
| m_suppressNextKeypressEvent = false;
|
|
|
| - RefPtrWillBeRawPtr<Frame> focusedFrame = focusedCoreFrame();
|
| + RawPtr<Frame> focusedFrame = focusedCoreFrame();
|
| if (focusedFrame && focusedFrame->isRemoteFrame()) {
|
| WebRemoteFrameImpl* webFrame = WebRemoteFrameImpl::fromFrame(*toRemoteFrame(focusedFrame.get()));
|
| webFrame->client()->forwardInputEvent(&event);
|
| @@ -767,7 +767,7 @@ WebInputEventResult WebFrameWidgetImpl::handleKeyEvent(const WebKeyboardEvent& e
|
| if (!focusedFrame || !focusedFrame->isLocalFrame())
|
| return WebInputEventResult::NotHandled;
|
|
|
| - RefPtrWillBeRawPtr<LocalFrame> frame = toLocalFrame(focusedFrame.get());
|
| + RawPtr<LocalFrame> frame = toLocalFrame(focusedFrame.get());
|
|
|
| PlatformKeyboardEventBuilder evt(event);
|
|
|
|
|