OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/renderer/media/webmediaplayer_impl.h" | 5 #include "content/renderer/media/webmediaplayer_impl.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <limits> | 8 #include <limits> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 648 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
659 false); | 659 false); |
660 | 660 |
661 // Restore the state for TEXTURE_2D binding point as mentioned above. | 661 // Restore the state for TEXTURE_2D binding point as mentioned above. |
662 web_graphics_context->bindTexture(GL_TEXTURE_2D, texture); | 662 web_graphics_context->bindTexture(GL_TEXTURE_2D, texture); |
663 | 663 |
664 web_graphics_context->deleteTexture(source_texture); | 664 web_graphics_context->deleteTexture(source_texture); |
665 | 665 |
666 // The flush() operation is not necessary here. It is kept since the | 666 // The flush() operation is not necessary here. It is kept since the |
667 // performance will be better when it is added than not. | 667 // performance will be better when it is added than not. |
668 web_graphics_context->flush(); | 668 web_graphics_context->flush(); |
669 mailbox_holder->sync_point = web_graphics_context->insertSyncPoint(); | |
dshwang
2014/02/21 16:36:31
I guess you did not insert the sync point for the
| |
669 return true; | 670 return true; |
670 } | 671 } |
671 | 672 |
672 // Helper functions to report media EME related stats to UMA. They follow the | 673 // Helper functions to report media EME related stats to UMA. They follow the |
673 // convention of more commonly used macros UMA_HISTOGRAM_ENUMERATION and | 674 // convention of more commonly used macros UMA_HISTOGRAM_ENUMERATION and |
674 // UMA_HISTOGRAM_COUNTS. The reason that we cannot use those macros directly is | 675 // UMA_HISTOGRAM_COUNTS. The reason that we cannot use those macros directly is |
675 // that UMA_* macros require the names to be constant throughout the process' | 676 // that UMA_* macros require the names to be constant throughout the process' |
676 // lifetime. | 677 // lifetime. |
677 static void EmeUMAHistogramEnumeration(const std::string& key_system, | 678 static void EmeUMAHistogramEnumeration(const std::string& key_system, |
678 const std::string& method, | 679 const std::string& method, |
(...skipping 666 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1345 | 1346 |
1346 if (web_cdm_) { | 1347 if (web_cdm_) { |
1347 decryptor_ready_cb.Run(web_cdm_->GetDecryptor()); | 1348 decryptor_ready_cb.Run(web_cdm_->GetDecryptor()); |
1348 return; | 1349 return; |
1349 } | 1350 } |
1350 | 1351 |
1351 decryptor_ready_cb_ = decryptor_ready_cb; | 1352 decryptor_ready_cb_ = decryptor_ready_cb; |
1352 } | 1353 } |
1353 | 1354 |
1354 } // namespace content | 1355 } // namespace content |
OLD | NEW |