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

Unified Diff: public/web/WebMediaDevicesRequest.h

Issue 135363004: MediaStream API: Patch #1 of implementing navigator.getMediaDevices (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fixed year Created 6 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
« no previous file with comments | « public/platform/WebMediaDeviceInfo.h ('k') | public/web/WebUserMediaClient.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: public/web/WebMediaDevicesRequest.h
diff --git a/public/platform/WebSourceInfo.h b/public/web/WebMediaDevicesRequest.h
similarity index 50%
copy from public/platform/WebSourceInfo.h
copy to public/web/WebMediaDevicesRequest.h
index 190b1e62d20486ebff6fdfb71b482003f926361f..fd32fe2783e276c6915066fd8f58c962e262a81b 100644
--- a/public/platform/WebSourceInfo.h
+++ b/public/web/WebMediaDevicesRequest.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2013 Google Inc. All rights reserved.
+ * Copyright (C) 2014 Google Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -23,57 +23,60 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef WebSourceInfo_h
-#define WebSourceInfo_h
+#ifndef WebMediaDevicesRequest_h
+#define WebMediaDevicesRequest_h
-#include "WebCommon.h"
-#include "WebNonCopyable.h"
-#include "WebPrivatePtr.h"
-#include "WebString.h"
+#include "WebSecurityOrigin.h"
+#include "public/platform/WebCommon.h"
+#include "public/platform/WebPrivatePtr.h"
+#include "public/platform/WebString.h"
-namespace blink {
+namespace WebCore {
+class MediaDevicesRequest;
+}
-class WebSourceInfoPrivate;
+namespace blink {
+class WebDocument;
+class WebMediaDeviceInfo;
+template <typename T> class WebVector;
-class WebSourceInfo {
+class WebMediaDevicesRequest {
public:
- enum SourceKind {
- SourceKindNone,
- SourceKindAudio,
- SourceKindVideo
- };
-
- enum VideoFacingMode {
- VideoFacingModeNone,
- VideoFacingModeUser,
- VideoFacingModeEnvironment
- };
-
- WebSourceInfo() { }
- WebSourceInfo(const WebSourceInfo& other) { assign(other); }
- ~WebSourceInfo() { reset(); }
+ WebMediaDevicesRequest() { }
+ WebMediaDevicesRequest(const WebMediaDevicesRequest& request) { assign(request); }
+ ~WebMediaDevicesRequest() { reset(); }
- WebSourceInfo& operator=(const WebSourceInfo& other)
+ WebMediaDevicesRequest& operator=(const WebMediaDevicesRequest& other)
{
assign(other);
return *this;
}
- BLINK_PLATFORM_EXPORT void assign(const WebSourceInfo&);
-
- BLINK_PLATFORM_EXPORT void initialize(const WebString& id, SourceKind, const WebString& label, VideoFacingMode);
- BLINK_PLATFORM_EXPORT void reset();
+ BLINK_EXPORT void reset();
bool isNull() const { return m_private.isNull(); }
+ BLINK_EXPORT bool equals(const WebMediaDevicesRequest&) const;
+ BLINK_EXPORT void assign(const WebMediaDevicesRequest&);
+
+ BLINK_EXPORT WebSecurityOrigin securityOrigin() const;
+ BLINK_EXPORT WebDocument ownerDocument() const;
- BLINK_PLATFORM_EXPORT WebString id() const;
- BLINK_PLATFORM_EXPORT SourceKind kind() const;
- BLINK_PLATFORM_EXPORT WebString label() const;
- BLINK_PLATFORM_EXPORT VideoFacingMode facing() const;
+ BLINK_EXPORT void requestSucceeded(WebVector<WebMediaDeviceInfo>);
+
+#if BLINK_IMPLEMENTATION
+ WebMediaDevicesRequest(const PassRefPtr<WebCore::MediaDevicesRequest>&);
+ WebMediaDevicesRequest(WebCore::MediaDevicesRequest*);
+ operator WebCore::MediaDevicesRequest*() const;
+#endif
private:
- WebPrivatePtr<WebSourceInfoPrivate> m_private;
+ WebPrivatePtr<WebCore::MediaDevicesRequest> m_private;
};
+inline bool operator==(const WebMediaDevicesRequest& a, const WebMediaDevicesRequest& b)
+{
+ return a.equals(b);
+}
+
} // namespace blink
-#endif // WebSourceInfo_h
+#endif // WebMediaDevicesRequest_h
« no previous file with comments | « public/platform/WebMediaDeviceInfo.h ('k') | public/web/WebUserMediaClient.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698