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

Side by Side Diff: Source/web/WebDOMMediaStreamTrack.cpp

Issue 169653006: [not for commit] (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: return nullptr_t overload, just do it right Created 6 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « Source/web/WebCachedURLRequest.cpp ('k') | Source/web/WebIDBKey.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 { 45 {
46 if (WebCore::V8MediaStreamTrack::hasInstance(value, v8::Isolate::GetCurrent( ))) { 46 if (WebCore::V8MediaStreamTrack::hasInstance(value, v8::Isolate::GetCurrent( ))) {
47 v8::Handle<v8::Object> object = v8::Handle<v8::Object>::Cast(value); 47 v8::Handle<v8::Object> object = v8::Handle<v8::Object>::Cast(value);
48 return WebDOMMediaStreamTrack(WebCore::V8MediaStreamTrack::toNative(obje ct)); 48 return WebDOMMediaStreamTrack(WebCore::V8MediaStreamTrack::toNative(obje ct));
49 } 49 }
50 return WebDOMMediaStreamTrack(0); 50 return WebDOMMediaStreamTrack(0);
51 } 51 }
52 52
53 void WebDOMMediaStreamTrack::reset() 53 void WebDOMMediaStreamTrack::reset()
54 { 54 {
55 m_private = 0; 55 m_private = nullptr;
56 } 56 }
57 57
58 void WebDOMMediaStreamTrack::assign(const WebDOMMediaStreamTrack& b) 58 void WebDOMMediaStreamTrack::assign(const WebDOMMediaStreamTrack& b)
59 { 59 {
60 m_private = b.m_private; 60 m_private = b.m_private;
61 } 61 }
62 62
63 WebMediaStreamTrack WebDOMMediaStreamTrack::component() const 63 WebMediaStreamTrack WebDOMMediaStreamTrack::component() const
64 { 64 {
65 return WebMediaStreamTrack(m_private->component()); 65 return WebMediaStreamTrack(m_private->component());
66 } 66 }
67 67
68 } // namespace blink 68 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebCachedURLRequest.cpp ('k') | Source/web/WebIDBKey.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698