[v8-dev] Re: Fix component build some more. (issue 209873004)

[marja]

Reviewers: dcarney,

Message:
Committed patchset #2 manually as r20188 (presubmit successful).
Description:
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=dcar...@chromium.org
BUG=

Committed: https://code.google.com/p/v8/source/detail?r=20188

Please review this at https://codereview.chromium.org/209873004/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files (+33, -30 lines):
  M include/v8.h
  M src/api.cc


Index: include/v8.h
diff --git a/include/v8.h b/include/v8.h
index  
ef98f770ff118c95bb3d7e7e3a2fc6606ea9e702..3bcea9aec112691593cd36c4dea1cb31479f1a5b  
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<String> source_string, const ScriptOrigin& origin,
+    V8_INLINE Source(Local<String> source_string, const ScriptOrigin&  
origin,
            CachedData* cached_data = NULL);
-    Source(Local<String> source_string, CachedData* cached_data = NULL);
-    ~Source();
+    V8_INLINE Source(Local<String> 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<String> source_string;

@@ -6073,6 +6076,32 @@ Handle<Boolean>  
ScriptOrigin::ResourceIsSharedCrossOrigin() const {
 }


+ScriptCompiler::Source::Source(Local<String> 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> 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> Boolean::New(Isolate* isolate, bool value) {
   return value ? True(isolate) : False(isolate);
 }
Index: src/api.cc
diff --git a/src/api.cc b/src/api.cc
index  
b1d133abf916290f8c35078b0138431478350f71..c89b61937923f99f49bf44da5de976038c850901  
100644
--- a/src/api.cc
+++ b/src/api.cc
@@ -1624,32 +1624,6 @@ ScriptCompiler::CachedData::~CachedData() {
 }


-ScriptCompiler::Source::Source(Local<String> 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> 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<Script> UnboundScript::BindToCurrentContext() {
   i::Handle<i::HeapObject> obj =
       i::Handle<i::HeapObject>::cast(Utils::OpenHandle(this));


--
--
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev
--- 
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.