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

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

Issue 1883493003: [OnionSoup] Moving WakeLock Service to Blink (2/2): removing WebWakeLockClient and WakeLockDispatch… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: esprehn@ comments Created 4 years, 8 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
« no previous file with comments | « third_party/WebKit/Source/platform/BUILD.gn ('k') | third_party/WebKit/Source/web/tests/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1399 matching lines...) Expand 10 before | Expand all | Expand 10 after
1410 webFrame->setFrameOwnerProperties(frameOwnerProperties); 1410 webFrame->setFrameOwnerProperties(frameOwnerProperties);
1411 } 1411 }
1412 1412
1413 // We must call init() after m_frame is assigned because it is referenced 1413 // We must call init() after m_frame is assigned because it is referenced
1414 // during init(). Note that this may dispatch JS events; the frame may be 1414 // during init(). Note that this may dispatch JS events; the frame may be
1415 // detached after init() returns. 1415 // detached after init() returns.
1416 frame->init(); 1416 frame->init();
1417 return webFrame; 1417 return webFrame;
1418 } 1418 }
1419 1419
1420
1421 WebLocalFrameImpl::WebLocalFrameImpl(WebTreeScopeType scope, WebFrameClient* cli ent) 1420 WebLocalFrameImpl::WebLocalFrameImpl(WebTreeScopeType scope, WebFrameClient* cli ent)
1422 : WebLocalFrame(scope) 1421 : WebLocalFrame(scope)
1423 , m_frameLoaderClientImpl(FrameLoaderClientImpl::create(this)) 1422 , m_frameLoaderClientImpl(FrameLoaderClientImpl::create(this))
1424 , m_frameWidget(0) 1423 , m_frameWidget(0)
1425 , m_client(client) 1424 , m_client(client)
1426 , m_autofillClient(0) 1425 , m_autofillClient(0)
1427 , m_contentSettingsClient(0) 1426 , m_contentSettingsClient(0)
1428 , m_inputEventsScaleFactorForEmulation(1) 1427 , m_inputEventsScaleFactorForEmulation(1)
1429 , m_userMediaClientImpl(this) 1428 , m_userMediaClientImpl(this)
1430 , m_geolocationClientProxy(GeolocationClientProxy::create(client ? client->g eolocationClient() : 0)) 1429 , m_geolocationClientProxy(GeolocationClientProxy::create(client ? client->g eolocationClient() : 0))
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
1493 1492
1494 if (RuntimeEnabledFeatures::screenOrientationEnabled()) 1493 if (RuntimeEnabledFeatures::screenOrientationEnabled())
1495 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client->we bScreenOrientationClient() : nullptr); 1494 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client->we bScreenOrientationClient() : nullptr);
1496 if (RuntimeEnabledFeatures::presentationEnabled()) 1495 if (RuntimeEnabledFeatures::presentationEnabled())
1497 PresentationController::provideTo(*m_frame, m_client ? m_client->present ationClient() : nullptr); 1496 PresentationController::provideTo(*m_frame, m_client ? m_client->present ationClient() : nullptr);
1498 if (RuntimeEnabledFeatures::permissionsEnabled()) 1497 if (RuntimeEnabledFeatures::permissionsEnabled())
1499 PermissionController::provideTo(*m_frame, m_client ? m_client->permissio nClient() : nullptr); 1498 PermissionController::provideTo(*m_frame, m_client ? m_client->permissio nClient() : nullptr);
1500 if (RuntimeEnabledFeatures::webVREnabled()) 1499 if (RuntimeEnabledFeatures::webVREnabled())
1501 VRController::provideTo(*m_frame, m_client ? m_client->webVRClient() : n ullptr); 1500 VRController::provideTo(*m_frame, m_client ? m_client->webVRClient() : n ullptr);
1502 if (RuntimeEnabledFeatures::wakeLockEnabled()) 1501 if (RuntimeEnabledFeatures::wakeLockEnabled())
1503 ScreenWakeLock::provideTo(*m_frame, m_client ? m_client->wakeLockClient( ) : nullptr); 1502 ScreenWakeLock::provideTo(*m_frame, m_client ? m_client->serviceRegistry (): nullptr);
1504 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) 1503 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled())
1505 provideAudioOutputDeviceClientTo(*m_frame, AudioOutputDeviceClientImpl:: create()); 1504 provideAudioOutputDeviceClientTo(*m_frame, AudioOutputDeviceClientImpl:: create());
1506 if (RuntimeEnabledFeatures::installedAppEnabled()) 1505 if (RuntimeEnabledFeatures::installedAppEnabled())
1507 InstalledAppController::provideTo(*m_frame, m_client ? m_client->install edAppClient() : nullptr); 1506 InstalledAppController::provideTo(*m_frame, m_client ? m_client->install edAppClient() : nullptr);
1508 } 1507 }
1509 1508
1510 void WebLocalFrameImpl::initializeCoreFrame(FrameHost* host, FrameOwner* owner, const AtomicString& name, const AtomicString& uniqueName) 1509 void WebLocalFrameImpl::initializeCoreFrame(FrameHost* host, FrameOwner* owner, const AtomicString& name, const AtomicString& uniqueName)
1511 { 1510 {
1512 setCoreFrame(LocalFrame::create(m_frameLoaderClientImpl.get(), host, owner, client() ? client()->serviceRegistry() : nullptr)); 1511 setCoreFrame(LocalFrame::create(m_frameLoaderClientImpl.get(), host, owner, client() ? client()->serviceRegistry() : nullptr));
1513 frame()->tree().setPrecalculatedName(name, uniqueName); 1512 frame()->tree().setPrecalculatedName(name, uniqueName);
(...skipping 616 matching lines...) Expand 10 before | Expand all | Expand 10 after
2130 return WebSandboxFlags::None; 2129 return WebSandboxFlags::None;
2131 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); 2130 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( ));
2132 } 2131 }
2133 2132
2134 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) 2133 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags)
2135 { 2134 {
2136 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); 2135 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags));
2137 } 2136 }
2138 2137
2139 } // namespace blink 2138 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/BUILD.gn ('k') | third_party/WebKit/Source/web/tests/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698