WebKit side of merge from r41149 to r41181.

JavaScriptCore/runtime/JSByteArray.h

 /*
  * Copyright (C) 2009 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 15 matching lines @@
 #ifndef JSByteArray_h
 #define JSByteArray_h
 
 #include "JSObject.h"
 
 #include <wtf/ByteArray.h>
 
 namespace JSC {
 
     class JSByteArray : public JSObject {
-        friend class Interpreter;
+        friend class VPtrSet;
     public:
         bool canAccessIndex(unsigned i) { return i < m_storage->length(); }
         JSValuePtr getIndex(ExecState* exec, unsigned i)
         {
             ASSERT(canAccessIndex(i));
             return jsNumber(exec, m_storage->data()[i]);
         }
 
         void setIndex(unsigned i, int value)
         {
@@ skipping 53 matching lines @@
 
         RefPtr<WTF::ByteArray> m_storage;
         const ClassInfo* m_classInfo;
     };
     
     JSByteArray* asByteArray(JSValuePtr value);
     inline JSByteArray* asByteArray(JSValuePtr value)
     {
         return static_cast<JSByteArray*>(asCell(value));
     }
-}
 
-#endif
+    inline bool isJSByteArray(JSGlobalData* globalData, JSValuePtr v) { return v.isCell() && v.asCell()->vptr() == globalData->jsByteArrayVPtr; }
+
+} // namespace JSC
+
+#endif // JSByteArray_h