| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2010-2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2010-2011 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 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 273 } | 273 } |
| 274 | 274 |
| 275 private: | 275 private: |
| 276 OwnPtr<WebDevToolsAgent::MessageDescriptor> m_descriptor; | 276 OwnPtr<WebDevToolsAgent::MessageDescriptor> m_descriptor; |
| 277 }; | 277 }; |
| 278 | 278 |
| 279 // static | 279 // static |
| 280 PassOwnPtrWillBeRawPtr<WebDevToolsAgentImpl> WebDevToolsAgentImpl::create(WebLoc
alFrameImpl* frame, WebDevToolsAgentClient* client) | 280 PassOwnPtrWillBeRawPtr<WebDevToolsAgentImpl> WebDevToolsAgentImpl::create(WebLoc
alFrameImpl* frame, WebDevToolsAgentClient* client) |
| 281 { | 281 { |
| 282 WebViewImpl* view = frame->viewImpl(); | 282 WebViewImpl* view = frame->viewImpl(); |
| 283 bool isMainFrame = view && view->mainFrameImpl() == frame; | 283 // TODO(dgozman): sometimes view->mainFrameImpl() does return null, even tho
ugh |frame| is meant to be main frame. |
| 284 // See http://crbug.com/526162. |
| 285 bool isMainFrame = view && !frame->parent(); |
| 284 if (!isMainFrame) { | 286 if (!isMainFrame) { |
| 285 WebDevToolsAgentImpl* agent = new WebDevToolsAgentImpl(frame, client, In
spectorOverlayImpl::createEmpty()); | 287 WebDevToolsAgentImpl* agent = new WebDevToolsAgentImpl(frame, client, In
spectorOverlayImpl::createEmpty()); |
| 286 if (frame->frameWidget()) | 288 if (frame->frameWidget()) |
| 287 agent->layerTreeViewChanged(toWebFrameWidgetImpl(frame->frameWidget(
))->layerTreeView()); | 289 agent->layerTreeViewChanged(toWebFrameWidgetImpl(frame->frameWidget(
))->layerTreeView()); |
| 288 return adoptPtrWillBeNoop(agent); | 290 return adoptPtrWillBeNoop(agent); |
| 289 } | 291 } |
| 290 | 292 |
| 291 WebDevToolsAgentImpl* agent = new WebDevToolsAgentImpl(frame, client, Inspec
torOverlayImpl::create(view)); | 293 WebDevToolsAgentImpl* agent = new WebDevToolsAgentImpl(frame, client, Inspec
torOverlayImpl::create(view)); |
| 292 agent->registerAgent(InspectorRenderingAgent::create(view)); | 294 agent->registerAgent(InspectorRenderingAgent::create(view)); |
| 293 agent->registerAgent(InspectorEmulationAgent::create(view)); | 295 agent->registerAgent(InspectorEmulationAgent::create(view)); |
| (...skipping 461 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 755 if (!InspectorBackendDispatcher::getCommandName(message, &commandName)) | 757 if (!InspectorBackendDispatcher::getCommandName(message, &commandName)) |
| 756 return false; | 758 return false; |
| 757 return commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_pauseCmd) | 759 return commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_pauseCmd) |
| 758 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_setBreakpointCmd) | 760 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_setBreakpointCmd) |
| 759 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_setBreakpointByUrlCmd) | 761 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_setBreakpointByUrlCmd) |
| 760 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_removeBreakpointCmd) | 762 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_removeBreakpointCmd) |
| 761 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_setBreakpointsActiveCmd); | 763 || commandName == InspectorBackendDispatcher::commandName(InspectorBacke
ndDispatcher::kDebugger_setBreakpointsActiveCmd); |
| 762 } | 764 } |
| 763 | 765 |
| 764 } // namespace blink | 766 } // namespace blink |
| OLD | NEW |