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

Side by Side Diff: Source/core/inspector/InspectorCanvasAgent.cpp

Issue 33353003: Have Frame::tree() return a reference (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase on master Created 7 years, 2 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 307 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 it->value = false; 318 it->value = false;
319 m_frontend->traceLogsRemoved(0, 0); 319 m_frontend->traceLogsRemoved(0, 0);
320 } else { 320 } else {
321 while (frame) { 321 while (frame) {
322 if (m_framesWithUninstrumentedCanvases.contains(frame)) 322 if (m_framesWithUninstrumentedCanvases.contains(frame))
323 m_framesWithUninstrumentedCanvases.set(frame, false); 323 m_framesWithUninstrumentedCanvases.set(frame, false);
324 if (m_pageAgent->hasIdForFrame(frame)) { 324 if (m_pageAgent->hasIdForFrame(frame)) {
325 String frameId = m_pageAgent->frameId(frame); 325 String frameId = m_pageAgent->frameId(frame);
326 m_frontend->traceLogsRemoved(&frameId, 0); 326 m_frontend->traceLogsRemoved(&frameId, 0);
327 } 327 }
328 frame = frame->tree()->traverseNext(); 328 frame = frame->tree().traverseNext();
329 } 329 }
330 } 330 }
331 } 331 }
332 332
333 void InspectorCanvasAgent::frameDetachedFromParent(Frame* frame) 333 void InspectorCanvasAgent::frameDetachedFromParent(Frame* frame)
334 { 334 {
335 if (m_enabled) 335 if (m_enabled)
336 m_framesWithUninstrumentedCanvases.remove(frame); 336 m_framesWithUninstrumentedCanvases.remove(frame);
337 } 337 }
338 338
339 void InspectorCanvasAgent::didBeginFrame() 339 void InspectorCanvasAgent::didBeginFrame()
340 { 340 {
341 if (!m_enabled) 341 if (!m_enabled)
342 return; 342 return;
343 ErrorString error; 343 ErrorString error;
344 for (FramesWithUninstrumentedCanvases::const_iterator it = m_framesWithUnins trumentedCanvases.begin(); it != m_framesWithUninstrumentedCanvases.end(); ++it) { 344 for (FramesWithUninstrumentedCanvases::const_iterator it = m_framesWithUnins trumentedCanvases.begin(); it != m_framesWithUninstrumentedCanvases.end(); ++it) {
345 InjectedScriptCanvasModule module = injectedScriptCanvasModule(&error, m ainWorldScriptState(it->key)); 345 InjectedScriptCanvasModule module = injectedScriptCanvasModule(&error, m ainWorldScriptState(it->key));
346 if (!module.hasNoValue()) 346 if (!module.hasNoValue())
347 module.markFrameEnd(); 347 module.markFrameEnd();
348 } 348 }
349 } 349 }
350 350
351 } // namespace WebCore 351 } // namespace WebCore
352 352
OLDNEW
« no previous file with comments | « Source/core/inspector/InspectorApplicationCacheAgent.cpp ('k') | Source/core/inspector/InspectorDOMAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698