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

Unified Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/web/WebViewImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
index 98b04285fcb22d795e62fbf56591a796e7734f21..ef0ac7cff9a7623d37db5c1d89c5282821deb4c2 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -279,9 +279,9 @@ UserGestureNotifier::~UserGestureNotifier()
class EmptyEventListener final : public EventListener {
public:
- static PassRefPtrWillBeRawPtr<EmptyEventListener> create()
+ static RawPtr<EmptyEventListener> create()
{
- return adoptRefWillBeNoop(new EmptyEventListener());
+ return new EmptyEventListener();
}
bool operator==(const EventListener& other) const override
@@ -826,7 +826,7 @@ WebInputEventResult WebViewImpl::handleGestureEvent(const WebGestureEvent& event
if (m_webSettings->multiTargetTapNotificationEnabled()) {
Vector<IntRect> goodTargets;
- WillBeHeapVector<RawPtrWillBeMember<Node>> highlightNodes;
+ HeapVector<Member<Node>> highlightNodes;
findGoodTouchTargets(boundingBox, mainFrameImpl()->frame(), goodTargets, highlightNodes);
// FIXME: replace touch adjustment code when numberOfGoodTargets == 1?
// Single candidate case is currently handled by: https://bugs.webkit.org/show_bug.cgi?id=85101
@@ -1065,7 +1065,7 @@ WebInputEventResult WebViewImpl::handleKeyEvent(const WebKeyboardEvent& event)
return WebInputEventResult::HandledSystem;
}
- RefPtrWillBeRawPtr<Frame> focusedFrame = focusedCoreFrame();
+ RawPtr<Frame> focusedFrame = focusedCoreFrame();
if (focusedFrame && focusedFrame->isRemoteFrame()) {
WebRemoteFrameImpl* webFrame = WebRemoteFrameImpl::fromFrame(*toRemoteFrame(focusedFrame.get()));
webFrame->client()->forwardInputEvent(&event);
@@ -1379,13 +1379,13 @@ void WebViewImpl::enableTapHighlightAtPoint(const GestureEventWithHitTestResults
{
Node* touchNode = bestTapNode(targetedTapEvent);
- WillBeHeapVector<RawPtrWillBeMember<Node>> highlightNodes;
+ HeapVector<Member<Node>> highlightNodes;
highlightNodes.append(touchNode);
enableTapHighlights(highlightNodes);
}
-void WebViewImpl::enableTapHighlights(WillBeHeapVector<RawPtrWillBeMember<Node>>& highlightNodes)
+void WebViewImpl::enableTapHighlights(HeapVector<Member<Node>>& highlightNodes)
{
if (highlightNodes.isEmpty())
return;
@@ -1519,7 +1519,7 @@ WebInputEventResult WebViewImpl::sendContextMenuEvent(const WebKeyboardEvent& ev
}
#endif
-void WebViewImpl::showContextMenuAtPoint(float x, float y, PassRefPtrWillBeRawPtr<ContextMenuProvider> menuProvider)
+void WebViewImpl::showContextMenuAtPoint(float x, float y, RawPtr<ContextMenuProvider> menuProvider)
{
if (!page()->mainFrame()->isLocalFrame())
return;
@@ -2144,7 +2144,7 @@ WebInputEventResult WebViewImpl::handleInputEvent(const WebInputEvent& inputEven
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)
@@ -2220,7 +2220,7 @@ void WebViewImpl::setFocus(bool enable)
m_page->focusController().setFocused(enable);
if (enable) {
m_page->focusController().setActive(true);
- RefPtrWillBeRawPtr<LocalFrame> focusedFrame = m_page->focusController().focusedFrame();
+ RawPtr<LocalFrame> focusedFrame = m_page->focusController().focusedFrame();
if (focusedFrame) {
Element* element = focusedFrame->document()->focusedElement();
if (element && focusedFrame->selection().selection().isNone()) {
@@ -2252,7 +2252,7 @@ void WebViewImpl::setFocus(bool enable)
if (!frame)
return;
- RefPtrWillBeRawPtr<LocalFrame> focusedFrame = m_page->focusController().focusedFrame();
+ RawPtr<LocalFrame> focusedFrame = m_page->focusController().focusedFrame();
if (focusedFrame) {
// Finish an ongoing composition to delete the composition node.
if (focusedFrame->inputMethodController().hasComposition()) {
@@ -2873,17 +2873,17 @@ void WebViewImpl::setInitialFocus(bool reverse)
void WebViewImpl::clearFocusedElement()
{
- RefPtrWillBeRawPtr<Frame> frame = focusedCoreFrame();
+ RawPtr<Frame> frame = focusedCoreFrame();
if (!frame || !frame->isLocalFrame())
return;
LocalFrame* localFrame = toLocalFrame(frame.get());
- RefPtrWillBeRawPtr<Document> document = localFrame->document();
+ RawPtr<Document> document = localFrame->document();
if (!document)
return;
- RefPtrWillBeRawPtr<Element> oldFocusedElement = document->focusedElement();
+ RawPtr<Element> oldFocusedElement = document->focusedElement();
document->clearFocusedElement();
if (!oldFocusedElement)
return;
@@ -3377,7 +3377,7 @@ void WebViewImpl::updateMainFrameLayoutSize()
if (m_shouldAutoResize || !mainFrameImpl())
return;
- RefPtrWillBeRawPtr<FrameView> view = mainFrameImpl()->frameView();
+ RawPtr<FrameView> view = mainFrameImpl()->frameView();
if (!view)
return;
@@ -3462,11 +3462,11 @@ void WebViewImpl::performMediaPlayerAction(const WebMediaPlayerAction& action,
const WebPoint& location)
{
HitTestResult result = hitTestResultForViewportPos(location);
- RefPtrWillBeRawPtr<Node> node = result.innerNode();
+ RawPtr<Node> node = result.innerNode();
if (!isHTMLVideoElement(*node) && !isHTMLAudioElement(*node))
return;
- RefPtrWillBeRawPtr<HTMLMediaElement> mediaElement = static_pointer_cast<HTMLMediaElement>(node);
+ RawPtr<HTMLMediaElement> mediaElement = static_pointer_cast<HTMLMediaElement>(node);
switch (action.type) {
case WebMediaPlayerAction::Play:
if (action.enable)
@@ -3493,7 +3493,7 @@ void WebViewImpl::performPluginAction(const WebPluginAction& action,
{
// FIXME: Location is probably in viewport coordinates
HitTestResult result = hitTestResultForRootFramePos(location);
- RefPtrWillBeRawPtr<Node> node = result.innerNode();
+ RawPtr<Node> node = result.innerNode();
if (!isHTMLObjectElement(*node) && !isHTMLEmbedElement(*node))
return;
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.h ('k') | third_party/WebKit/Source/web/WorkerContentSettingsClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698