Merge 139854

Source/WebCore/bindings/v8/SerializedScriptValue.h

 /*
  * Copyright (C) 2009, 2010 Google Inc. 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
@@ skipping 55 matching lines @@
     static PassRefPtr<SerializedScriptValue> numberValue(double value, v8::Isolate* = 0);
 
     static uint32_t wireFormatVersion();
 
     PassRefPtr<SerializedScriptValue> release();
 
     String toWireString() const { return m_data; }
 
     // Deserializes the value (in the current context). Returns a null value in
     // case of failure.
-    v8::Handle<v8::Value> deserialize(MessagePortArray* = 0, v8::Isolate* = 0);
+    v8::Handle<v8::Value> deserialize(MessagePortArray* = 0);
+    v8::Handle<v8::Value> deserialize(v8::Isolate*, MessagePortArray* = 0);
 
 #if ENABLE(INSPECTOR)
-    ScriptValue deserializeForInspector(ScriptState*, v8::Isolate* = 0);
+    ScriptValue deserializeForInspector(ScriptState*);
 #endif
 
     const Vector<String>& blobURLs() const { return m_blobURLs; }
 
     // Informs the V8 about external memory allocated and owned by this object. Large values should contribute
     // to GC counters to eventually trigger a GC, otherwise flood of postMessage() can cause OOM.
     // Ok to invoke multiple times (only adds memory once).
     // The memory registration is revoked automatically in destructor.
     void registerMemoryAllocatedWithCurrentScriptContext();
 
@@ skipping 12 matching lines @@
 
     String m_data;
     OwnPtr<ArrayBufferContentsArray> m_arrayBufferContentsArray;
     Vector<String> m_blobURLs;
     intptr_t m_externallyAllocatedMemory;
 };
 
 } // namespace WebCore
 
 #endif // SerializedScriptValue_h