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

Side by Side Diff: Source/web/WebLocalFrameImpl.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: 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
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 162 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 #include "public/web/WebPrintParams.h" 173 #include "public/web/WebPrintParams.h"
174 #include "public/web/WebRange.h" 174 #include "public/web/WebRange.h"
175 #include "public/web/WebScriptSource.h" 175 #include "public/web/WebScriptSource.h"
176 #include "public/web/WebSecurityOrigin.h" 176 #include "public/web/WebSecurityOrigin.h"
177 #include "public/web/WebSerializedScriptValue.h" 177 #include "public/web/WebSerializedScriptValue.h"
178 #include "web/AssociatedURLLoader.h" 178 #include "web/AssociatedURLLoader.h"
179 #include "web/CompositionUnderlineVectorBuilder.h" 179 #include "web/CompositionUnderlineVectorBuilder.h"
180 #include "web/EventListenerWrapper.h" 180 #include "web/EventListenerWrapper.h"
181 #include "web/FindInPageCoordinates.h" 181 #include "web/FindInPageCoordinates.h"
182 #include "web/GeolocationClientProxy.h" 182 #include "web/GeolocationClientProxy.h"
183 #include "web/LocalFileSystemClient.h"
183 #include "web/PageOverlay.h" 184 #include "web/PageOverlay.h"
184 #include "web/SharedWorkerRepositoryClientImpl.h" 185 #include "web/SharedWorkerRepositoryClientImpl.h"
185 #include "web/TextFinder.h" 186 #include "web/TextFinder.h"
186 #include "web/WebDataSourceImpl.h" 187 #include "web/WebDataSourceImpl.h"
187 #include "web/WebDevToolsAgentPrivate.h" 188 #include "web/WebDevToolsAgentPrivate.h"
188 #include "web/WebPluginContainerImpl.h" 189 #include "web/WebPluginContainerImpl.h"
189 #include "web/WebViewImpl.h" 190 #include "web/WebViewImpl.h"
190 #include "wtf/CurrentTime.h" 191 #include "wtf/CurrentTime.h"
191 #include "wtf/HashMap.h" 192 #include "wtf/HashMap.h"
192 #include <algorithm> 193 #include <algorithm>
(...skipping 1413 matching lines...) Expand 10 before | Expand all | Expand 10 after
1606 // FIXME: we shouldn't add overhead to every frame by registering these obje cts when they're not used. 1607 // FIXME: we shouldn't add overhead to every frame by registering these obje cts when they're not used.
1607 if (m_frame) { 1608 if (m_frame) {
1608 OwnPtr<NotificationPresenterImpl> notificationPresenter = adoptPtr(new N otificationPresenterImpl()); 1609 OwnPtr<NotificationPresenterImpl> notificationPresenter = adoptPtr(new N otificationPresenterImpl());
1609 if (m_client) 1610 if (m_client)
1610 notificationPresenter->initialize(m_client->notificationPresenter()) ; 1611 notificationPresenter->initialize(m_client->notificationPresenter()) ;
1611 1612
1612 provideNotification(*m_frame, notificationPresenter.release()); 1613 provideNotification(*m_frame, notificationPresenter.release());
1613 provideUserMediaTo(*m_frame, &m_userMediaClientImpl); 1614 provideUserMediaTo(*m_frame, &m_userMediaClientImpl);
1614 provideGeolocationTo(*m_frame, m_geolocationClientProxy.get()); 1615 provideGeolocationTo(*m_frame, m_geolocationClientProxy.get());
1615 m_geolocationClientProxy->setController(GeolocationController::from(m_fr ame.get())); 1616 m_geolocationClientProxy->setController(GeolocationController::from(m_fr ame.get()));
1617 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create());
1616 } 1618 }
1617 } 1619 }
1618 1620
1619 void WebLocalFrameImpl::initializeAsMainFrame(WebCore::Page* page) 1621 void WebLocalFrameImpl::initializeAsMainFrame(WebCore::Page* page)
1620 { 1622 {
1621 setWebCoreFrame(LocalFrame::create(&m_frameLoaderClientImpl, &page->frameHos t(), 0)); 1623 setWebCoreFrame(LocalFrame::create(&m_frameLoaderClientImpl, &page->frameHos t(), 0));
1622 1624
1623 // We must call init() after m_frame is assigned because it is referenced 1625 // We must call init() after m_frame is assigned because it is referenced
1624 // during init(). 1626 // during init().
1625 m_frame->init(); 1627 m_frame->init();
(...skipping 289 matching lines...) Expand 10 before | Expand all | Expand 10 after
1915 1917
1916 void WebLocalFrameImpl::invalidateAll() const 1918 void WebLocalFrameImpl::invalidateAll() const
1917 { 1919 {
1918 ASSERT(frame() && frame()->view()); 1920 ASSERT(frame() && frame()->view());
1919 FrameView* view = frame()->view(); 1921 FrameView* view = frame()->view();
1920 view->invalidateRect(view->frameRect()); 1922 view->invalidateRect(view->frameRect());
1921 invalidateScrollbar(); 1923 invalidateScrollbar();
1922 } 1924 }
1923 1925
1924 } // namespace blink 1926 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698