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

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

Issue 1865213006: Replace setIndexedDBClientCreateFunction madness with Supplements (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Simplify per review feedback 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
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 1413 matching lines...) Expand 10 before | Expand all | Expand 10 after
1424 , m_frameWidget(0) 1424 , m_frameWidget(0)
1425 , m_client(client) 1425 , m_client(client)
1426 , m_autofillClient(0) 1426 , m_autofillClient(0)
1427 , m_contentSettingsClient(0) 1427 , m_contentSettingsClient(0)
1428 , m_inputEventsScaleFactorForEmulation(1) 1428 , m_inputEventsScaleFactorForEmulation(1)
1429 , m_userMediaClientImpl(this) 1429 , m_userMediaClientImpl(this)
1430 , m_geolocationClientProxy(GeolocationClientProxy::create(client ? client->g eolocationClient() : 0)) 1430 , m_geolocationClientProxy(GeolocationClientProxy::create(client ? client->g eolocationClient() : 0))
1431 , m_webDevToolsFrontend(0) 1431 , m_webDevToolsFrontend(0)
1432 , m_selfKeepAlive(this) 1432 , m_selfKeepAlive(this)
1433 { 1433 {
1434 setIndexedDBClientCreateFunction(IndexedDBClientImpl::create);
1435 frameCount++; 1434 frameCount++;
1436 } 1435 }
1437 1436
1438 WebLocalFrameImpl::WebLocalFrameImpl(WebRemoteFrame* oldWebFrame, WebFrameClient * client) 1437 WebLocalFrameImpl::WebLocalFrameImpl(WebRemoteFrame* oldWebFrame, WebFrameClient * client)
1439 : WebLocalFrameImpl(oldWebFrame->inShadowTree() ? WebTreeScopeType::Shadow : WebTreeScopeType::Document, client) 1438 : WebLocalFrameImpl(oldWebFrame->inShadowTree() ? WebTreeScopeType::Shadow : WebTreeScopeType::Document, client)
1440 { 1439 {
1441 } 1440 }
1442 1441
1443 WebLocalFrameImpl::~WebLocalFrameImpl() 1442 WebLocalFrameImpl::~WebLocalFrameImpl()
1444 { 1443 {
(...skipping 24 matching lines...) Expand all
1469 return; 1468 return;
1470 1469
1471 if (m_client) 1470 if (m_client)
1472 providePushControllerTo(*m_frame, m_client->pushClient()); 1471 providePushControllerTo(*m_frame, m_client->pushClient());
1473 1472
1474 provideNotificationPermissionClientTo(*m_frame, NotificationPermissionClient Impl::create()); 1473 provideNotificationPermissionClientTo(*m_frame, NotificationPermissionClient Impl::create());
1475 provideUserMediaTo(*m_frame, &m_userMediaClientImpl); 1474 provideUserMediaTo(*m_frame, &m_userMediaClientImpl);
1476 provideGeolocationTo(*m_frame, m_geolocationClientProxy.get()); 1475 provideGeolocationTo(*m_frame, m_geolocationClientProxy.get());
1477 m_geolocationClientProxy->setController(GeolocationController::from(m_frame. get())); 1476 m_geolocationClientProxy->setController(GeolocationController::from(m_frame. get()));
1478 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->webMIDI Client() : nullptr)); 1477 provideMIDITo(*m_frame, MIDIClientProxy::create(m_client ? m_client->webMIDI Client() : nullptr));
1478 provideIndexedDBClientTo(*m_frame, IndexedDBClientImpl::create());
1479 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create()); 1479 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create());
1480 provideNavigatorContentUtilsTo(*m_frame, NavigatorContentUtilsClientImpl::cr eate(this)); 1480 provideNavigatorContentUtilsTo(*m_frame, NavigatorContentUtilsClientImpl::cr eate(this));
1481 1481
1482 // Always provided so that availability of the API can be controlled by 1482 // Always provided so that availability of the API can be controlled by
1483 // OriginTrials::webUSBEnabled(). 1483 // OriginTrials::webUSBEnabled().
1484 USBController::provideTo(*m_frame, m_client ? m_client->usbClient() : nullpt r); 1484 USBController::provideTo(*m_frame, m_client ? m_client->usbClient() : nullpt r);
1485 1485
1486 bool enableWebBluetooth = RuntimeEnabledFeatures::webBluetoothEnabled(); 1486 bool enableWebBluetooth = RuntimeEnabledFeatures::webBluetoothEnabled();
1487 #if OS(CHROMEOS) || OS(ANDROID) 1487 #if OS(CHROMEOS) || OS(ANDROID)
1488 enableWebBluetooth = true; 1488 enableWebBluetooth = true;
(...skipping 641 matching lines...) Expand 10 before | Expand all | Expand 10 after
2130 return WebSandboxFlags::None; 2130 return WebSandboxFlags::None;
2131 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); 2131 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( ));
2132 } 2132 }
2133 2133
2134 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags) 2134 void WebLocalFrameImpl::forceSandboxFlags(WebSandboxFlags flags)
2135 { 2135 {
2136 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags)); 2136 frame()->loader().forceSandboxFlags(static_cast<SandboxFlags>(flags));
2137 } 2137 }
2138 2138
2139 } // namespace blink 2139 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp ('k') | third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698