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

Side by Side Diff: Source/web/WebViewImpl.cpp

Issue 324483002: Move LocalFileSystem to hang off LocalFrame instead of Page. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase Created 6 years, 6 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 | « Source/web/WebLocalFrameImpl.cpp ('k') | no next file » | 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) 2011, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2011, 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 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 #include "core/page/PointerLockController.h" 75 #include "core/page/PointerLockController.h"
76 #include "core/page/ScopedPageLoadDeferrer.h" 76 #include "core/page/ScopedPageLoadDeferrer.h"
77 #include "core/page/TouchDisambiguation.h" 77 #include "core/page/TouchDisambiguation.h"
78 #include "core/rendering/FastTextAutosizer.h" 78 #include "core/rendering/FastTextAutosizer.h"
79 #include "core/rendering/RenderView.h" 79 #include "core/rendering/RenderView.h"
80 #include "core/rendering/RenderWidget.h" 80 #include "core/rendering/RenderWidget.h"
81 #include "core/rendering/TextAutosizer.h" 81 #include "core/rendering/TextAutosizer.h"
82 #include "core/rendering/compositing/RenderLayerCompositor.h" 82 #include "core/rendering/compositing/RenderLayerCompositor.h"
83 #include "modules/device_orientation/DeviceOrientationInspectorAgent.h" 83 #include "modules/device_orientation/DeviceOrientationInspectorAgent.h"
84 #include "modules/encryptedmedia/MediaKeysController.h" 84 #include "modules/encryptedmedia/MediaKeysController.h"
85 #include "modules/filesystem/InspectorFileSystemAgent.h"
85 #include "modules/indexeddb/InspectorIndexedDBAgent.h" 86 #include "modules/indexeddb/InspectorIndexedDBAgent.h"
86 #include "modules/push_messaging/PushController.h" 87 #include "modules/push_messaging/PushController.h"
87 #include "platform/ContextMenu.h" 88 #include "platform/ContextMenu.h"
88 #include "platform/ContextMenuItem.h" 89 #include "platform/ContextMenuItem.h"
89 #include "platform/Cursor.h" 90 #include "platform/Cursor.h"
90 #include "platform/KeyboardCodes.h" 91 #include "platform/KeyboardCodes.h"
91 #include "platform/NotImplemented.h" 92 #include "platform/NotImplemented.h"
92 #include "platform/OverscrollTheme.h" 93 #include "platform/OverscrollTheme.h"
93 #include "platform/PlatformGestureEvent.h" 94 #include "platform/PlatformGestureEvent.h"
94 #include "platform/PlatformKeyboardEvent.h" 95 #include "platform/PlatformKeyboardEvent.h"
(...skipping 29 matching lines...) Expand all
124 #include "public/web/WebRange.h" 125 #include "public/web/WebRange.h"
125 #include "public/web/WebTextInputInfo.h" 126 #include "public/web/WebTextInputInfo.h"
126 #include "public/web/WebViewClient.h" 127 #include "public/web/WebViewClient.h"
127 #include "public/web/WebWindowFeatures.h" 128 #include "public/web/WebWindowFeatures.h"
128 #include "web/CompositionUnderlineVectorBuilder.h" 129 #include "web/CompositionUnderlineVectorBuilder.h"
129 #include "web/ContextFeaturesClientImpl.h" 130 #include "web/ContextFeaturesClientImpl.h"
130 #include "web/DatabaseClientImpl.h" 131 #include "web/DatabaseClientImpl.h"
131 #include "web/FullscreenController.h" 132 #include "web/FullscreenController.h"
132 #include "web/GraphicsLayerFactoryChromium.h" 133 #include "web/GraphicsLayerFactoryChromium.h"
133 #include "web/LinkHighlight.h" 134 #include "web/LinkHighlight.h"
134 #include "web/LocalFileSystemClient.h"
135 #include "web/PopupContainer.h" 135 #include "web/PopupContainer.h"
136 #include "web/PrerendererClientImpl.h" 136 #include "web/PrerendererClientImpl.h"
137 #include "web/SpeechRecognitionClientProxy.h" 137 #include "web/SpeechRecognitionClientProxy.h"
138 #include "web/StorageQuotaClientImpl.h" 138 #include "web/StorageQuotaClientImpl.h"
139 #include "web/ValidationMessageClientImpl.h" 139 #include "web/ValidationMessageClientImpl.h"
140 #include "web/ViewportAnchor.h" 140 #include "web/ViewportAnchor.h"
141 #include "web/WebDevToolsAgentImpl.h" 141 #include "web/WebDevToolsAgentImpl.h"
142 #include "web/WebDevToolsAgentPrivate.h" 142 #include "web/WebDevToolsAgentPrivate.h"
143 #include "web/WebInputEventConversion.h" 143 #include "web/WebInputEventConversion.h"
144 #include "web/WebLocalFrameImpl.h" 144 #include "web/WebLocalFrameImpl.h"
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 pageClients.storageClient = &m_storageClientImpl; 407 pageClients.storageClient = &m_storageClientImpl;
408 408
409 m_page = adoptPtrWillBeNoop(new Page(pageClients)); 409 m_page = adoptPtrWillBeNoop(new Page(pageClients));
410 MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl); 410 MediaKeysController::provideMediaKeysTo(*m_page, &m_mediaKeysClientImpl);
411 provideSpeechRecognitionTo(*m_page, SpeechRecognitionClientProxy::create(cli ent ? client->speechRecognizer() : 0)); 411 provideSpeechRecognitionTo(*m_page, SpeechRecognitionClientProxy::create(cli ent ? client->speechRecognizer() : 0));
412 provideNavigatorContentUtilsTo(*m_page, NavigatorContentUtilsClientImpl::cre ate(this)); 412 provideNavigatorContentUtilsTo(*m_page, NavigatorContentUtilsClientImpl::cre ate(this));
413 413
414 provideContextFeaturesTo(*m_page, ContextFeaturesClientImpl::create()); 414 provideContextFeaturesTo(*m_page, ContextFeaturesClientImpl::create());
415 DeviceOrientationInspectorAgent::provideTo(*m_page); 415 DeviceOrientationInspectorAgent::provideTo(*m_page);
416 416
417 provideLocalFileSystemTo(*m_page, LocalFileSystemClient::create()); 417 m_page->inspectorController().registerModuleAgent(InspectorFileSystemAgent:: create(m_page.get()));
418 provideDatabaseClientTo(*m_page, DatabaseClientImpl::create()); 418 provideDatabaseClientTo(*m_page, DatabaseClientImpl::create());
419 InspectorIndexedDBAgent::provideTo(m_page.get()); 419 InspectorIndexedDBAgent::provideTo(m_page.get());
420 provideStorageQuotaClientTo(*m_page, StorageQuotaClientImpl::create()); 420 provideStorageQuotaClientTo(*m_page, StorageQuotaClientImpl::create());
421 m_page->setValidationMessageClient(ValidationMessageClientImpl::create(*this )); 421 m_page->setValidationMessageClient(ValidationMessageClientImpl::create(*this ));
422 provideWorkerGlobalScopeProxyProviderTo(*m_page, WorkerGlobalScopeProxyProvi derImpl::create()); 422 provideWorkerGlobalScopeProxyProviderTo(*m_page, WorkerGlobalScopeProxyProvi derImpl::create());
423 423
424 m_page->makeOrdinary(); 424 m_page->makeOrdinary();
425 425
426 if (m_client) { 426 if (m_client) {
427 providePushControllerTo(*m_page, m_client->webPushClient()); 427 providePushControllerTo(*m_page, m_client->webPushClient());
(...skipping 3676 matching lines...) Expand 10 before | Expand all | Expand 10 after
4104 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints(); 4104 const PageScaleConstraints& constraints = m_pageScaleConstraintsSet.pageDefi nedConstraints();
4105 4105
4106 if (!mainFrameImpl() || !mainFrameImpl()->frameView()) 4106 if (!mainFrameImpl() || !mainFrameImpl()->frameView())
4107 return false; 4107 return false;
4108 4108
4109 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width 4109 return mainFrameImpl()->frameView()->layoutSize().width() == m_size.width
4110 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1); 4110 || (constraints.minimumScale == constraints.maximumScale && constraints. minimumScale != -1);
4111 } 4111 }
4112 4112
4113 } // namespace blink 4113 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebLocalFrameImpl.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698