| 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 "webkit/renderer/media/crypto/ppapi/fake_cdm_video_decoder.h" | 5 #include "media/cdm/ppapi/fake_cdm_video_decoder.h" | 
| 6 | 6 | 
| 7 #include "base/logging.h" | 7 #include "base/logging.h" | 
| 8 #include "webkit/renderer/media/crypto/ppapi/cdm/content_decryption_module.h" |  | 
| 9 | 8 | 
| 10 namespace webkit_media { | 9 namespace media { | 
| 11 | 10 | 
| 12 FakeCdmVideoDecoder::FakeCdmVideoDecoder(cdm::Host* host) | 11 FakeCdmVideoDecoder::FakeCdmVideoDecoder(cdm::Host* host) | 
| 13     : is_initialized_(false), | 12     : is_initialized_(false), | 
| 14       host_(host) { | 13       host_(host) { | 
| 15 } | 14 } | 
| 16 | 15 | 
| 17 FakeCdmVideoDecoder::~FakeCdmVideoDecoder() { | 16 FakeCdmVideoDecoder::~FakeCdmVideoDecoder() { | 
| 18   Deinitialize(); | 17   Deinitialize(); | 
| 19 } | 18 } | 
| 20 | 19 | 
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 82 | 81 | 
| 83   static unsigned char color = 0; | 82   static unsigned char color = 0; | 
| 84   color += 10; | 83   color += 10; | 
| 85 | 84 | 
| 86   memset(reinterpret_cast<void*>(decoded_frame->FrameBuffer()->Data()), | 85   memset(reinterpret_cast<void*>(decoded_frame->FrameBuffer()->Data()), | 
| 87          color, frame_size); | 86          color, frame_size); | 
| 88 | 87 | 
| 89   return cdm::kSuccess; | 88   return cdm::kSuccess; | 
| 90 } | 89 } | 
| 91 | 90 | 
| 92 }  // namespace webkit_media | 91 }  // namespace media | 
| OLD | NEW | 
|---|