third_party/WebKit/Source/modules/webusb/USBDevice.h - Issue 1806163002: Track USB alternate interface state in Blink.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/modules/webusb/USBDevice.h

Issue 1806163002: Track USB alternate interface state in Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@blink_interface_state

Patch Set: Fixed typo and rebased. Created 4 years, 9 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

« no previous file with comments | « third_party/WebKit/LayoutTests/webexposed/global-interface-listing-expected.txt ('k') | third_party/WebKit/Source/modules/webusb/USBDevice.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/webusb/USBDevice.h

diff --git a/third_party/WebKit/Source/modules/webusb/USBDevice.h b/third_party/WebKit/Source/modules/webusb/USBDevice.h

index 27c59d80bf9a60edad1ab8ed91fdcf7a9e6a87b9..00c879c4395a2b91e164edb34eb1d2b54f785d9c 100644

--- a/third_party/WebKit/Source/modules/webusb/USBDevice.h

+++ b/third_party/WebKit/Source/modules/webusb/USBDevice.h

@@ -45,7 +45,9 @@ public:

void onDeviceOpenedOrClosed(bool);

void onConfigurationSelected(bool success, size_t configurationIndex);

void onInterfaceClaimedOrUnclaimed(bool claimed, size_t interfaceIndex);

+ void onAlternateInterfaceSelected(bool success, size_t interfaceIndex, size_t alternateIndex);

bool isInterfaceClaimed(size_t configurationIndex, size_t interfaceIndex) const;

+ size_t selectedAlternateInterface(size_t interfaceIndex) const;

// IDL exposed interface:

String guid() const { return info().guid; }

@@ -72,7 +74,7 @@ public:

ScriptPromise selectConfiguration(ScriptState*, uint8_t configurationValue);

ScriptPromise claimInterface(ScriptState*, uint8_t interfaceNumber);

ScriptPromise releaseInterface(ScriptState*, uint8_t interfaceNumber);

- ScriptPromise setInterface(ScriptState*, uint8_t interfaceNumber, uint8_t alternateSetting);

+ ScriptPromise selectAlternateInterface(ScriptState*, uint8_t interfaceNumber, uint8_t alternateSetting);

ScriptPromise controlTransferIn(ScriptState*, const USBControlTransferParameters& setup, unsigned length);

ScriptPromise controlTransferOut(ScriptState*, const USBControlTransferParameters& setup);

ScriptPromise controlTransferOut(ScriptState*, const USBControlTransferParameters& setup, const ArrayBufferOrArrayBufferView& data);

@@ -90,6 +92,7 @@ public:

private:

int findConfigurationIndex(uint8_t configurationValue) const;

int findInterfaceIndex(uint8_t interfaceNumber) const;

+ int findAlternateIndex(size_t interfaceIndex, uint8_t alternateSetting) const;

bool ensureNoDeviceOrInterfaceChangeInProgress(ScriptPromiseResolver*) const;

bool ensureDeviceConfigured(ScriptPromiseResolver*) const;

bool ensureInterfaceClaimed(uint8_t interfaceNumber, ScriptPromiseResolver*) const;

@@ -102,6 +105,7 @@ private:

int m_configurationIndex;

WTF::BitVector m_claimedInterfaces;

WTF::BitVector m_interfaceStateChangeInProgress;

+ WTF::Vector<size_t> m_selectedAlternates;

};

} // namespace blink