Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(174)

Side by Side Diff: Source/WebKit/chromium/src/WebRuntimeFeatures.cpp

Issue 14619016: Add WebKit prefix to MediaSource,SourceBuffer, and SourceBufferList objects. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 331 matching lines...) Expand 10 before | Expand all | Expand 10 after
342 WebMediaPlayerClientImpl::setIsEnabled(enable); 342 WebMediaPlayerClientImpl::setIsEnabled(enable);
343 } 343 }
344 344
345 bool WebRuntimeFeatures::isMediaPlayerEnabled() 345 bool WebRuntimeFeatures::isMediaPlayerEnabled()
346 { 346 {
347 return WebMediaPlayerClientImpl::isEnabled(); 347 return WebMediaPlayerClientImpl::isEnabled();
348 } 348 }
349 349
350 void WebRuntimeFeatures::enableMediaSource(bool enable) 350 void WebRuntimeFeatures::enableMediaSource(bool enable)
351 { 351 {
352 RuntimeEnabledFeatures::setMediaSourceEnabled(enable); 352 // FIXME: Change to setMediaSourceEnabled() once Chromium
353 // starts calling enableWebKitMediaSource().
354 RuntimeEnabledFeatures::setWebKitMediaSourceEnabled(enable);
353 } 355 }
354 356
355 bool WebRuntimeFeatures::isMediaSourceEnabled() 357 bool WebRuntimeFeatures::isMediaSourceEnabled()
356 { 358 {
357 return RuntimeEnabledFeatures::mediaSourceEnabled(); 359 // FIXME: Change to mediaSourceEnabled() once Chromium
360 // starts calling isWebKitMediaSourceEnabled()
361 return RuntimeEnabledFeatures::webKitMediaSourceEnabled();
362 }
363
364 void WebRuntimeFeatures::enableWebKitMediaSource(bool enable)
365 {
366 RuntimeEnabledFeatures::setWebKitMediaSourceEnabled(enable);
367 }
368
369 bool WebRuntimeFeatures::isWebKitMediaSourceEnabled()
370 {
371 return RuntimeEnabledFeatures::webKitMediaSourceEnabled();
358 } 372 }
359 373
360 void WebRuntimeFeatures::enableMediaStream(bool enable) 374 void WebRuntimeFeatures::enableMediaStream(bool enable)
361 { 375 {
362 RuntimeEnabledFeatures::setMediaStreamEnabled(enable); 376 RuntimeEnabledFeatures::setMediaStreamEnabled(enable);
363 } 377 }
364 378
365 bool WebRuntimeFeatures::isMediaStreamEnabled() 379 bool WebRuntimeFeatures::isMediaStreamEnabled()
366 { 380 {
367 return RuntimeEnabledFeatures::mediaStreamEnabled(); 381 return RuntimeEnabledFeatures::mediaStreamEnabled();
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
517 { 531 {
518 RuntimeEnabledFeatures::setWebPInAcceptHeaderEnabled(enable); 532 RuntimeEnabledFeatures::setWebPInAcceptHeaderEnabled(enable);
519 } 533 }
520 534
521 bool WebRuntimeFeatures::isWebPInAcceptHeaderEnabled() 535 bool WebRuntimeFeatures::isWebPInAcceptHeaderEnabled()
522 { 536 {
523 return RuntimeEnabledFeatures::webPInAcceptHeaderEnabled(); 537 return RuntimeEnabledFeatures::webPInAcceptHeaderEnabled();
524 } 538 }
525 539
526 } // namespace WebKit 540 } // namespace WebKit
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698