| OLD | NEW |
| 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 } | 76 } |
| 77 | 77 |
| 78 void WebRuntimeFeatures::enableDisplayList2dCanvas(bool enable) | 78 void WebRuntimeFeatures::enableDisplayList2dCanvas(bool enable) |
| 79 { | 79 { |
| 80 RuntimeEnabledFeatures::setDisplayList2dCanvasEnabled(enable); | 80 RuntimeEnabledFeatures::setDisplayList2dCanvasEnabled(enable); |
| 81 } | 81 } |
| 82 | 82 |
| 83 void WebRuntimeFeatures::enableEncryptedMedia(bool enable) | 83 void WebRuntimeFeatures::enableEncryptedMedia(bool enable) |
| 84 { | 84 { |
| 85 RuntimeEnabledFeatures::setEncryptedMediaEnabled(enable); | 85 RuntimeEnabledFeatures::setEncryptedMediaEnabled(enable); |
| 86 // FIXME: Hack to allow MediaKeyError to be enabled for either version. | |
| 87 RuntimeEnabledFeatures::setEncryptedMediaAnyVersionEnabled( | |
| 88 RuntimeEnabledFeatures::encryptedMediaEnabled() | |
| 89 || RuntimeEnabledFeatures::prefixedEncryptedMediaEnabled()); | |
| 90 } | 86 } |
| 91 | 87 |
| 92 bool WebRuntimeFeatures::isEncryptedMediaEnabled() | 88 bool WebRuntimeFeatures::isEncryptedMediaEnabled() |
| 93 { | 89 { |
| 94 return RuntimeEnabledFeatures::encryptedMediaEnabled(); | 90 return RuntimeEnabledFeatures::encryptedMediaEnabled(); |
| 95 } | 91 } |
| 96 | 92 |
| 97 void WebRuntimeFeatures::enablePrefixedEncryptedMedia(bool enable) | 93 void WebRuntimeFeatures::enablePrefixedEncryptedMedia(bool enable) |
| 98 { | 94 { |
| 99 RuntimeEnabledFeatures::setPrefixedEncryptedMediaEnabled(enable); | 95 RuntimeEnabledFeatures::setPrefixedEncryptedMediaEnabled(enable); |
| 100 // FIXME: Hack to allow MediaKeyError to be enabled for either version. | |
| 101 RuntimeEnabledFeatures::setEncryptedMediaAnyVersionEnabled( | |
| 102 RuntimeEnabledFeatures::encryptedMediaEnabled() | |
| 103 || RuntimeEnabledFeatures::prefixedEncryptedMediaEnabled()); | |
| 104 } | 96 } |
| 105 | 97 |
| 106 bool WebRuntimeFeatures::isPrefixedEncryptedMediaEnabled() | 98 bool WebRuntimeFeatures::isPrefixedEncryptedMediaEnabled() |
| 107 { | 99 { |
| 108 return RuntimeEnabledFeatures::prefixedEncryptedMediaEnabled(); | 100 return RuntimeEnabledFeatures::prefixedEncryptedMediaEnabled(); |
| 109 } | 101 } |
| 110 | 102 |
| 111 void WebRuntimeFeatures::enableExperimentalCanvasFeatures(bool enable) | 103 void WebRuntimeFeatures::enableExperimentalCanvasFeatures(bool enable) |
| 112 { | 104 { |
| 113 RuntimeEnabledFeatures::setExperimentalCanvasFeaturesEnabled(enable); | 105 RuntimeEnabledFeatures::setExperimentalCanvasFeaturesEnabled(enable); |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 { | 274 { |
| 283 RuntimeEnabledFeatures::setShowModalDialogEnabled(enable); | 275 RuntimeEnabledFeatures::setShowModalDialogEnabled(enable); |
| 284 } | 276 } |
| 285 | 277 |
| 286 void WebRuntimeFeatures::enableLaxMixedContentChecking(bool enable) | 278 void WebRuntimeFeatures::enableLaxMixedContentChecking(bool enable) |
| 287 { | 279 { |
| 288 RuntimeEnabledFeatures::setLaxMixedContentCheckingEnabled(enable); | 280 RuntimeEnabledFeatures::setLaxMixedContentCheckingEnabled(enable); |
| 289 } | 281 } |
| 290 | 282 |
| 291 } // namespace blink | 283 } // namespace blink |
| OLD | NEW |