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

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

Issue 2591803002: NOT FOR LANDING: Thread the needle through all webmodules.
Patch Set: Needle threaded all the way. Created 3 years, 12 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 209 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 #include "web/SharedWorkerRepositoryClientImpl.h" 220 #include "web/SharedWorkerRepositoryClientImpl.h"
221 #include "web/SuspendableScriptExecutor.h" 221 #include "web/SuspendableScriptExecutor.h"
222 #include "web/TextFinder.h" 222 #include "web/TextFinder.h"
223 #include "web/WebAssociatedURLLoaderImpl.h" 223 #include "web/WebAssociatedURLLoaderImpl.h"
224 #include "web/WebDataSourceImpl.h" 224 #include "web/WebDataSourceImpl.h"
225 #include "web/WebDevToolsAgentImpl.h" 225 #include "web/WebDevToolsAgentImpl.h"
226 #include "web/WebFrameWidgetImpl.h" 226 #include "web/WebFrameWidgetImpl.h"
227 #include "web/WebPluginContainerImpl.h" 227 #include "web/WebPluginContainerImpl.h"
228 #include "web/WebRemoteFrameImpl.h" 228 #include "web/WebRemoteFrameImpl.h"
229 #include "web/WebViewImpl.h" 229 #include "web/WebViewImpl.h"
230 #include "web/agent/sample/sample_agent.h"
231 #include "web/api/frame.h"
230 #include "wtf/CurrentTime.h" 232 #include "wtf/CurrentTime.h"
231 #include "wtf/HashMap.h" 233 #include "wtf/HashMap.h"
232 #include "wtf/PtrUtil.h" 234 #include "wtf/PtrUtil.h"
233 #include <algorithm> 235 #include <algorithm>
234 #include <memory> 236 #include <memory>
235 #include <utility> 237 #include <utility>
236 238
237 namespace blink { 239 namespace blink {
238 240
239 static int frameCount = 0; 241 static int frameCount = 0;
(...skipping 1659 matching lines...) Expand 10 before | Expand all | Expand 10 after
1899 void WebLocalFrameImpl::setDevToolsAgentClient( 1901 void WebLocalFrameImpl::setDevToolsAgentClient(
1900 WebDevToolsAgentClient* devToolsClient) { 1902 WebDevToolsAgentClient* devToolsClient) {
1901 DCHECK(devToolsClient); 1903 DCHECK(devToolsClient);
1902 m_devToolsAgent = WebDevToolsAgentImpl::create(this, devToolsClient); 1904 m_devToolsAgent = WebDevToolsAgentImpl::create(this, devToolsClient);
1903 } 1905 }
1904 1906
1905 WebDevToolsAgent* WebLocalFrameImpl::devToolsAgent() { 1907 WebDevToolsAgent* WebLocalFrameImpl::devToolsAgent() {
1906 return m_devToolsAgent.get(); 1908 return m_devToolsAgent.get();
1907 } 1909 }
1908 1910
1911 void WebLocalFrameImpl::startAgents() {
1912 // TODO(dglazkov): Store all agents for the lifetime of this instance.
1913 new web::agent::SampleAgent(new web::api::Frame(frame()));
1914 }
1915
1909 WebLocalFrameImpl* WebLocalFrameImpl::localRoot() { 1916 WebLocalFrameImpl* WebLocalFrameImpl::localRoot() {
1910 // This can't use the LocalFrame::localFrameRoot, since it may be called 1917 // This can't use the LocalFrame::localFrameRoot, since it may be called
1911 // when the WebLocalFrame exists but the core LocalFrame does not. 1918 // when the WebLocalFrame exists but the core LocalFrame does not.
1912 // TODO(alexmos, dcheng): Clean this up to only calculate this in one place. 1919 // TODO(alexmos, dcheng): Clean this up to only calculate this in one place.
1913 WebLocalFrameImpl* localRoot = this; 1920 WebLocalFrameImpl* localRoot = this;
1914 while (localRoot->parent() && localRoot->parent()->isWebLocalFrame()) 1921 while (localRoot->parent() && localRoot->parent()->isWebLocalFrame())
1915 localRoot = toWebLocalFrameImpl(localRoot->parent()); 1922 localRoot = toWebLocalFrameImpl(localRoot->parent());
1916 return localRoot; 1923 return localRoot;
1917 } 1924 }
1918 1925
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
2353 ->frameScheduler() 2360 ->frameScheduler()
2354 ->unthrottledTaskRunner() 2361 ->unthrottledTaskRunner()
2355 ->toSingleThreadTaskRunner(); 2362 ->toSingleThreadTaskRunner();
2356 } 2363 }
2357 2364
2358 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const { 2365 WebInputMethodControllerImpl* WebLocalFrameImpl::inputMethodController() const {
2359 return m_inputMethodController.get(); 2366 return m_inputMethodController.get();
2360 } 2367 }
2361 2368
2362 } // namespace blink 2369 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698