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

Side by Side Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 2494333002: Replace wrapUnique(new T(args)) by makeUnique<T>(args) in Blink (Closed)
Patch Set: Drop redundant WTF:: Created 4 years, 1 month 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 /* 1 /*
2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
341 341
342 void WebView::updateVisitedLinkState(unsigned long long linkHash) { 342 void WebView::updateVisitedLinkState(unsigned long long linkHash) {
343 Page::visitedStateChanged(linkHash); 343 Page::visitedStateChanged(linkHash);
344 } 344 }
345 345
346 void WebView::resetVisitedLinkState(bool invalidateVisitedLinkHashes) { 346 void WebView::resetVisitedLinkState(bool invalidateVisitedLinkHashes) {
347 Page::allVisitedStateChanged(invalidateVisitedLinkHashes); 347 Page::allVisitedStateChanged(invalidateVisitedLinkHashes);
348 } 348 }
349 349
350 void WebView::willEnterModalLoop() { 350 void WebView::willEnterModalLoop() {
351 pageLoadDeferrerStack().append(wrapUnique(new ScopedPageLoadDeferrer())); 351 pageLoadDeferrerStack().append(makeUnique<ScopedPageLoadDeferrer>());
352 } 352 }
353 353
354 void WebView::didExitModalLoop() { 354 void WebView::didExitModalLoop() {
355 DCHECK(pageLoadDeferrerStack().size()); 355 DCHECK(pageLoadDeferrerStack().size());
356 pageLoadDeferrerStack().pop_back(); 356 pageLoadDeferrerStack().pop_back();
357 } 357 }
358 358
359 void WebViewImpl::setMainFrame(WebFrame* frame) { 359 void WebViewImpl::setMainFrame(WebFrame* frame) {
360 frame->toImplBase()->initializeCoreFrame(&page()->frameHost(), 0, nullAtom, 360 frame->toImplBase()->initializeCoreFrame(&page()->frameHost(), 0, nullAtom,
361 nullAtom); 361 nullAtom);
(...skipping 3534 matching lines...) Expand 10 before | Expand all | Expand 10 after
3896 } 3896 }
3897 3897
3898 void WebViewImpl::setPageOverlayColor(WebColor color) { 3898 void WebViewImpl::setPageOverlayColor(WebColor color) {
3899 if (m_pageColorOverlay) 3899 if (m_pageColorOverlay)
3900 m_pageColorOverlay.reset(); 3900 m_pageColorOverlay.reset();
3901 3901
3902 if (color == Color::transparent) 3902 if (color == Color::transparent)
3903 return; 3903 return;
3904 3904
3905 m_pageColorOverlay = 3905 m_pageColorOverlay =
3906 PageOverlay::create(mainFrameImpl(), wrapUnique(new ColorOverlay(color))); 3906 PageOverlay::create(mainFrameImpl(), makeUnique<ColorOverlay>(color));
3907 m_pageColorOverlay->update(); 3907 m_pageColorOverlay->update();
3908 } 3908 }
3909 3909
3910 WebPageImportanceSignals* WebViewImpl::pageImportanceSignals() { 3910 WebPageImportanceSignals* WebViewImpl::pageImportanceSignals() {
3911 return &m_pageImportanceSignals; 3911 return &m_pageImportanceSignals;
3912 } 3912 }
3913 3913
3914 Element* WebViewImpl::focusedElement() const { 3914 Element* WebViewImpl::focusedElement() const {
3915 LocalFrame* frame = m_page->focusController().focusedFrame(); 3915 LocalFrame* frame = m_page->focusController().focusedFrame();
3916 if (!frame) 3916 if (!frame)
(...skipping 449 matching lines...) Expand 10 before | Expand all | Expand 10 after
4366 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame()) 4366 if (focusedFrame->localFrameRoot() != mainFrameImpl()->frame())
4367 return nullptr; 4367 return nullptr;
4368 return focusedFrame; 4368 return focusedFrame;
4369 } 4369 }
4370 4370
4371 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const { 4371 LocalFrame* WebViewImpl::focusedLocalFrameAvailableForIme() const {
4372 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr; 4372 return m_imeAcceptEvents ? focusedLocalFrameInWidget() : nullptr;
4373 } 4373 }
4374 4374
4375 } // namespace blink 4375 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebPepperSocket.cpp ('k') | third_party/WebKit/Source/web/tests/VisualViewportTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698