third_party/WebKit/public/web/WebUserMediaRequest.h - Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide.

Side by Side Diff: third_party/WebKit/public/web/WebUserMediaRequest.h

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: clash-modules: rebase-fixes 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 unified diff | Download patch

« no previous file with comments | « third_party/WebKit/public/web/WebMediaDevicesRequest.h ('k') | third_party/WebKit/public/web/modules/webmidi/WebMIDIPermissionRequest.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2011 Google Inc. All rights reserved.	2 * Copyright (C) 2011 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 47 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
58 BLINK_EXPORT void reset();	58 BLINK_EXPORT void reset();

59 bool isNull() const { return m_private.isNull(); }	59 bool isNull() const { return m_private.isNull(); }

60 BLINK_EXPORT bool equals(const WebUserMediaRequest&) const;	60 BLINK_EXPORT bool equals(const WebUserMediaRequest&) const;

61 BLINK_EXPORT void assign(const WebUserMediaRequest&);	61 BLINK_EXPORT void assign(const WebUserMediaRequest&);

62	62

63 BLINK_EXPORT bool audio() const;	63 BLINK_EXPORT bool audio() const;

64 BLINK_EXPORT bool video() const;	64 BLINK_EXPORT bool video() const;

65 BLINK_EXPORT WebMediaConstraints audioConstraints() const;	65 BLINK_EXPORT WebMediaConstraints audioConstraints() const;

66 BLINK_EXPORT WebMediaConstraints videoConstraints() const;	66 BLINK_EXPORT WebMediaConstraints videoConstraints() const;

67	67

68 BLINK_EXPORT WebSecurityOrigin securityOrigin() const;	68 BLINK_EXPORT WebSecurityOrigin getSecurityOrigin() const;

69 BLINK_EXPORT WebDocument ownerDocument() const;	69 BLINK_EXPORT WebDocument ownerDocument() const;

70	70

71 BLINK_EXPORT void requestSucceeded(const WebMediaStream&);	71 BLINK_EXPORT void requestSucceeded(const WebMediaStream&);

72	72

73 BLINK_EXPORT void requestDenied(const WebString& description = WebString());	73 BLINK_EXPORT void requestDenied(const WebString& description = WebString());

74 BLINK_EXPORT void requestFailedConstraint(const WebString& constraintName, c onst WebString& description = WebString());	74 BLINK_EXPORT void requestFailedConstraint(const WebString& constraintName, c onst WebString& description = WebString());

75 BLINK_EXPORT void requestFailedUASpecific(const WebString& name, const WebSt ring& constraintName = WebString(), const WebString& description = WebString());	75 BLINK_EXPORT void requestFailedUASpecific(const WebString& name, const WebSt ring& constraintName = WebString(), const WebString& description = WebString());

76	76

77 // DEPRECATED	77 // DEPRECATED

78 BLINK_EXPORT void requestFailed(const WebString& description = WebString()) { requestDenied(description); }	78 BLINK_EXPORT void requestFailed(const WebString& description = WebString()) { requestDenied(description); }

79	79

80 #if BLINK_IMPLEMENTATION	80 #if BLINK_IMPLEMENTATION

81 WebUserMediaRequest(UserMediaRequest*);	81 WebUserMediaRequest(UserMediaRequest*);

82 operator UserMediaRequest*() const;	82 operator UserMediaRequest*() const;

83 #endif	83 #endif

84	84

85 private:	85 private:

86 WebPrivatePtr<UserMediaRequest> m_private;	86 WebPrivatePtr<UserMediaRequest> m_private;

87 };	87 };

88	88

89 inline bool operator==(const WebUserMediaRequest& a, const WebUserMediaRequest& b)	89 inline bool operator==(const WebUserMediaRequest& a, const WebUserMediaRequest& b)

90 {	90 {

91 return a.equals(b);	91 return a.equals(b);

92 }	92 }

93	93

94 } // namespace blink	94 } // namespace blink

95	95

96 #endif // WebUserMediaRequest_h	96 #endif // WebUserMediaRequest_h

OLD	NEW