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

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

Issue 2547053003: s/ passed(...) / WTF::passed(...) / to avoid future ambiguity w/ base::Passed. (Closed)
Patch Set: Rebasing... Created 4 years 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 9c99761c650aaa6f37a2e061928317b80a000ceb..a3385911ce5d3f9c65ae83beed3686e6af0325c1 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -301,7 +301,7 @@ void WebView::resetVisitedLinkState(bool invalidateVisitedLinkHashes) {
}
void WebView::willEnterModalLoop() {
- pageSuspenderStack().append(makeUnique<ScopedPageSuspender>());
+ pageSuspenderStack().append(WTF::makeUnique<ScopedPageSuspender>());
}
void WebView::didExitModalLoop() {
@@ -383,11 +383,11 @@ WebViewImpl::WebViewImpl(WebViewClient* client,
m_displayMode(WebDisplayModeBrowser),
m_elasticOverscroll(FloatSize()),
m_mutator(nullptr),
- m_scheduler(wrapUnique(Platform::current()
- ->currentThread()
- ->scheduler()
- ->createWebViewScheduler(this, this)
- .release())),
+ m_scheduler(WTF::wrapUnique(Platform::current()
+ ->currentThread()
+ ->scheduler()
+ ->createWebViewScheduler(this, this)
+ .release())),
m_lastFrameTimeMonotonic(0),
m_overrideCompositorVisibility(false) {
Page::PageClients pageClients;
@@ -717,7 +717,7 @@ WebInputEventResult WebViewImpl::handleGestureEvent(
m_flingSourceDevice = event.sourceDevice;
DCHECK_NE(m_flingSourceDevice, WebGestureDeviceUninitialized);
std::unique_ptr<WebGestureCurve> flingCurve =
- wrapUnique(Platform::current()->createFlingAnimationCurve(
+ WTF::wrapUnique(Platform::current()->createFlingAnimationCurve(
event.sourceDevice,
WebFloatPoint(event.data.flingStart.velocityX,
event.data.flingStart.velocityY),
@@ -965,7 +965,7 @@ void WebViewImpl::transferActiveWheelFlingAnimation(
m_globalPositionOnFlingStart = parameters.globalPoint;
m_flingModifier = parameters.modifiers;
std::unique_ptr<WebGestureCurve> curve =
- wrapUnique(Platform::current()->createFlingAnimationCurve(
+ WTF::wrapUnique(Platform::current()->createFlingAnimationCurve(
parameters.sourceDevice, WebFloatPoint(parameters.delta),
parameters.cumulativeScroll));
DCHECK(curve);
@@ -2185,14 +2185,14 @@ WebInputEventResult WebViewImpl::handleInputEvent(
break;
case WebInputEvent::MouseDown:
eventType = EventTypeNames::mousedown;
- gestureIndicator = wrapUnique(
+ gestureIndicator = WTF::wrapUnique(
new UserGestureIndicator(DocumentUserGestureToken::create(
&node->document(), UserGestureToken::NewGesture)));
m_mouseCaptureGestureToken = gestureIndicator->currentToken();
break;
case WebInputEvent::MouseUp:
eventType = EventTypeNames::mouseup;
- gestureIndicator = wrapUnique(
+ gestureIndicator = WTF::wrapUnique(
new UserGestureIndicator(m_mouseCaptureGestureToken.release()));
break;
default:
@@ -2590,7 +2590,7 @@ void WebViewImpl::applyReplacementRange(const WebRange& range) {
WebSettingsImpl* WebViewImpl::settingsImpl() {
if (!m_webSettings)
- m_webSettings = wrapUnique(
+ m_webSettings = WTF::wrapUnique(
new WebSettingsImpl(&m_page->settings(), m_devToolsEmulator.get()));
DCHECK(m_webSettings);
return m_webSettings.get();
@@ -3740,8 +3740,8 @@ void WebViewImpl::setPageOverlayColor(WebColor color) {
if (color == Color::transparent)
return;
- m_pageColorOverlay =
- PageOverlay::create(mainFrameImpl(), makeUnique<ColorOverlay>(color));
+ m_pageColorOverlay = PageOverlay::create(
+ mainFrameImpl(), WTF::makeUnique<ColorOverlay>(color));
m_pageColorOverlay->update();
}
@@ -4132,15 +4132,15 @@ void WebViewImpl::pointerLockMouseEvent(const WebInputEvent& event) {
eventType = EventTypeNames::mousedown;
if (!page() || !page()->pointerLockController().element())
break;
- gestureIndicator =
- wrapUnique(new UserGestureIndicator(DocumentUserGestureToken::create(
+ gestureIndicator = WTF::wrapUnique(
+ new UserGestureIndicator(DocumentUserGestureToken::create(
&page()->pointerLockController().element()->document(),
UserGestureToken::NewGesture)));
m_pointerLockGestureToken = gestureIndicator->currentToken();
break;
case WebInputEvent::MouseUp:
eventType = EventTypeNames::mouseup;
- gestureIndicator = wrapUnique(
+ gestureIndicator = WTF::wrapUnique(
new UserGestureIndicator(m_pointerLockGestureToken.release()));
break;
case WebInputEvent::MouseMove:
« no previous file with comments | « third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp ('k') | third_party/WebKit/Source/web/tests/ActivityLoggerTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698