Merged r11308, r11311, r11313 into trunk branch.
Fix several ancient presubmit failures.
Provide empty default implementation of OutputStream::WriteUint32Chunk to make Webkit V8 bindings compile
Fix r11306 to use external references on X64.
R=mstarzinger@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10081005
git-svn-id: http://v8.googlecode.com/svn/trunk@11316 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
diff --git a/include/v8.h b/include/v8.h
index a55e134..0f05230 100644
--- a/include/v8.h
+++ b/include/v8.h
@@ -1969,6 +1969,7 @@
inline bool IsConstructCall() const;
inline Local<Value> Data() const;
inline Isolate* GetIsolate() const;
+
private:
static const int kIsolateIndex = 0;
static const int kDataIndex = -1;
@@ -1999,6 +2000,7 @@
inline Local<Value> Data() const;
inline Local<Object> This() const;
inline Local<Object> Holder() const;
+
private:
internal::Object** args_;
};
@@ -3770,7 +3772,11 @@
* can be stopped by returning kAbort as function result. EndOfStream
* will not be called in case writing was aborted.
*/
- virtual WriteResult WriteUint32Chunk(uint32_t* data, int count) = 0;
+ // TODO(loislo): Make this pure virtual when WebKit's V8 bindings
+ // have been updated.
+ virtual WriteResult WriteUint32Chunk(uint32_t* data, int count) {
+ return kAbort;
+ };
};