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

Side by Side Diff: src/frames-inl.h

Issue 17579005: Merge SafeStackTraceFrameIterator into SafeStackFrameIterator (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 years, 6 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 | « src/frames.cc ('k') | src/profile-generator.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 // TODO(1233797): The frame hierarchy needs to change. It's 317 // TODO(1233797): The frame hierarchy needs to change. It's
318 // problematic that we can't use the safe-cast operator to cast to 318 // problematic that we can't use the safe-cast operator to cast to
319 // the JavaScript frame type, because we may encounter arguments 319 // the JavaScript frame type, because we may encounter arguments
320 // adaptor frames. 320 // adaptor frames.
321 StackFrame* frame = iterator_.frame(); 321 StackFrame* frame = iterator_.frame();
322 ASSERT(frame->is_java_script() || frame->is_arguments_adaptor()); 322 ASSERT(frame->is_java_script() || frame->is_arguments_adaptor());
323 return static_cast<JavaScriptFrame*>(frame); 323 return static_cast<JavaScriptFrame*>(frame);
324 } 324 }
325 325
326 326
327 inline JavaScriptFrame* SafeStackTraceFrameIterator::frame() const { 327 inline JavaScriptFrame* SafeStackFrameIterator::frame() const {
328 ASSERT(!iteration_done_);
328 // TODO(1233797): The frame hierarchy needs to change. It's 329 // TODO(1233797): The frame hierarchy needs to change. It's
329 // problematic that we can't use the safe-cast operator to cast to 330 // problematic that we can't use the safe-cast operator to cast to
330 // the JavaScript frame type, because we may encounter arguments 331 // the JavaScript frame type, because we may encounter arguments
331 // adaptor frames. 332 // adaptor frames.
332 StackFrame* frame = iterator_.frame(); 333 StackFrame* frame = iterator_.frame();
333 ASSERT(frame->is_java_script()); 334 ASSERT(frame->is_java_script());
334 return static_cast<JavaScriptFrame*>(frame); 335 return static_cast<JavaScriptFrame*>(frame);
335 } 336 }
336 337
337 338
338 } } // namespace v8::internal 339 } } // namespace v8::internal
339 340
340 #endif // V8_FRAMES_INL_H_ 341 #endif // V8_FRAMES_INL_H_
OLDNEW
« no previous file with comments | « src/frames.cc ('k') | src/profile-generator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698