media/cdm/ppapi/ppapi_cdm_adapter.h - Issue 2429773002: osmesa, cdmadapter: drop workaround for VS2013 allocator shim

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: media/cdm/ppapi/ppapi_cdm_adapter.h

Issue 2429773002: osmesa, cdmadapter: drop workaround for VS2013 allocator shim

Patch Set: add nogncheck around trivial base includes from headers used by the cdm adapter Created 4 years, 2 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

« no previous file with comments | « media/cdm/ppapi/cdm_file_io_impl.h ('k') | media/cdm/ppapi/ppapi_cdm_adapter.cc » ('j') | no next file with comments »

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 #ifndef MEDIA_CDM_PPAPI_PPAPI_CDM_ADAPTER_H_	5 #ifndef MEDIA_CDM_PPAPI_PPAPI_CDM_ADAPTER_H_

6 #define MEDIA_CDM_PPAPI_PPAPI_CDM_ADAPTER_H_	6 #define MEDIA_CDM_PPAPI_PPAPI_CDM_ADAPTER_H_

7	7

8 #include <string>	8 #include <string>

9 #include <vector>	9 #include <vector>

10	10

11 #include "base/compiler_specific.h"	11 #include "base/compiler_specific.h" // nogncheck

12 #include "build/build_config.h"	12 #include "build/build_config.h"

13 #include "base/macros.h"	13 #include "base/macros.h" // nogncheck

14 #include "media/cdm/api/content_decryption_module.h"	14 #include "media/cdm/api/content_decryption_module.h"

15 #include "media/cdm/cdm_helpers.h"	15 #include "media/cdm/cdm_helpers.h"

16 #include "media/cdm/cdm_wrapper.h"	16 #include "media/cdm/cdm_wrapper.h"

17 #include "media/cdm/ppapi/linked_ptr.h"	17 #include "media/cdm/ppapi/linked_ptr.h"

18 #include "media/cdm/ppapi/ppapi_cdm_buffer.h"	18 #include "media/cdm/ppapi/ppapi_cdm_buffer.h"

19 #include "ppapi/c/pp_stdint.h"	19 #include "ppapi/c/pp_stdint.h"

20 #include "ppapi/c/private/pp_content_decryptor.h"	20 #include "ppapi/c/private/pp_content_decryptor.h"

21 #include "ppapi/cpp/completion_callback.h"	21 #include "ppapi/cpp/completion_callback.h"

22 #include "ppapi/cpp/private/content_decryptor_private.h"	22 #include "ppapi/cpp/private/content_decryptor_private.h"

23 #include "ppapi/cpp/private/output_protection_private.h"	23 #include "ppapi/cpp/private/output_protection_private.h"

(...skipping 260 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
284	284

285 uint32_t last_read_file_size_kb_;	285 uint32_t last_read_file_size_kb_;

286 bool file_size_uma_reported_;	286 bool file_size_uma_reported_;

287	287

288 DISALLOW_COPY_AND_ASSIGN(PpapiCdmAdapter);	288 DISALLOW_COPY_AND_ASSIGN(PpapiCdmAdapter);

289 };	289 };

290	290

291 } // namespace media	291 } // namespace media

292	292

293 #endif // MEDIA_CDM_PPAPI_PPAPI_CDM_ADAPTER_H_	293 #endif // MEDIA_CDM_PPAPI_PPAPI_CDM_ADAPTER_H_

OLD	NEW