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

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

Issue 1316033003: [DevTools] Make WebDevToolsAgentImpl own InspectorOverlayImpl. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « Source/web/WebLocalFrameImpl.h ('k') | Source/web/WebViewImpl.h » ('j') | 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) 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 201 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 #include "public/web/WebRange.h" 212 #include "public/web/WebRange.h"
213 #include "public/web/WebScriptSource.h" 213 #include "public/web/WebScriptSource.h"
214 #include "public/web/WebSerializedScriptValue.h" 214 #include "public/web/WebSerializedScriptValue.h"
215 #include "public/web/WebTestInterfaceFactory.h" 215 #include "public/web/WebTestInterfaceFactory.h"
216 #include "public/web/WebTreeScopeType.h" 216 #include "public/web/WebTreeScopeType.h"
217 #include "skia/ext/platform_device.h" 217 #include "skia/ext/platform_device.h"
218 #include "web/AssociatedURLLoader.h" 218 #include "web/AssociatedURLLoader.h"
219 #include "web/CompositionUnderlineVectorBuilder.h" 219 #include "web/CompositionUnderlineVectorBuilder.h"
220 #include "web/FindInPageCoordinates.h" 220 #include "web/FindInPageCoordinates.h"
221 #include "web/GeolocationClientProxy.h" 221 #include "web/GeolocationClientProxy.h"
222 #include "web/InspectorOverlayImpl.h"
223 #include "web/LocalFileSystemClient.h" 222 #include "web/LocalFileSystemClient.h"
224 #include "web/MIDIClientProxy.h" 223 #include "web/MIDIClientProxy.h"
225 #include "web/NavigatorContentUtilsClientImpl.h" 224 #include "web/NavigatorContentUtilsClientImpl.h"
226 #include "web/NotificationPermissionClientImpl.h" 225 #include "web/NotificationPermissionClientImpl.h"
227 #include "web/PageOverlay.h"
228 #include "web/RemoteBridgeFrameOwner.h" 226 #include "web/RemoteBridgeFrameOwner.h"
229 #include "web/SharedWorkerRepositoryClientImpl.h" 227 #include "web/SharedWorkerRepositoryClientImpl.h"
230 #include "web/SuspendableScriptExecutor.h" 228 #include "web/SuspendableScriptExecutor.h"
231 #include "web/TextFinder.h" 229 #include "web/TextFinder.h"
232 #include "web/WebDataSourceImpl.h" 230 #include "web/WebDataSourceImpl.h"
233 #include "web/WebDevToolsAgentImpl.h" 231 #include "web/WebDevToolsAgentImpl.h"
234 #include "web/WebFrameWidgetImpl.h" 232 #include "web/WebFrameWidgetImpl.h"
235 #include "web/WebPluginContainerImpl.h" 233 #include "web/WebPluginContainerImpl.h"
236 #include "web/WebRemoteFrameImpl.h" 234 #include "web/WebRemoteFrameImpl.h"
237 #include "web/WebViewImpl.h" 235 #include "web/WebViewImpl.h"
(...skipping 1450 matching lines...) Expand 10 before | Expand all | Expand 10 after
1688 cancelPendingScopingEffort(); 1686 cancelPendingScopingEffort();
1689 #endif 1687 #endif
1690 } 1688 }
1691 1689
1692 #if ENABLE(OILPAN) 1690 #if ENABLE(OILPAN)
1693 DEFINE_TRACE(WebLocalFrameImpl) 1691 DEFINE_TRACE(WebLocalFrameImpl)
1694 { 1692 {
1695 visitor->trace(m_frameLoaderClientImpl); 1693 visitor->trace(m_frameLoaderClientImpl);
1696 visitor->trace(m_frame); 1694 visitor->trace(m_frame);
1697 visitor->trace(m_devToolsAgent); 1695 visitor->trace(m_devToolsAgent);
1698 visitor->trace(m_inspectorOverlay);
1699 visitor->trace(m_textFinder); 1696 visitor->trace(m_textFinder);
1700 visitor->trace(m_printContext); 1697 visitor->trace(m_printContext);
1701 visitor->trace(m_geolocationClientProxy); 1698 visitor->trace(m_geolocationClientProxy);
1702 visitor->template registerWeakMembers<WebFrame, &WebFrame::clearWeakFrames>( this); 1699 visitor->template registerWeakMembers<WebFrame, &WebFrame::clearWeakFrames>( this);
1703 WebFrame::traceFrames(visitor, this); 1700 WebFrame::traceFrames(visitor, this);
1704 } 1701 }
1705 #endif 1702 #endif
1706 1703
1707 void WebLocalFrameImpl::setCoreFrame(PassRefPtrWillBeRawPtr<LocalFrame> frame) 1704 void WebLocalFrameImpl::setCoreFrame(PassRefPtrWillBeRawPtr<LocalFrame> frame)
1708 { 1705 {
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
2038 { 2035 {
2039 if (devToolsClient) { 2036 if (devToolsClient) {
2040 m_devToolsAgent = WebDevToolsAgentImpl::create(this, devToolsClient); 2037 m_devToolsAgent = WebDevToolsAgentImpl::create(this, devToolsClient);
2041 } else { 2038 } else {
2042 m_devToolsAgent->willBeDestroyed(); 2039 m_devToolsAgent->willBeDestroyed();
2043 m_devToolsAgent->dispose(); 2040 m_devToolsAgent->dispose();
2044 m_devToolsAgent.clear(); 2041 m_devToolsAgent.clear();
2045 } 2042 }
2046 } 2043 }
2047 2044
2048 InspectorOverlay* WebLocalFrameImpl::inspectorOverlay()
2049 {
2050 if (!m_inspectorOverlay)
2051 m_inspectorOverlay = InspectorOverlayImpl::createEmpty();
2052 return m_inspectorOverlay.get();
2053 }
2054
2055 WebDevToolsAgent* WebLocalFrameImpl::devToolsAgent() 2045 WebDevToolsAgent* WebLocalFrameImpl::devToolsAgent()
2056 { 2046 {
2057 return m_devToolsAgent.get(); 2047 return m_devToolsAgent.get();
2058 } 2048 }
2059 2049
2060 void WebLocalFrameImpl::sendPings(const WebNode& contextNode, const WebURL& dest inationURL) 2050 void WebLocalFrameImpl::sendPings(const WebNode& contextNode, const WebURL& dest inationURL)
2061 { 2051 {
2062 ASSERT(frame()); 2052 ASSERT(frame());
2063 Element* anchor = contextNode.constUnwrap<Node>()->enclosingLinkEventParentO rSelf(); 2053 Element* anchor = contextNode.constUnwrap<Node>()->enclosingLinkEventParentO rSelf();
2064 if (isHTMLAnchorElement(anchor)) 2054 if (isHTMLAnchorElement(anchor))
(...skipping 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
2212 } 2202 }
2213 2203
2214 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const 2204 WebSandboxFlags WebLocalFrameImpl::effectiveSandboxFlags() const
2215 { 2205 {
2216 if (!frame()) 2206 if (!frame())
2217 return WebSandboxFlags::None; 2207 return WebSandboxFlags::None;
2218 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( )); 2208 return static_cast<WebSandboxFlags>(frame()->loader().effectiveSandboxFlags( ));
2219 } 2209 }
2220 2210
2221 } // namespace blink 2211 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebLocalFrameImpl.h ('k') | Source/web/WebViewImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698