| 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 } | 65 } |
| 66 | 66 |
| 67 void WebRuntimeFeatures::enableDisplayList2dCanvas(bool enable) | 67 void WebRuntimeFeatures::enableDisplayList2dCanvas(bool enable) |
| 68 { | 68 { |
| 69 RuntimeEnabledFeatures::setDisplayList2dCanvasEnabled(enable); | 69 RuntimeEnabledFeatures::setDisplayList2dCanvasEnabled(enable); |
| 70 } | 70 } |
| 71 | 71 |
| 72 void WebRuntimeFeatures::enableEncryptedMedia(bool enable) | 72 void WebRuntimeFeatures::enableEncryptedMedia(bool enable) |
| 73 { | 73 { |
| 74 RuntimeEnabledFeatures::setEncryptedMediaEnabled(enable); | 74 RuntimeEnabledFeatures::setEncryptedMediaEnabled(enable); |
| 75 // FIXME: Hack to allow MediaKeyError to be enabled for either version. | |
| 76 RuntimeEnabledFeatures::setEncryptedMediaAnyVersionEnabled( | |
| 77 RuntimeEnabledFeatures::encryptedMediaEnabled() | |
| 78 || RuntimeEnabledFeatures::prefixedEncryptedMediaEnabled()); | |
| 79 } | 75 } |
| 80 | 76 |
| 81 bool WebRuntimeFeatures::isEncryptedMediaEnabled() | 77 bool WebRuntimeFeatures::isEncryptedMediaEnabled() |
| 82 { | 78 { |
| 83 return RuntimeEnabledFeatures::encryptedMediaEnabled(); | 79 return RuntimeEnabledFeatures::encryptedMediaEnabled(); |
| 84 } | 80 } |
| 85 | 81 |
| 86 void WebRuntimeFeatures::enablePrefixedEncryptedMedia(bool enable) | 82 void WebRuntimeFeatures::enablePrefixedEncryptedMedia(bool enable) |
| 87 { | 83 { |
| 88 RuntimeEnabledFeatures::setPrefixedEncryptedMediaEnabled(enable); | 84 RuntimeEnabledFeatures::setPrefixedEncryptedMediaEnabled(enable); |
| 89 // FIXME: Hack to allow MediaKeyError to be enabled for either version. | |
| 90 RuntimeEnabledFeatures::setEncryptedMediaAnyVersionEnabled( | |
| 91 RuntimeEnabledFeatures::encryptedMediaEnabled() | |
| 92 || RuntimeEnabledFeatures::prefixedEncryptedMediaEnabled()); | |
| 93 } | 85 } |
| 94 | 86 |
| 95 bool WebRuntimeFeatures::isPrefixedEncryptedMediaEnabled() | 87 bool WebRuntimeFeatures::isPrefixedEncryptedMediaEnabled() |
| 96 { | 88 { |
| 97 return RuntimeEnabledFeatures::prefixedEncryptedMediaEnabled(); | 89 return RuntimeEnabledFeatures::prefixedEncryptedMediaEnabled(); |
| 98 } | 90 } |
| 99 | 91 |
| 100 void WebRuntimeFeatures::enableExperimentalCanvasFeatures(bool enable) | 92 void WebRuntimeFeatures::enableExperimentalCanvasFeatures(bool enable) |
| 101 { | 93 { |
| 102 RuntimeEnabledFeatures::setExperimentalCanvasFeaturesEnabled(enable); | 94 RuntimeEnabledFeatures::setExperimentalCanvasFeaturesEnabled(enable); |
| (...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 271 { | 263 { |
| 272 RuntimeEnabledFeatures::setShowModalDialogEnabled(enable); | 264 RuntimeEnabledFeatures::setShowModalDialogEnabled(enable); |
| 273 } | 265 } |
| 274 | 266 |
| 275 void WebRuntimeFeatures::enableLaxMixedContentChecking(bool enable) | 267 void WebRuntimeFeatures::enableLaxMixedContentChecking(bool enable) |
| 276 { | 268 { |
| 277 RuntimeEnabledFeatures::setLaxMixedContentCheckingEnabled(enable); | 269 RuntimeEnabledFeatures::setLaxMixedContentCheckingEnabled(enable); |
| 278 } | 270 } |
| 279 | 271 |
| 280 } // namespace blink | 272 } // namespace blink |
| OLD | NEW |