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

Side by Side Diff: Source/WebCore/inspector/InspectorController.cpp

Issue 11415147: Merge 135571 - Web Inspector: inspector overlay is always updated when inspector is open (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1312/
Patch Set: Created 8 years 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 | « no previous file | Source/WebCore/inspector/InspectorPageAgent.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) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 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 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
286 (*it)->restore(); 286 (*it)->restore();
287 } 287 }
288 288
289 void InspectorController::setProcessId(long processId) 289 void InspectorController::setProcessId(long processId)
290 { 290 {
291 IdentifiersFactory::setProcessId(processId); 291 IdentifiersFactory::setProcessId(processId);
292 } 292 }
293 293
294 void InspectorController::webViewResized(const IntSize& size) 294 void InspectorController::webViewResized(const IntSize& size)
295 { 295 {
296 m_overlay->resize(size); 296 m_pageAgent->webViewResized(size);
297 } 297 }
298 298
299 void InspectorController::evaluateForTestInFrontend(long callId, const String& s cript) 299 void InspectorController::evaluateForTestInFrontend(long callId, const String& s cript)
300 { 300 {
301 m_inspectorAgent->evaluateForTestInFrontend(callId, script); 301 m_inspectorAgent->evaluateForTestInFrontend(callId, script);
302 } 302 }
303 303
304 void InspectorController::drawHighlight(GraphicsContext& context) const 304 void InspectorController::drawHighlight(GraphicsContext& context) const
305 { 305 {
306 m_overlay->paint(context); 306 m_overlay->paint(context);
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 info.addMember(m_inspectorFrontendClient); 404 info.addMember(m_inspectorFrontendClient);
405 info.addMember(m_inspectorFrontend); 405 info.addMember(m_inspectorFrontend);
406 info.addMember(m_page); 406 info.addMember(m_page);
407 info.addMember(m_inspectorClient); 407 info.addMember(m_inspectorClient);
408 info.addMember(m_agents); 408 info.addMember(m_agents);
409 } 409 }
410 410
411 } // namespace WebCore 411 } // namespace WebCore
412 412
413 #endif // ENABLE(INSPECTOR) 413 #endif // ENABLE(INSPECTOR)
OLDNEW
« no previous file with comments | « no previous file | Source/WebCore/inspector/InspectorPageAgent.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698