Merge 142773

Source/Platform/chromium/public/WebMediaStreamTrack.h

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 32 matching lines @@
     WebMediaStreamTrack() { }
     WebMediaStreamTrack(const WebMediaStreamTrack& other) { assign(other); }
     ~WebMediaStreamTrack() { reset(); }
 
     WebMediaStreamTrack& operator=(const WebMediaStreamTrack& other)
     {
         assign(other);
         return *this;
     }
     WEBKIT_EXPORT void assign(const WebMediaStreamTrack&);
+
     WEBKIT_EXPORT void initialize(const WebMediaStreamSource&);
+    WEBKIT_EXPORT void initialize(const WebString& id, const WebMediaStreamSource&);
+
     WEBKIT_EXPORT void reset();
     bool isNull() const { return m_private.isNull(); }
 
     WEBKIT_EXPORT WebString id() const;
 
     WEBKIT_EXPORT WebMediaStream stream() const;
     WEBKIT_EXPORT WebMediaStreamSource source() const;
     WEBKIT_EXPORT bool isEnabled() const;
 
 #if WEBKIT_IMPLEMENTATION
     WebMediaStreamTrack(PassRefPtr<WebCore::MediaStreamComponent>);
     WebMediaStreamTrack(WebCore::MediaStreamComponent*);
     WebMediaStreamTrack& operator=(WebCore::MediaStreamComponent*);
     operator WTF::PassRefPtr<WebCore::MediaStreamComponent>() const;
     operator WebCore::MediaStreamComponent*() const;
 #endif
 
 private:
     WebPrivatePtr<WebCore::MediaStreamComponent> m_private;
 };
 
 } // namespace WebKit
 
 #endif // WebMediaStreamTrack_h