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

Side by Side Diff: third_party/WebKit/Source/web/WebPagePopupImpl.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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 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 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 m_page->settings().setDeviceSupportsTouch(mainSettings.deviceSupportsTouch()); 282 m_page->settings().setDeviceSupportsTouch(mainSettings.deviceSupportsTouch());
283 m_page->settings().setMinimumFontSize(mainSettings.minimumFontSize()); 283 m_page->settings().setMinimumFontSize(mainSettings.minimumFontSize());
284 m_page->settings().setMinimumLogicalFontSize( 284 m_page->settings().setMinimumLogicalFontSize(
285 mainSettings.minimumLogicalFontSize()); 285 mainSettings.minimumLogicalFontSize());
286 // FIXME: Should we support enabling a11y while a popup is shown? 286 // FIXME: Should we support enabling a11y while a popup is shown?
287 m_page->settings().setAccessibilityEnabled( 287 m_page->settings().setAccessibilityEnabled(
288 mainSettings.accessibilityEnabled()); 288 mainSettings.accessibilityEnabled());
289 m_page->settings().setScrollAnimatorEnabled( 289 m_page->settings().setScrollAnimatorEnabled(
290 mainSettings.scrollAnimatorEnabled()); 290 mainSettings.scrollAnimatorEnabled());
291 291
292 provideContextFeaturesTo(*m_page, makeUnique<PagePopupFeaturesClient>()); 292 provideContextFeaturesTo(*m_page, WTF::makeUnique<PagePopupFeaturesClient>());
293 DEFINE_STATIC_LOCAL(FrameLoaderClient, emptyFrameLoaderClient, 293 DEFINE_STATIC_LOCAL(FrameLoaderClient, emptyFrameLoaderClient,
294 (EmptyFrameLoaderClient::create())); 294 (EmptyFrameLoaderClient::create()));
295 LocalFrame* frame = 295 LocalFrame* frame =
296 LocalFrame::create(&emptyFrameLoaderClient, &m_page->frameHost(), 0); 296 LocalFrame::create(&emptyFrameLoaderClient, &m_page->frameHost(), 0);
297 frame->setPagePopupOwner(m_popupClient->ownerElement()); 297 frame->setPagePopupOwner(m_popupClient->ownerElement());
298 frame->setView(FrameView::create(*frame)); 298 frame->setView(FrameView::create(*frame));
299 frame->init(); 299 frame->init();
300 frame->view()->setParentVisible(true); 300 frame->view()->setParentVisible(true);
301 frame->view()->setSelfVisible(true); 301 frame->view()->setSelfVisible(true);
302 frame->view()->setTransparent(false); 302 frame->view()->setTransparent(false);
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
583 // A WebPagePopupImpl instance usually has two references. 583 // A WebPagePopupImpl instance usually has two references.
584 // - One owned by the instance itself. It represents the visible widget. 584 // - One owned by the instance itself. It represents the visible widget.
585 // - One owned by a WebViewImpl. It's released when the WebViewImpl ask the 585 // - One owned by a WebViewImpl. It's released when the WebViewImpl ask the
586 // WebPagePopupImpl to close. 586 // WebPagePopupImpl to close.
587 // We need them because the closing operation is asynchronous and the widget 587 // We need them because the closing operation is asynchronous and the widget
588 // can be closed while the WebViewImpl is unaware of it. 588 // can be closed while the WebViewImpl is unaware of it.
589 return adoptRef(new WebPagePopupImpl(client)).leakRef(); 589 return adoptRef(new WebPagePopupImpl(client)).leakRef();
590 } 590 }
591 591
592 } // namespace blink 592 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebKit.cpp ('k') | third_party/WebKit/Source/web/WebPepperSocket.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698