From: marja@chromium.org Date: Mon, 24 Mar 2014 12:13:58 +0000 (+0000) Subject: Fix component build some more. X-Git-Tag: upstream/4.7.83~10065 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e5f5cc951a2c4425593c0840b156d935db5a303f;p=platform%2Fupstream%2Fv8.git Fix component build some more. Not V8_EXPORTing ScriptCompiler::Source got rid of the last errors. This fixes the new ones created by it. V8_INLINEing these funcs makes sense anyway. In addition, added declared-private-and-unimplemented assignment operators which were accidentally omitted. R=dcarney@chromium.org BUG= Review URL: https://codereview.chromium.org/209873004 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@20188 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- diff --git a/include/v8.h b/include/v8.h index ef98f77..3bcea9a 100644 --- a/include/v8.h +++ b/include/v8.h @@ -1120,6 +1120,7 @@ class V8_EXPORT ScriptCompiler { private: // Prevent copying. Not implemented. CachedData(const CachedData&); + CachedData& operator=(const CachedData&); }; /** @@ -1129,20 +1130,22 @@ class V8_EXPORT ScriptCompiler { class Source { public: // Source takes ownership of CachedData. - Source(Local source_string, const ScriptOrigin& origin, + V8_INLINE Source(Local source_string, const ScriptOrigin& origin, CachedData* cached_data = NULL); - Source(Local source_string, CachedData* cached_data = NULL); - ~Source(); + V8_INLINE Source(Local source_string, + CachedData* cached_data = NULL); + V8_INLINE ~Source(); // Ownership of the CachedData or its buffers is *not* transferred to the // caller. The CachedData object is alive as long as the Source object is // alive. - const CachedData* GetCachedData() const; + V8_INLINE const CachedData* GetCachedData() const; private: friend class ScriptCompiler; // Prevent copying. Not implemented. Source(const Source&); + Source& operator=(const Source&); Local source_string; @@ -6073,6 +6076,32 @@ Handle ScriptOrigin::ResourceIsSharedCrossOrigin() const { } +ScriptCompiler::Source::Source(Local string, const ScriptOrigin& origin, + CachedData* data) + : source_string(string), + resource_name(origin.ResourceName()), + resource_line_offset(origin.ResourceLineOffset()), + resource_column_offset(origin.ResourceColumnOffset()), + resource_is_shared_cross_origin(origin.ResourceIsSharedCrossOrigin()), + cached_data(data) {} + + +ScriptCompiler::Source::Source(Local string, + CachedData* data) + : source_string(string), cached_data(data) {} + + +ScriptCompiler::Source::~Source() { + delete cached_data; +} + + +const ScriptCompiler::CachedData* ScriptCompiler::Source::GetCachedData() + const { + return cached_data; +} + + Handle Boolean::New(Isolate* isolate, bool value) { return value ? True(isolate) : False(isolate); } diff --git a/src/api.cc b/src/api.cc index b1d133a..c89b619 100644 --- a/src/api.cc +++ b/src/api.cc @@ -1624,32 +1624,6 @@ ScriptCompiler::CachedData::~CachedData() { } -ScriptCompiler::Source::Source(Local string, const ScriptOrigin& origin, - CachedData* data) - : source_string(string), - resource_name(origin.ResourceName()), - resource_line_offset(origin.ResourceLineOffset()), - resource_column_offset(origin.ResourceColumnOffset()), - resource_is_shared_cross_origin(origin.ResourceIsSharedCrossOrigin()), - cached_data(data) {} - - -ScriptCompiler::Source::Source(Local string, - CachedData* data) - : source_string(string), cached_data(data) {} - - -ScriptCompiler::Source::~Source() { - delete cached_data; -} - - -const ScriptCompiler::CachedData* ScriptCompiler::Source::GetCachedData() - const { - return cached_data; -} - - Local