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

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

Issue 2126733002: Make ScreenWakeLock ContextLifecycleObserver instead of LocalFrameLifecycleObserver (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: temp Created 4 years, 5 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 1470 matching lines...) Expand 10 before | Expand all | Expand 10 after
1481 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->bluetooth( ) : nullptr); 1481 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->bluetooth( ) : nullptr);
1482 1482
1483 if (RuntimeEnabledFeatures::screenOrientationEnabled()) 1483 if (RuntimeEnabledFeatures::screenOrientationEnabled())
1484 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client->we bScreenOrientationClient() : nullptr); 1484 ScreenOrientationController::provideTo(*m_frame, m_client ? m_client->we bScreenOrientationClient() : nullptr);
1485 if (RuntimeEnabledFeatures::presentationEnabled()) 1485 if (RuntimeEnabledFeatures::presentationEnabled())
1486 PresentationController::provideTo(*m_frame, m_client ? m_client->present ationClient() : nullptr); 1486 PresentationController::provideTo(*m_frame, m_client ? m_client->present ationClient() : nullptr);
1487 if (RuntimeEnabledFeatures::permissionsEnabled()) 1487 if (RuntimeEnabledFeatures::permissionsEnabled())
1488 PermissionController::provideTo(*m_frame, m_client ? m_client->permissio nClient() : nullptr); 1488 PermissionController::provideTo(*m_frame, m_client ? m_client->permissio nClient() : nullptr);
1489 if (RuntimeEnabledFeatures::webVREnabled()) 1489 if (RuntimeEnabledFeatures::webVREnabled())
1490 VRController::provideTo(*m_frame, m_client ? m_client->serviceRegistry() : nullptr); 1490 VRController::provideTo(*m_frame, m_client ? m_client->serviceRegistry() : nullptr);
1491 if (RuntimeEnabledFeatures::wakeLockEnabled())
alogvinov 2016/07/06 08:42:17 Sorry I may have missed something, but why is this
alogvinov 2016/07/06 08:50:06 I see now, it is moved to ScreenWakeLock.
1492 ScreenWakeLock::provideTo(*m_frame, m_client ? m_client->serviceRegistry (): nullptr);
1493 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) 1491 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled())
1494 provideAudioOutputDeviceClientTo(*m_frame, AudioOutputDeviceClientImpl:: create()); 1492 provideAudioOutputDeviceClientTo(*m_frame, AudioOutputDeviceClientImpl:: create());
1495 if (RuntimeEnabledFeatures::installedAppEnabled()) 1493 if (RuntimeEnabledFeatures::installedAppEnabled())
1496 InstalledAppController::provideTo(*m_frame, m_client ? m_client->install edAppClient() : nullptr); 1494 InstalledAppController::provideTo(*m_frame, m_client ? m_client->install edAppClient() : nullptr);
1497 } 1495 }
1498 1496
1499 void WebLocalFrameImpl::initializeCoreFrame(FrameHost* host, FrameOwner* owner, const AtomicString& name, const AtomicString& uniqueName) 1497 void WebLocalFrameImpl::initializeCoreFrame(FrameHost* host, FrameOwner* owner, const AtomicString& name, const AtomicString& uniqueName)
1500 { 1498 {
1501 setCoreFrame(LocalFrame::create(m_frameLoaderClientImpl.get(), host, owner, client() ? client()->serviceRegistry() : nullptr)); 1499 setCoreFrame(LocalFrame::create(m_frameLoaderClientImpl.get(), host, owner, client() ? client()->serviceRegistry() : nullptr));
1502 frame()->tree().setPrecalculatedName(name, uniqueName); 1500 frame()->tree().setPrecalculatedName(name, uniqueName);
(...skipping 658 matching lines...) Expand 10 before | Expand all | Expand 10 after
2161 { 2159 {
2162 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); 2160 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags));
2163 } 2161 }
2164 2162
2165 void WebLocalFrameImpl::clearActiveFindMatch() 2163 void WebLocalFrameImpl::clearActiveFindMatch()
2166 { 2164 {
2167 ensureTextFinder().clearActiveFindMatch(); 2165 ensureTextFinder().clearActiveFindMatch();
2168 } 2166 }
2169 2167
2170 } // namespace blink 2168 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698