Chromium Code Reviews| OLD | NEW |
|---|---|
| (Empty) | |
| 1 /* | |
| 2 * Copyright (C) 2014 Google Inc. All rights reserved. | |
|
philipj_slow
2014/09/09 08:15:14
New code should use a shorter copyright header, se
| |
| 3 * | |
| 4 * Redistribution and use in source and binary forms, with or without | |
| 5 * modification, are permitted provided that the following conditions are | |
| 6 * met: | |
| 7 * | |
| 8 * * Redistributions of source code must retain the above copyright | |
| 9 * notice, this list of conditions and the following disclaimer. | |
| 10 * * Redistributions in binary form must reproduce the above | |
| 11 * copyright notice, this list of conditions and the following disclaimer | |
| 12 * in the documentation and/or other materials provided with the | |
| 13 * distribution. | |
| 14 * * Neither the name of Google Inc. nor the names of its | |
| 15 * contributors may be used to endorse or promote products derived from | |
| 16 * this software without specific prior written permission. | |
| 17 * | |
| 18 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | |
| 19 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | |
| 20 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | |
| 21 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | |
| 22 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | |
| 29 */ | |
| 30 | |
| 31 #include "config.h" | |
| 32 #include "bindings/core/v8/V8HTMLMediaElement.h" | |
| 33 | |
| 34 #include "bindings/modules/v8/V8MediaSource.h" | |
|
perkj_chrome
2014/09/08 18:45:43
big no no I guess, and check deps complains.
So h
philipj_slow
2014/09/09 08:15:15
I haven't had a similar situation before, but quit
| |
| 35 #include "bindings/modules/v8/V8MediaStream.h" | |
| 36 | |
| 37 #include "core/html/MediaProvider.h" | |
| 38 | |
| 39 namespace blink { | |
| 40 | |
| 41 static v8::Handle<v8::Value> toV8Object(MediaProvider* provider, v8::Handle<v8:: Object> creationContext, v8::Isolate* isolate) | |
| 42 { | |
| 43 if (provider && provider->mediaStream()) | |
| 44 return toV8(provider->mediaStream(), creationContext, isolate); | |
| 45 if (provider && provider->mediaSource()) | |
| 46 return toV8(provider->mediaSource(), creationContext, isolate); | |
| 47 | |
| 48 return v8Undefined(); | |
| 49 } | |
| 50 | |
| 51 static PassRefPtrWillBeRawPtr<MediaProvider> toMediaProvider(v8::Handle<v8::Valu e> value, v8::Isolate* isolate) | |
|
haraken
2014/09/09 08:06:02
Can you implement this logic inside HTMLMediaEleme
| |
| 52 { | |
| 53 if (value.IsEmpty()) | |
| 54 return RefPtrWillBeRawPtr<MediaProvider>(); | |
| 55 | |
| 56 RefPtrWillBeRawPtr<MediaProvider> mediaProvider = MediaProvider::createFromM ediaStream(V8MediaStream::toNativeWithTypeCheck(isolate, value)); | |
| 57 if (mediaProvider) | |
| 58 return mediaProvider; | |
| 59 return MediaProvider::createFromMediaSource(V8MediaSource::toNativeWithTypeC heck(isolate, value)); | |
| 60 //return NULL; // CanvasStyle::createFromPattern(V8CanvasPattern::toNativeWi thTypeCheck(isolate, value)); | |
| 61 } | |
| 62 | |
| 63 void blink::V8HTMLMediaElement::srcObjectAttributeGetterCustom(const v8::Propert yCallbackInfo<v8::Value>& info) { | |
| 64 HTMLMediaElement* impl = V8HTMLMediaElement::toNative(info.Holder()); | |
| 65 v8SetReturnValue(info, toV8Object(impl->srcObject(), info.Holder(), info.Get Isolate())); | |
| 66 } | |
| 67 | |
| 68 void blink::V8HTMLMediaElement::srcObjectAttributeSetterCustom(v8::Local<v8::Val ue> value, const v8::PropertyCallbackInfo<void>& info) { | |
| 69 HTMLMediaElement* impl = V8HTMLMediaElement::toNative(info.Holder()); | |
| 70 impl->setSrcObject(toMediaProvider(value, info.GetIsolate())); | |
| 71 } | |
| 72 | |
| 73 } // namespace blink | |
| 74 | |
| OLD | NEW |