Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(707)

Unified Diff: third_party/WebKit/Source/modules/bluetooth/BluetoothGATTCharacteristic.cpp

Issue 1603893002: bluetooth: Switch BluetoothGattCharacteristic.value to DataView (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetoothValue
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/bluetooth/BluetoothGATTCharacteristic.cpp
diff --git a/third_party/WebKit/Source/modules/bluetooth/BluetoothGATTCharacteristic.cpp b/third_party/WebKit/Source/modules/bluetooth/BluetoothGATTCharacteristic.cpp
index f75d0b1b80e65e69f163549a49cc7be38e66b256..837734b60d2118145379c2573d4d6e7699e2f618 100644
--- a/third_party/WebKit/Source/modules/bluetooth/BluetoothGATTCharacteristic.cpp
+++ b/third_party/WebKit/Source/modules/bluetooth/BluetoothGATTCharacteristic.cpp
@@ -7,6 +7,7 @@
#include "bindings/core/v8/CallbackPromiseAdapter.h"
#include "bindings/core/v8/ScriptPromise.h"
#include "bindings/core/v8/ScriptPromiseResolver.h"
+#include "core/dom/DOMDataView.h"
#include "core/dom/DOMException.h"
#include "core/dom/ExceptionCode.h"
#include "core/events/Event.h"
@@ -19,12 +20,13 @@ namespace blink {
namespace {
-PassRefPtr<DOMArrayBuffer> ConvertWebVectorToArrayBuffer(
+PassRefPtr<DOMDataView> ConvertWebVectorToDataView(
const WebVector<uint8_t>& webVector)
{
static_assert(sizeof(*webVector.data()) == 1, "uint8_t should be a single byte");
RefPtr<DOMArrayBuffer> domBuffer = DOMArrayBuffer::create(webVector.data(), webVector.size());
- return domBuffer;
+ RefPtr<DOMDataView> domDataView = DOMDataView::create(domBuffer, 0, webVector.size());
+ return domDataView;
}
} // anonymous namespace
@@ -51,16 +53,16 @@ BluetoothGATTCharacteristic* BluetoothGATTCharacteristic::take(ScriptPromiseReso
}
void BluetoothGATTCharacteristic::setValue(
- const PassRefPtr<DOMArrayBuffer>& domBuffer)
+ const PassRefPtr<DOMDataView>& domDataView)
{
- m_value = domBuffer;
+ m_value = domDataView;
}
void BluetoothGATTCharacteristic::dispatchCharacteristicValueChanged(
const WebVector<uint8_t>& value)
{
- RefPtr<DOMArrayBuffer> domBuffer = ConvertWebVectorToArrayBuffer(value);
- this->setValue(domBuffer);
+ RefPtr<DOMDataView> domDataView = ConvertWebVectorToDataView(value);
+ this->setValue(domDataView);
dispatchEvent(Event::create(EventTypeNames::characteristicvaluechanged));
}
@@ -113,11 +115,11 @@ public:
if (!m_resolver->executionContext() || m_resolver->executionContext()->activeDOMObjectsAreStopped())
return;
- RefPtr<DOMArrayBuffer> domBuffer = ConvertWebVectorToArrayBuffer(value);
+ RefPtr<DOMDataView> domDataView = ConvertWebVectorToDataView(value);
if (m_webCharacteristic) {
- m_webCharacteristic->setValue(domBuffer);
+ m_webCharacteristic->setValue(domDataView);
}
- m_resolver->resolve(domBuffer);
+ m_resolver->resolve(domDataView);
}
void onError(const WebBluetoothError& e) override

Powered by Google App Engine
This is Rietveld 408576698