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

Side by Side Diff: third_party/WebKit/Source/web/WebUserMediaRequest.cpp

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
OLDNEW
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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 ASSERT(!isNull()); 71 ASSERT(!isNull());
72 return m_private->audioConstraints(); 72 return m_private->audioConstraints();
73 } 73 }
74 74
75 WebMediaConstraints WebUserMediaRequest::videoConstraints() const 75 WebMediaConstraints WebUserMediaRequest::videoConstraints() const
76 { 76 {
77 ASSERT(!isNull()); 77 ASSERT(!isNull());
78 return m_private->videoConstraints(); 78 return m_private->videoConstraints();
79 } 79 }
80 80
81 WebSecurityOrigin WebUserMediaRequest::securityOrigin() const 81 WebSecurityOrigin WebUserMediaRequest::getSecurityOrigin() const
82 { 82 {
83 ASSERT(!isNull() && m_private->executionContext()); 83 ASSERT(!isNull() && m_private->getExecutionContext());
84 return WebSecurityOrigin(m_private->executionContext()->securityOrigin()); 84 return WebSecurityOrigin(m_private->getExecutionContext()->getSecurityOrigin ());
85 } 85 }
86 86
87 WebDocument WebUserMediaRequest::ownerDocument() const 87 WebDocument WebUserMediaRequest::ownerDocument() const
88 { 88 {
89 ASSERT(!isNull()); 89 ASSERT(!isNull());
90 return WebDocument(m_private->ownerDocument()); 90 return WebDocument(m_private->ownerDocument());
91 } 91 }
92 92
93 void WebUserMediaRequest::requestSucceeded(const WebMediaStream& streamDescripto r) 93 void WebUserMediaRequest::requestSucceeded(const WebMediaStream& streamDescripto r)
94 { 94 {
(...skipping 30 matching lines...) Expand all
125 { 125 {
126 m_private = other.m_private; 126 m_private = other.m_private;
127 } 127 }
128 128
129 WebUserMediaRequest::operator UserMediaRequest*() const 129 WebUserMediaRequest::operator UserMediaRequest*() const
130 { 130 {
131 return m_private.get(); 131 return m_private.get();
132 } 132 }
133 133
134 } // namespace blink 134 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698