webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

2 files changed, 19 insertions, 18 deletions

diff --git a/Source/WebCore/bridge/jsc/BridgeJSC.cpp b/Source/WebCore/bridge/jsc/BridgeJSC.cpp
index 6ed148552..f17b1df14 100644
--- a/Source/WebCore/bridge/jsc/BridgeJSC.cpp
+++ b/Source/WebCore/bridge/jsc/BridgeJSC.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003, 2006, 2008 Apple Inc. All rights reserved.
+ * Copyright (C) 2003, 2006, 2008, 2015 Apple Inc. All rights reserved.
  * Copyright 2010, The Android Open Source Project
  *
  * Redistribution and use in source and binary forms, with or without
@@ -11,10 +11,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@@ -27,6 +27,7 @@
 #include "config.h"
 #include "BridgeJSC.h"
 
+#include "DOMWindow.h"
 #include "JSDOMWindowBase.h"
 #include "runtime_object.h"
 #include "runtime_root.h"
@@ -37,8 +38,8 @@ namespace JSC {
 
 namespace Bindings {
 
-Array::Array(PassRefPtr<RootObject> rootObject)
-    : m_rootObject(rootObject)
+Array::Array(RefPtr<RootObject>&& rootObject)
+    : m_rootObject(WTFMove(rootObject))
 {
     ASSERT(m_rootObject);
 }
@@ -47,8 +48,8 @@ Array::~Array()
 {
 }
 
-Instance::Instance(PassRefPtr<RootObject> rootObject)
-    : m_rootObject(rootObject)
+Instance::Instance(RefPtr<RootObject>&& rootObject)
+    : m_rootObject(WTFMove(rootObject))
 {
     ASSERT(m_rootObject);
 }
diff --git a/Source/WebCore/bridge/jsc/BridgeJSC.h b/Source/WebCore/bridge/jsc/BridgeJSC.h
index a2ef87896..5fe85f5f4 100644
--- a/Source/WebCore/bridge/jsc/BridgeJSC.h
+++ b/Source/WebCore/bridge/jsc/BridgeJSC.h
@@ -11,10 +11,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
@@ -28,8 +28,8 @@
 #define BridgeJSC_h
 
 #include "Bridge.h"
+#include <runtime/JSCInlines.h>
 #include <runtime/JSString.h>
-#include <runtime/Operations.h>
 #include <wtf/HashMap.h>
 #include <wtf/RefCounted.h>
 #include <wtf/Vector.h>
@@ -52,7 +52,7 @@ class RuntimeObject;
 class Field {
 public:
     virtual JSValue valueFromInstance(ExecState*, const Instance*) const = 0;
-    virtual void setValueToInstance(ExecState*, const Instance*, JSValue) const = 0;
+    virtual bool setValueToInstance(ExecState*, const Instance*, JSValue) const = 0;
 
     virtual ~Field() { }
 };
@@ -70,7 +70,7 @@ public:
 
 class Instance : public RefCounted<Instance> {
 public:
-    Instance(PassRefPtr<RootObject>);
+    WEBCORE_EXPORT Instance(RefPtr<RootObject>&&);
 
     // These functions are called before and after the main entry points into
     // the native implementations.  They can be used to establish and cleanup
@@ -79,7 +79,7 @@ public:
     void end();
 
     virtual Class* getClass() const = 0;
-    JSObject* createRuntimeObject(ExecState*);
+    WEBCORE_EXPORT JSObject* createRuntimeObject(ExecState*);
     void willInvalidateRuntimeObject();
 
     // Returns false if the value was not set successfully.
@@ -102,15 +102,15 @@ public:
 
     RootObject* rootObject() const;
 
-    virtual ~Instance();
+    WEBCORE_EXPORT virtual ~Instance();
 
     virtual bool getOwnPropertySlot(JSObject*, ExecState*, PropertyName, PropertySlot&) { return false; }
-    virtual void put(JSObject*, ExecState*, PropertyName, JSValue, PutPropertySlot&) { }
+    virtual bool put(JSObject*, ExecState*, PropertyName, JSValue, PutPropertySlot&) { return false; }
 
 protected:
     virtual void virtualBegin() { }
     virtual void virtualEnd() { }
-    virtual RuntimeObject* newRuntimeObject(ExecState*);
+    WEBCORE_EXPORT virtual RuntimeObject* newRuntimeObject(ExecState*);
 
     RefPtr<RootObject> m_rootObject;
 
@@ -121,10 +121,10 @@ private:
 class Array {
     WTF_MAKE_NONCOPYABLE(Array);
 public:
-    Array(PassRefPtr<RootObject>);
+    explicit Array(RefPtr<RootObject>&&);
     virtual ~Array();
 
-    virtual void setValueAt(ExecState*, unsigned index, JSValue) const = 0;
+    virtual bool setValueAt(ExecState*, unsigned index, JSValue) const = 0;
     virtual JSValue valueAt(ExecState*, unsigned index) const = 0;
     virtual unsigned int getLength() const = 0;