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

Side by Side Diff: include/v8.h

Issue 454001: Merge revisions r3372 - r3374 to trunk... (Closed) Base URL: http://v8.googlecode.com/svn/branches/1.3/
Patch Set: '' Created 11 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | src/accessors.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 2007-2009 the V8 project authors. All rights reserved. 1 // Copyright 2007-2009 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 579 matching lines...) Expand 10 before | Expand all | Expand 10 after
590 /** 590 /**
591 * Returns the script id value. 591 * Returns the script id value.
592 */ 592 */
593 Local<Value> Id(); 593 Local<Value> Id();
594 594
595 /** 595 /**
596 * Associate an additional data object with the script. This is mainly used 596 * Associate an additional data object with the script. This is mainly used
597 * with the debugger as this data object is only available through the 597 * with the debugger as this data object is only available through the
598 * debugger API. 598 * debugger API.
599 */ 599 */
600 void SetData(Handle<Value> data); 600 void SetData(Handle<String> data);
601 }; 601 };
602 602
603 603
604 /** 604 /**
605 * An error message. 605 * An error message.
606 */ 606 */
607 class V8EXPORT Message { 607 class V8EXPORT Message {
608 public: 608 public:
609 Local<String> Get() const; 609 Local<String> Get() const;
610 Local<String> GetSourceLine() const; 610 Local<String> GetSourceLine() const;
(...skipping 2014 matching lines...) Expand 10 before | Expand all | Expand 10 after
2625 bool HasOutOfMemoryException(); 2625 bool HasOutOfMemoryException();
2626 2626
2627 /** Returns true if V8 has a current context. */ 2627 /** Returns true if V8 has a current context. */
2628 static bool InContext(); 2628 static bool InContext();
2629 2629
2630 /** 2630 /**
2631 * Associate an additional data object with the context. This is mainly used 2631 * Associate an additional data object with the context. This is mainly used
2632 * with the debugger to provide additional information on the context through 2632 * with the debugger to provide additional information on the context through
2633 * the debugger API. 2633 * the debugger API.
2634 */ 2634 */
2635 void SetData(Handle<Value> data); 2635 void SetData(Handle<String> data);
2636 Local<Value> GetData(); 2636 Local<Value> GetData();
2637 2637
2638 /** 2638 /**
2639 * Stack-allocated class which sets the execution context for all 2639 * Stack-allocated class which sets the execution context for all
2640 * operations executed within a local scope. 2640 * operations executed within a local scope.
2641 */ 2641 */
2642 class V8EXPORT Scope { 2642 class V8EXPORT Scope {
2643 public: 2643 public:
2644 inline Scope(Handle<Context> context) : context_(context) { 2644 inline Scope(Handle<Context> context) : context_(context) {
2645 context_->Enter(); 2645 context_->Enter();
(...skipping 558 matching lines...) Expand 10 before | Expand all | Expand 10 after
3204 3204
3205 } // namespace v8 3205 } // namespace v8
3206 3206
3207 3207
3208 #undef V8EXPORT 3208 #undef V8EXPORT
3209 #undef V8EXPORT_INLINE 3209 #undef V8EXPORT_INLINE
3210 #undef TYPE_CHECK 3210 #undef TYPE_CHECK
3211 3211
3212 3212
3213 #endif // V8_H_ 3213 #endif // V8_H_
OLDNEW
« no previous file with comments | « no previous file | src/accessors.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698