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

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: Rebase 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
« no previous file with comments | « Source/WebKit/chromium/src/WebMediaSourceImpl.cpp ('k') | Source/core/dom/EventTarget.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 WebMediaPlayerClientImpl::setIsEnabled(enable); 332 WebMediaPlayerClientImpl::setIsEnabled(enable);
333 } 333 }
334 334
335 bool WebRuntimeFeatures::isMediaPlayerEnabled() 335 bool WebRuntimeFeatures::isMediaPlayerEnabled()
336 { 336 {
337 return WebMediaPlayerClientImpl::isEnabled(); 337 return WebMediaPlayerClientImpl::isEnabled();
338 } 338 }
339 339
340 void WebRuntimeFeatures::enableMediaSource(bool enable) 340 void WebRuntimeFeatures::enableMediaSource(bool enable)
341 { 341 {
342 RuntimeEnabledFeatures::setMediaSourceEnabled(enable); 342 // FIXME: Change to setMediaSourceEnabled() once Chromium
343 // starts calling enableWebKitMediaSource().
344 RuntimeEnabledFeatures::setWebKitMediaSourceEnabled(enable);
343 } 345 }
344 346
345 bool WebRuntimeFeatures::isMediaSourceEnabled() 347 bool WebRuntimeFeatures::isMediaSourceEnabled()
346 { 348 {
347 return RuntimeEnabledFeatures::mediaSourceEnabled(); 349 // FIXME: Change to mediaSourceEnabled() once Chromium
350 // starts calling isWebKitMediaSourceEnabled()
351 return RuntimeEnabledFeatures::webKitMediaSourceEnabled();
352 }
353
354 void WebRuntimeFeatures::enableWebKitMediaSource(bool enable)
355 {
356 RuntimeEnabledFeatures::setWebKitMediaSourceEnabled(enable);
357 }
358
359 bool WebRuntimeFeatures::isWebKitMediaSourceEnabled()
360 {
361 return RuntimeEnabledFeatures::webKitMediaSourceEnabled();
348 } 362 }
349 363
350 void WebRuntimeFeatures::enableMediaStream(bool enable) 364 void WebRuntimeFeatures::enableMediaStream(bool enable)
351 { 365 {
352 RuntimeEnabledFeatures::setMediaStreamEnabled(enable); 366 RuntimeEnabledFeatures::setMediaStreamEnabled(enable);
353 } 367 }
354 368
355 bool WebRuntimeFeatures::isMediaStreamEnabled() 369 bool WebRuntimeFeatures::isMediaStreamEnabled()
356 { 370 {
357 return RuntimeEnabledFeatures::mediaStreamEnabled(); 371 return RuntimeEnabledFeatures::mediaStreamEnabled();
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 { 521 {
508 RuntimeEnabledFeatures::setWebPInAcceptHeaderEnabled(enable); 522 RuntimeEnabledFeatures::setWebPInAcceptHeaderEnabled(enable);
509 } 523 }
510 524
511 bool WebRuntimeFeatures::isWebPInAcceptHeaderEnabled() 525 bool WebRuntimeFeatures::isWebPInAcceptHeaderEnabled()
512 { 526 {
513 return RuntimeEnabledFeatures::webPInAcceptHeaderEnabled(); 527 return RuntimeEnabledFeatures::webPInAcceptHeaderEnabled();
514 } 528 }
515 529
516 } // namespace WebKit 530 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/WebMediaSourceImpl.cpp ('k') | Source/core/dom/EventTarget.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698