bindings: Remove obsolete functions using |is_null| (3 of N)

Bug: 1060971
Change-Id: I180e012501bf308c30b9dcae2998160e0eeb4192
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2159174Reviewed-by: Kentaro Hara <haraken@chromium.org>
Commit-Queue: Yuki Shiino <yukishiino@chromium.org>
Cr-Commit-Position: refs/heads/master@{#761023}

third_party/blink/renderer/modules/bluetooth/bluetooth_advertising_event.cc

@@ -73,21 +73,6 @@ const HeapVector<StringOrUnsignedLong>& BluetoothAdvertisingEvent::uuids()
   return uuids_;
 }
 
-uint16_t BluetoothAdvertisingEvent::appearance(bool& is_null) const {
-  is_null = !appearance_.has_value();
-  return appearance_.value_or(0);
-}
-
-int8_t BluetoothAdvertisingEvent::txPower(bool& is_null) const {
-  is_null = !txPower_.has_value();
-  return txPower_.value_or(0);
-}
-
-int8_t BluetoothAdvertisingEvent::rssi(bool& is_null) const {
-  is_null = !rssi_.has_value();
-  return rssi_.value_or(0);
-}
-
 BluetoothManufacturerDataMap* BluetoothAdvertisingEvent::manufacturerData()
     const {
   return manufacturer_data_map_;

third_party/blink/renderer/modules/bluetooth/bluetooth_advertising_event.h

@@ -44,10 +44,6 @@ class BluetoothAdvertisingEvent final : public Event {
   base::Optional<uint16_t> appearance() const { return appearance_; }
   base::Optional<int8_t> txPower() const { return txPower_; }
   base::Optional<int8_t> rssi() const { return rssi_; }
-  // TODO(crbug.com/1060971): Remove |is_null| version.
-  uint16_t appearance(bool& is_null) const;  // DEPRECATED
-  int8_t txPower(bool& is_null) const;       // DEPRECATED
-  int8_t rssi(bool& is_null) const;          // DEPRECATED
   BluetoothManufacturerDataMap* manufacturerData() const;
   BluetoothServiceDataMap* serviceData() const;
 

third_party/blink/renderer/modules/device_orientation/device_motion_event_acceleration.cc

@@ -69,19 +69,4 @@ base::Optional<double> DeviceMotionEventAcceleration::z() const {
   return z_;
 }
 
-double DeviceMotionEventAcceleration::x(bool& is_null) const {
-  is_null = std::isnan(x_);
-  return x_;
-}
-
-double DeviceMotionEventAcceleration::y(bool& is_null) const {
-  is_null = std::isnan(y_);
-  return y_;
-}
-
-double DeviceMotionEventAcceleration::z(bool& is_null) const {
-  is_null = std::isnan(z_);
-  return z_;
-}
-
 }  // namespace blink

third_party/blink/renderer/modules/device_orientation/device_motion_event_acceleration.h

@@ -49,10 +49,6 @@ class MODULES_EXPORT DeviceMotionEventAcceleration final
   base::Optional<double> x() const;
   base::Optional<double> y() const;
   base::Optional<double> z() const;
-  // TODO(crbug.com/1060971): Remove |is_null| version.
-  double x(bool& is_null) const;  // DEPRECATED
-  double y(bool& is_null) const;  // DEPRECATED
-  double z(bool& is_null) const;  // DEPRECATED
 
  private:
   const double x_;

third_party/blink/renderer/modules/device_orientation/device_motion_event_pump_unittest.cc

@@ -224,34 +224,24 @@ TEST_F(DeviceMotionEventPumpTest, AllSensorsAreActive) {
   const DeviceMotionData* received_data = controller()->data();
   EXPECT_TRUE(controller()->did_change_device_motion());
 
-  bool is_null;
   EXPECT_TRUE(
       received_data->GetAccelerationIncludingGravity()->HasAccelerationData());
-  EXPECT_EQ(1, received_data->GetAccelerationIncludingGravity()->x(is_null));
-  EXPECT_FALSE(is_null);
-  EXPECT_EQ(2, received_data->GetAccelerationIncludingGravity()->y(is_null));
-  EXPECT_FALSE(is_null);
-  EXPECT_EQ(3, received_data->GetAccelerationIncludingGravity()->z(is_null));
-  EXPECT_FALSE(is_null);
+  EXPECT_EQ(1, received_data->GetAccelerationIncludingGravity()->x().value());
+  EXPECT_EQ(2, received_data->GetAccelerationIncludingGravity()->y().value());
+  EXPECT_EQ(3, received_data->GetAccelerationIncludingGravity()->z().value());
 
   EXPECT_TRUE(received_data->GetAcceleration()->HasAccelerationData());
-  EXPECT_EQ(4, received_data->GetAcceleration()->x(is_null));
-  EXPECT_FALSE(is_null);
-  EXPECT_EQ(5, received_data->GetAcceleration()->y(is_null));
-  EXPECT_FALSE(is_null);
-  EXPECT_EQ(6, received_data->GetAcceleration()->z(is_null));
-  EXPECT_FALSE(is_null);
+  EXPECT_EQ(4, received_data->GetAcceleration()->x().value());
+  EXPECT_EQ(5, received_data->GetAcceleration()->y().value());
+  EXPECT_EQ(6, received_data->GetAcceleration()->z().value());
 
   EXPECT_TRUE(received_data->GetRotationRate()->HasRotationData());
   EXPECT_EQ(gfx::RadToDeg(7.0),
-            received_data->GetRotationRate()->alpha(is_null));
-  EXPECT_FALSE(is_null);
+            received_data->GetRotationRate()->alpha().value());
   EXPECT_EQ(gfx::RadToDeg(8.0),
-            received_data->GetRotationRate()->beta(is_null));
-  EXPECT_FALSE(is_null);
+            received_data->GetRotationRate()->beta().value());
   EXPECT_EQ(gfx::RadToDeg(9.0),
-            received_data->GetRotationRate()->gamma(is_null));
-  EXPECT_FALSE(is_null);
+            received_data->GetRotationRate()->gamma().value());
 
   controller()->motion_pump()->Stop();
 
@@ -278,33 +268,23 @@ TEST_F(DeviceMotionEventPumpTest, TwoSensorsAreActive) {
   const DeviceMotionData* received_data = controller()->data();
   EXPECT_TRUE(controller()->did_change_device_motion());
 
-  bool is_null;
   EXPECT_TRUE(
       received_data->GetAccelerationIncludingGravity()->HasAccelerationData());
-  EXPECT_EQ(1, received_data->GetAccelerationIncludingGravity()->x(is_null));
-  EXPECT_FALSE(is_null);
-  EXPECT_EQ(2, received_data->GetAccelerationIncludingGravity()->y(is_null));
-  EXPECT_FALSE(is_null);
-  EXPECT_EQ(3, received_data->GetAccelerationIncludingGravity()->z(is_null));
-  EXPECT_FALSE(is_null);
-
-  received_data->GetAcceleration()->x(is_null);
-  EXPECT_TRUE(is_null);
-  received_data->GetAcceleration()->y(is_null);
-  EXPECT_TRUE(is_null);
-  received_data->GetAcceleration()->z(is_null);
-  EXPECT_TRUE(is_null);
+  EXPECT_EQ(1, received_data->GetAccelerationIncludingGravity()->x().value());
+  EXPECT_EQ(2, received_data->GetAccelerationIncludingGravity()->y().value());
+  EXPECT_EQ(3, received_data->GetAccelerationIncludingGravity()->z().value());
+
+  EXPECT_FALSE(received_data->GetAcceleration()->x().has_value());
+  EXPECT_FALSE(received_data->GetAcceleration()->y().has_value());
+  EXPECT_FALSE(received_data->GetAcceleration()->z().has_value());
 
   EXPECT_TRUE(received_data->GetRotationRate()->HasRotationData());
   EXPECT_EQ(gfx::RadToDeg(7.0),
-            received_data->GetRotationRate()->alpha(is_null));
-  EXPECT_FALSE(is_null);
+            received_data->GetRotationRate()->alpha().value());
   EXPECT_EQ(gfx::RadToDeg(8.0),
-            received_data->GetRotationRate()->beta(is_null));
-  EXPECT_FALSE(is_null);
+            received_data->GetRotationRate()->beta().value());
   EXPECT_EQ(gfx::RadToDeg(9.0),
-            received_data->GetRotationRate()->gamma(is_null));
-  EXPECT_FALSE(is_null);
+            received_data->GetRotationRate()->gamma().value());
 
   controller()->motion_pump()->Stop();
 
@@ -330,30 +310,21 @@ TEST_F(DeviceMotionEventPumpTest, SomeSensorDataFieldsNotAvailable) {
   const DeviceMotionData* received_data = controller()->data();
   EXPECT_TRUE(controller()->did_change_device_motion());
 
-  bool is_null;
-  received_data->GetAccelerationIncludingGravity()->x(is_null);
-  EXPECT_TRUE(is_null);
-  EXPECT_EQ(2, received_data->GetAccelerationIncludingGravity()->y(is_null));
-  EXPECT_FALSE(is_null);
-  EXPECT_EQ(3, received_data->GetAccelerationIncludingGravity()->z(is_null));
-  EXPECT_FALSE(is_null);
-
-  EXPECT_EQ(4, received_data->GetAcceleration()->x(is_null));
-  EXPECT_FALSE(is_null);
-  received_data->GetAcceleration()->y(is_null);
-  EXPECT_TRUE(is_null);
-  EXPECT_EQ(6, received_data->GetAcceleration()->z(is_null));
-  EXPECT_FALSE(is_null);
+  EXPECT_FALSE(
+      received_data->GetAccelerationIncludingGravity()->x().has_value());
+  EXPECT_EQ(2, received_data->GetAccelerationIncludingGravity()->y().value());
+  EXPECT_EQ(3, received_data->GetAccelerationIncludingGravity()->z().value());
+
+  EXPECT_EQ(4, received_data->GetAcceleration()->x().value());
+  EXPECT_FALSE(received_data->GetAcceleration()->y().has_value());
+  EXPECT_EQ(6, received_data->GetAcceleration()->z().value());
 
   EXPECT_TRUE(received_data->GetAcceleration()->HasAccelerationData());
   EXPECT_EQ(gfx::RadToDeg(7.0),
-            received_data->GetRotationRate()->alpha(is_null));
-  EXPECT_FALSE(is_null);
+            received_data->GetRotationRate()->alpha().value());
   EXPECT_EQ(gfx::RadToDeg(8.0),
-            received_data->GetRotationRate()->beta(is_null));
-  EXPECT_FALSE(is_null);
-  received_data->GetRotationRate()->gamma(is_null);
-  EXPECT_TRUE(is_null);
+            received_data->GetRotationRate()->beta().value());
+  EXPECT_FALSE(received_data->GetRotationRate()->gamma().has_value());
 
   controller()->motion_pump()->Stop();
 

third_party/blink/renderer/modules/device_orientation/device_motion_event_rotation_rate.cc

@@ -69,19 +69,4 @@ base::Optional<double> DeviceMotionEventRotationRate::gamma() const {
   return gamma_;
 }
 
-double DeviceMotionEventRotationRate::alpha(bool& is_null) const {
-  is_null = std::isnan(alpha_);
-  return alpha_;
-}
-
-double DeviceMotionEventRotationRate::beta(bool& is_null) const {
-  is_null = std::isnan(beta_);
-  return beta_;
-}
-
-double DeviceMotionEventRotationRate::gamma(bool& is_null) const {
-  is_null = std::isnan(gamma_);
-  return gamma_;
-}
-
 }  // namespace blink

third_party/blink/renderer/modules/device_orientation/device_motion_event_rotation_rate.h

@@ -51,10 +51,6 @@ class MODULES_EXPORT DeviceMotionEventRotationRate final
   base::Optional<double> alpha() const;
   base::Optional<double> beta() const;
   base::Optional<double> gamma() const;
-  // TODO(crbug.com/1060971): Remove |is_null| version.
-  double alpha(bool& is_null) const;  // DEPRECATED
-  double beta(bool& is_null) const;   // DEPRECATED
-  double gamma(bool& is_null) const;  // DEPRECATED
 
  private:
   const double alpha_;

third_party/blink/renderer/modules/device_orientation/device_orientation_event.cc

@@ -65,30 +65,6 @@ base::Optional<double> DeviceOrientationEvent::gamma() const {
   return base::nullopt;
 }
 
-double DeviceOrientationEvent::alpha(bool& is_null) const {
-  if (orientation_->CanProvideAlpha())
-    return orientation_->Alpha();
-
-  is_null = true;
-  return 0;
-}
-
-double DeviceOrientationEvent::beta(bool& is_null) const {
-  if (orientation_->CanProvideBeta())
-    return orientation_->Beta();
-
-  is_null = true;
-  return 0;
-}
-
-double DeviceOrientationEvent::gamma(bool& is_null) const {
-  if (orientation_->CanProvideGamma())
-    return orientation_->Gamma();
-
-  is_null = true;
-  return 0;
-}
-
 bool DeviceOrientationEvent::absolute() const {
   return orientation_->Absolute();
 }

third_party/blink/renderer/modules/device_orientation/device_orientation_event.h

@@ -66,10 +66,6 @@ class DeviceOrientationEvent final : public Event {
   base::Optional<double> alpha() const;
   base::Optional<double> beta() const;
   base::Optional<double> gamma() const;
-  // TODO(crbug.com/1060971): Remove |is_null| version.
-  double alpha(bool& is_null) const;  // DEPRECATED
-  double beta(bool& is_null) const;   // DEPRECATED
-  double gamma(bool& is_null) const;  // DEPRECATED
   bool absolute() const;
 
   const AtomicString& InterfaceName() const override;

third_party/blink/renderer/modules/geolocation/geolocation_coordinates.cc

@@ -51,36 +51,4 @@ base::Optional<double> GeolocationCoordinates::speed() const {
   return base::nullopt;
 }
 
-double GeolocationCoordinates::altitude(bool& is_null) const {
-  if (can_provide_altitude_)
-    return altitude_;
-
-  is_null = true;
-  return 0;
-}
-
-double GeolocationCoordinates::altitudeAccuracy(bool& is_null) const {
-  if (can_provide_altitude_accuracy_)
-    return altitude_accuracy_;
-
-  is_null = true;
-  return 0;
-}
-
-double GeolocationCoordinates::heading(bool& is_null) const {
-  if (can_provide_heading_)
-    return heading_;
-
-  is_null = true;
-  return 0;
-}
-
-double GeolocationCoordinates::speed(bool& is_null) const {
-  if (can_provide_speed_)
-    return speed_;
-
-  is_null = true;
-  return 0;
-}
-
 }  // namespace blink

third_party/blink/renderer/modules/geolocation/geolocation_coordinates.h

@@ -62,16 +62,10 @@ class GeolocationCoordinates : public ScriptWrappable {
   double latitude() const { return latitude_; }
   double longitude() const { return longitude_; }
   base::Optional<double> altitude() const;
-  // TODO(crbug.com/1060971): Remove |is_null| version.
-  double altitude(bool& is_null) const;  // DEPRECATED
   double accuracy() const { return accuracy_; }
   base::Optional<double> altitudeAccuracy() const;
   base::Optional<double> heading() const;
   base::Optional<double> speed() const;
-  // TODO(crbug.com/1060971): Remove |is_null| version.
-  double altitudeAccuracy(bool& is_null) const;  // DEPRECATED
-  double heading(bool& is_null) const;           // DEPRECATED
-  double speed(bool& is_null) const;             // DEPRECATED
 
  private:
   double latitude_;

third_party/blink/renderer/modules/indexeddb/idb_version_change_event.cc

@@ -56,11 +56,6 @@ IDBVersionChangeEvent::IDBVersionChangeEvent(
     data_loss_ = mojom::IDBDataLoss::Total;
 }
 
-uint64_t IDBVersionChangeEvent::newVersion(bool& is_null) const {
-  is_null = !new_version_.has_value();
-  return new_version_.value_or(0);
-}
-
 const AtomicString& IDBVersionChangeEvent::dataLoss() const {
   if (data_loss_ == mojom::IDBDataLoss::Total)
     return indexed_db_names::kTotal;

third_party/blink/renderer/modules/indexeddb/idb_version_change_event.h

@@ -62,8 +62,6 @@ class IDBVersionChangeEvent final : public Event {
 
   uint64_t oldVersion() const { return old_version_; }
   base::Optional<uint64_t> newVersion() const { return new_version_; }
-  // TODO(crbug.com/1060971): Remove |is_null| version.
-  uint64_t newVersion(bool& is_null) const;  // DEPRECATED
 
   const AtomicString& dataLoss() const;
   const String& dataLossMessage() const { return data_loss_message_; }