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

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

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/ppapi_cdm_adapter.h ('k') | media/cdm/ppapi/ppapi_cdm_buffer.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 // 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 "media/cdm/ppapi/ppapi_cdm_adapter.h" 5 #include "media/cdm/ppapi/ppapi_cdm_adapter.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h" // nogncheck
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 #include "media/base/limits.h" 11 #include "media/base/limits.h"
12 #include "media/cdm/ppapi/cdm_file_io_impl.h" 12 #include "media/cdm/ppapi/cdm_file_io_impl.h"
13 #include "media/cdm/ppapi/cdm_logging.h" 13 #include "media/cdm/ppapi/cdm_logging.h"
14 #include "media/cdm/supported_cdm_versions.h" 14 #include "media/cdm/supported_cdm_versions.h"
15 #include "ppapi/c/ppb_console.h" 15 #include "ppapi/c/ppb_console.h"
16 #include "ppapi/cpp/private/uma_private.h" 16 #include "ppapi/cpp/private/uma_private.h"
17 17
18 #if defined(CHECK_DOCUMENT_URL) 18 #if defined(CHECK_DOCUMENT_URL)
19 #include "ppapi/cpp/dev/url_util_dev.h" 19 #include "ppapi/cpp/dev/url_util_dev.h"
(...skipping 1285 matching lines...) Expand 10 before | Expand all | Expand 10 after
1305 } // namespace media 1305 } // namespace media
1306 1306
1307 namespace pp { 1307 namespace pp {
1308 1308
1309 // Factory function for your specialization of the Module object. 1309 // Factory function for your specialization of the Module object.
1310 Module* CreateModule() { 1310 Module* CreateModule() {
1311 return new media::PpapiCdmAdapterModule(); 1311 return new media::PpapiCdmAdapterModule();
1312 } 1312 }
1313 1313
1314 } // namespace pp 1314 } // namespace pp
OLDNEW
« no previous file with comments | « media/cdm/ppapi/ppapi_cdm_adapter.h ('k') | media/cdm/ppapi/ppapi_cdm_buffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698