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

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

Issue 2150443002: Supplement should have a Member to the corresponding Supplementable object (Part 1) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: temp Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 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 1492 matching lines...) Expand 10 before | Expand all | Expand 10 after
1503 #if OS(CHROMEOS) || OS(ANDROID) || OS(MACOSX) 1503 #if OS(CHROMEOS) || OS(ANDROID) || OS(MACOSX)
1504 enableWebBluetooth = true; 1504 enableWebBluetooth = true;
1505 #endif 1505 #endif
1506 if (enableWebBluetooth) 1506 if (enableWebBluetooth)
1507 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->bluetooth( ) : nullptr); 1507 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->bluetooth( ) : nullptr);
1508 1508
1509 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client->webScr eenOrientationClient() : nullptr); 1509 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client->webScr eenOrientationClient() : nullptr);
1510 if (RuntimeEnabledFeatures::presentationEnabled()) 1510 if (RuntimeEnabledFeatures::presentationEnabled())
1511 PresentationController::provideTo(*m_frame, m_client ? m_client->present ationClient() : nullptr); 1511 PresentationController::provideTo(*m_frame, m_client ? m_client->present ationClient() : nullptr);
1512 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) 1512 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled())
1513 provideAudioOutputDeviceClientTo(*m_frame, AudioOutputDeviceClientImpl:: create()); 1513 provideAudioOutputDeviceClientTo(*m_frame, AudioOutputDeviceClientImpl:: create(*m_frame));
1514 if (RuntimeEnabledFeatures::installedAppEnabled()) 1514 if (RuntimeEnabledFeatures::installedAppEnabled())
1515 InstalledAppController::provideTo(*m_frame, m_client ? m_client->install edAppClient() : nullptr); 1515 InstalledAppController::provideTo(*m_frame, m_client ? m_client->install edAppClient() : nullptr);
1516 } 1516 }
1517 1517
1518 void WebLocalFrameImpl::initializeCoreFrame(FrameHost* host, FrameOwner* owner, const AtomicString& name, const AtomicString& uniqueName) 1518 void WebLocalFrameImpl::initializeCoreFrame(FrameHost* host, FrameOwner* owner, const AtomicString& name, const AtomicString& uniqueName)
1519 { 1519 {
1520 setCoreFrame(LocalFrame::create(m_frameLoaderClientImpl.get(), host, owner, client() ? client()->interfaceProvider() : nullptr)); 1520 setCoreFrame(LocalFrame::create(m_frameLoaderClientImpl.get(), host, owner, client() ? client()->interfaceProvider() : nullptr));
1521 frame()->tree().setPrecalculatedName(name, uniqueName); 1521 frame()->tree().setPrecalculatedName(name, uniqueName);
1522 // We must call init() after m_frame is assigned because it is referenced 1522 // We must call init() after m_frame is assigned because it is referenced
1523 // during init(). Note that this may dispatch JS events; the frame may be 1523 // during init(). Note that this may dispatch JS events; the frame may be
(...skipping 716 matching lines...) Expand 10 before | Expand all | Expand 10 after
2240 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; 2240 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol;
2241 } else if (metric == "wasAlternateProtocolAvailable") { 2241 } else if (metric == "wasAlternateProtocolAvailable") {
2242 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; 2242 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable;
2243 } else if (metric == "connectionInfo") { 2243 } else if (metric == "connectionInfo") {
2244 feature = UseCounter::ChromeLoadTimesConnectionInfo; 2244 feature = UseCounter::ChromeLoadTimesConnectionInfo;
2245 } 2245 }
2246 UseCounter::count(frame(), feature); 2246 UseCounter::count(frame(), feature);
2247 } 2247 }
2248 2248
2249 } // namespace blink 2249 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebFrameWidgetImpl.cpp ('k') | third_party/WebKit/Source/web/WebViewFrameWidget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698