Add an optional source length field to the Extension constructor.

include/v8.h

 // Copyright 2011 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 1150 matching lines @@
   /**
    * Get the ExternalStringResource for an external string.  Returns
    * NULL if IsExternal() doesn't return true.
    */
   inline ExternalStringResource* GetExternalStringResource() const;
 
   /**
    * Get the ExternalAsciiStringResource for an external ascii string.
    * Returns NULL if IsExternalAscii() doesn't return true.
    */
-  V8EXPORT ExternalAsciiStringResource* GetExternalAsciiStringResource() const;
+  V8EXPORT const ExternalAsciiStringResource*GetExternalAsciiStringResource()

[Aaron Boodman, 2011/09/14 20:33:18]

Nit: Put the space back after the *.

[miket_OOO, 2011/09/14 20:47:16]

Whoops! Thanks.

+      const;
 
   static inline String* Cast(v8::Value* obj);
 
   /**
    * Allocates a new string from either utf-8 encoded or ascii data.
    * The second parameter 'length' gives the buffer length.
    * If the data is utf-8 encoded, the caller must
    * be careful to supply the length parameter.
    * If it is not given, the function calls
    * 'strlen' to determine the buffer length, it might be
@@ skipping 1259 matching lines @@
   static Local<TypeSwitch> New(Handle<FunctionTemplate> type);
   static Local<TypeSwitch> New(int argc, Handle<FunctionTemplate> types[]);
   int match(Handle<Value> value);
  private:
   TypeSwitch();
 };
 
 
 // --- Extensions ---
 
+class ExternalAsciiStringResourceImpl
+    : public String::ExternalAsciiStringResource {
+ public:
+  ExternalAsciiStringResourceImpl() : data_(0), length_(0) {};

[fschneider, 2011/09/19 07:58:57]

No ; at the end?

[miket_OOO, 2011/09/19 17:39:21]

Fixed (et seq.). Thanks. Still a bit rusty on C++ :(.

+  ExternalAsciiStringResourceImpl(const char *data, size_t length)

[Aaron Boodman, 2011/09/14 20:33:18]

In chrome, the * goes next to the type.

[miket_OOO, 2011/09/14 20:47:16]

I'm trying to untrain myself. Fixed; thanks.

+      : data_(data), length_(length) {};

[fschneider, 2011/09/19 07:58:57]

; at the end should not be necessary

+  const char *data() const { return data_; }
+  size_t length() const { return length_; }
+ private:

[fschneider, 2011/09/19 07:58:57]

Newline before private:

[miket_OOO, 2011/09/19 17:39:21]

Fixed.

+  const char *data_;
+  size_t length_;
+};
 
 /**
  * Ignore
  */
 class V8EXPORT Extension {  // NOLINT
  public:
+  // Note that the strings passed into this constructor must live as long
+  // as the Extension itself.
   Extension(const char* name,
             const char* source = 0,
             int dep_count = 0,
-            const char** deps = 0);
+            const char** deps = 0,
+            int source_length = -1);

[fschneider, 2011/09/19 07:58:57]

I wish there was a way to reduce the number of optional paramters in a row. E.g.
does the source parameter have to be optional?

[miket_OOO, 2011/09/19 17:39:21]

Agreed. I'd appreciate your opinion on altering vs. extending the existing v8
API. I am taking the conservative route.

   virtual ~Extension() { }
   virtual v8::Handle<v8::FunctionTemplate>
       GetNativeFunction(v8::Handle<v8::String> name) {
     return v8::Handle<v8::FunctionTemplate>();
   }
 
-  const char* name() { return name_; }
-  const char* source() { return source_; }
+  const char* name() const { return name_; }
+  size_t source_length() const { return source_length_; }
+  const String::ExternalAsciiStringResource* source() const {
+    return &source_; }
   int dependency_count() { return dep_count_; }
   const char** dependencies() { return deps_; }
   void set_auto_enable(bool value) { auto_enable_ = value; }
   bool auto_enable() { return auto_enable_; }
 
  private:
   const char* name_;
-  const char* source_;
+  size_t source_length_;  // expected to initialize before source_
+  ExternalAsciiStringResourceImpl source_;
   int dep_count_;
   const char** deps_;
   bool auto_enable_;
 
   // Disallow copying and assigning.
   Extension(const Extension&);
   void operator=(const Extension&);
 };
 
 
@@ skipping 1711 matching lines @@
 
 
 }  // namespace v8
 
 
 #undef V8EXPORT
 #undef TYPE_CHECK
 
 
 #endif  // V8_H_