Chromium Code Reviews| Index: third_party/WebKit/Source/modules/mediastream/MediaStreamConstraints.idl |
| diff --git a/third_party/WebKit/Source/modules/mediastream/MediaStreamConstraints.idl b/third_party/WebKit/Source/modules/mediastream/MediaStreamConstraints.idl |
| index 4ccb4ab02ce1c0b29a40516bfe20cac3876e12cd..a8929e618576c059b0645b934a97afbb8ee504dd 100644 |
| --- a/third_party/WebKit/Source/modules/mediastream/MediaStreamConstraints.idl |
| +++ b/third_party/WebKit/Source/modules/mediastream/MediaStreamConstraints.idl |
| @@ -1,23 +1,13 @@ |
| -/* |
| - * Copyright (C) 2012 Google Inc. All rights reserved. |
| - * |
| - * This library is free software; you can redistribute it and/or |
| - * modify it under the terms of the GNU Library General Public |
| - * License as published by the Free Software Foundation; either |
| - * version 2 of the License, or (at your option) any later version. |
| - * |
| - * This library is distributed in the hope that it will be useful, |
| - * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| - * Library General Public License for more details. |
| - * |
| - * You should have received a copy of the GNU Library General Public License |
| - * along with this library; see the file COPYING.LIB. If not, write to |
| - * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| - * Boston, MA 02110-1301, USA. |
| - */ |
| +// Copyright 2015 The Chromium Authors. All rights reserved. |
| +// Use of this source code is governed by a BSD-style license that can be |
| +// found in the LICENSE file. |
| + |
|
Peter Beverloo
2015/10/05 13:49:09
micro nit: please link to the spec
// https://w3c
hta - Chromium
2015/10/05 21:28:06
Done.
|
| dictionary MediaStreamConstraints { |
| - (boolean or Dictionary) video = false; |
| - (boolean or Dictionary) audio = false; |
| + // Dictionary should be MediaTrackConstraintSet. crbug/524424 blocks this. |
|
Peter Beverloo
2015/10/05 13:49:09
nit: crbug.com/524424
You may want to phrase this
hta - Chromium
2015/10/05 21:28:06
This is embarassing ... 524424 is fixed, and I for
|
| + // This compiles with a patch to generated file |
| + // out/Debug/gen/blink/bindings/modules/v8/UnionTypesModules.h |
| + // to #include "modules/mediastream/MediaTrackConstraintSet.h". |
| + (boolean or MediaTrackConstraintSet) video; |
| + (boolean or MediaTrackConstraintSet) audio; |
| }; |