1 files changed, 20 insertions, 20 deletions

diff --git a/chromium/third_party/WebKit/Source/bindings/v8/custom/V8DeviceMotionEventCustom.cpp b/chromium/third_party/WebKit/Source/bindings/v8/custom/V8DeviceMotionEventCustom.cpp
index a170e1cde5f..ecf0ca7e9ee 100644
--- a/chromium/third_party/WebKit/Source/bindings/v8/custom/V8DeviceMotionEventCustom.cpp
+++ b/chromium/third_party/WebKit/Source/bindings/v8/custom/V8DeviceMotionEventCustom.cpp
@@ -24,7 +24,7 @@
  */
 
 #include "config.h"
-#include "V8DeviceMotionEvent.h"
+#include "bindings/modules/v8/V8DeviceMotionEvent.h"
 
 #include "bindings/v8/V8Binding.h"
 #include "modules/device_orientation/DeviceMotionData.h"
@@ -34,66 +34,66 @@ namespace WebCore {
 
 namespace {
 
-RefPtr<DeviceMotionData::Acceleration> readAccelerationArgument(v8::Local<v8::Value> value, v8::Isolate* isolate)
+PassRefPtrWillBeRawPtr<DeviceMotionData::Acceleration> readAccelerationArgument(v8::Local<v8::Value> value, v8::Isolate* isolate)
 {
     if (isUndefinedOrNull(value))
-        return 0;
+        return nullptr;
 
     // Given the test above, this will always yield an object.
     v8::Local<v8::Object> object = value->ToObject();
 
     v8::Local<v8::Value> xValue = object->Get(v8AtomicString(isolate, "x"));
     if (xValue.IsEmpty())
-        return 0;
+        return nullptr;
     bool canProvideX = !isUndefinedOrNull(xValue);
     double x = xValue->NumberValue();
 
     v8::Local<v8::Value> yValue = object->Get(v8AtomicString(isolate, "y"));
     if (yValue.IsEmpty())
-        return 0;
+        return nullptr;
     bool canProvideY = !isUndefinedOrNull(yValue);
     double y = yValue->NumberValue();
 
     v8::Local<v8::Value> zValue = object->Get(v8AtomicString(isolate, "z"));
     if (zValue.IsEmpty())
-        return 0;
+        return nullptr;
     bool canProvideZ = !isUndefinedOrNull(zValue);
     double z = zValue->NumberValue();
 
     if (!canProvideX && !canProvideY && !canProvideZ)
-        return 0;
+        return nullptr;
 
     return DeviceMotionData::Acceleration::create(canProvideX, x, canProvideY, y, canProvideZ, z);
 }
 
-RefPtr<DeviceMotionData::RotationRate> readRotationRateArgument(v8::Local<v8::Value> value, v8::Isolate* isolate)
+PassRefPtrWillBeRawPtr<DeviceMotionData::RotationRate> readRotationRateArgument(v8::Local<v8::Value> value, v8::Isolate* isolate)
 {
     if (isUndefinedOrNull(value))
-        return 0;
+        return nullptr;
 
     // Given the test above, this will always yield an object.
     v8::Local<v8::Object> object = value->ToObject();
 
     v8::Local<v8::Value> alphaValue = object->Get(v8AtomicString(isolate, "alpha"));
     if (alphaValue.IsEmpty())
-        return 0;
+        return nullptr;
     bool canProvideAlpha = !isUndefinedOrNull(alphaValue);
     double alpha = alphaValue->NumberValue();
 
     v8::Local<v8::Value> betaValue = object->Get(v8AtomicString(isolate, "beta"));
     if (betaValue.IsEmpty())
-        return 0;
+        return nullptr;
     bool canProvideBeta = !isUndefinedOrNull(betaValue);
     double beta = betaValue->NumberValue();
 
     v8::Local<v8::Value> gammaValue = object->Get(v8AtomicString(isolate, "gamma"));
     if (gammaValue.IsEmpty())
-        return 0;
+        return nullptr;
     bool canProvideGamma = !isUndefinedOrNull(gammaValue);
     double gamma = gammaValue->NumberValue();
 
     if (!canProvideAlpha && !canProvideBeta && !canProvideGamma)
-        return 0;
+        return nullptr;
 
     return DeviceMotionData::RotationRate::create(canProvideAlpha, alpha, canProvideBeta, beta, canProvideGamma, gamma);
 }
@@ -102,18 +102,18 @@ RefPtr<DeviceMotionData::RotationRate> readRotationRateArgument(v8::Local<v8::Va
 
 void V8DeviceMotionEvent::initDeviceMotionEventMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
-    DeviceMotionEvent* imp = V8DeviceMotionEvent::toNative(info.Holder());
+    DeviceMotionEvent* impl = V8DeviceMotionEvent::toNative(info.Holder());
     v8::Isolate* isolate = info.GetIsolate();
-    V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, type, info[0]);
+    TOSTRING_VOID(V8StringResource<>, type, info[0]);
     bool bubbles = info[1]->BooleanValue();
     bool cancelable = info[2]->BooleanValue();
-    RefPtr<DeviceMotionData::Acceleration> acceleration = readAccelerationArgument(info[3], isolate);
-    RefPtr<DeviceMotionData::Acceleration> accelerationIncludingGravity = readAccelerationArgument(info[4], isolate);
-    RefPtr<DeviceMotionData::RotationRate> rotationRate = readRotationRateArgument(info[5], isolate);
+    RefPtrWillBeRawPtr<DeviceMotionData::Acceleration> acceleration = readAccelerationArgument(info[3], isolate);
+    RefPtrWillBeRawPtr<DeviceMotionData::Acceleration> accelerationIncludingGravity = readAccelerationArgument(info[4], isolate);
+    RefPtrWillBeRawPtr<DeviceMotionData::RotationRate> rotationRate = readRotationRateArgument(info[5], isolate);
     bool intervalProvided = !isUndefinedOrNull(info[6]);
     double interval = info[6]->NumberValue();
-    RefPtr<DeviceMotionData> deviceMotionData = DeviceMotionData::create(acceleration, accelerationIncludingGravity, rotationRate, intervalProvided, interval);
-    imp->initDeviceMotionEvent(type, bubbles, cancelable, deviceMotionData.get());
+    RefPtrWillBeRawPtr<DeviceMotionData> deviceMotionData = DeviceMotionData::create(acceleration.release(), accelerationIncludingGravity.release(), rotationRate.release(), intervalProvided, interval);
+    impl->initDeviceMotionEvent(type, bubbles, cancelable, deviceMotionData.get());
 }
 
 } // namespace WebCore