Update CDM interface and add clear key CDM.

webkit/media/crypto/ppapi/cdm_export.h

Index: webkit/media/crypto/ppapi/cdm_export.h
diff --git a/webkit/media/crypto/ppapi/cdm_export.h b/webkit/media/crypto/ppapi/cdm_export.h
new file mode 100644
index 0000000000000000000000000000000000000000..80d4c1ebd1b6d6c731f163f0b6caadc9c1b52589
--- /dev/null
+++ b/webkit/media/crypto/ppapi/cdm_export.h
@@ -0,0 +1,32 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef WEBKIT_MEDIA_CRYPTO_PPAPI_CDM_EXPORT_H_
+#define WEBKIT_MEDIA_CRYPTO_PPAPI_CDM_EXPORT_H_
+
+// Define CDM_EXPORT so that functionality implemented by the CDM module
+// can be exported to consumers.
+
+#if defined(COMPONENT_BUILD)

[ddorwin, 2012/08/20 21:27:07]

Not sure this should be here. See comment in CDM.h.

[xhwang, 2012/08/20 21:57:10]

Done.

+#if defined(WIN32)
+
+#if defined(CDM_IMPLEMENTATION)
+#define CDM_EXPORT __declspec(dllexport)
+#else
+#define CDM_EXPORT __declspec(dllimport)
+#endif  // defined(CDM_IMPLEMENTATION)
+
+#else  // defined(WIN32)

[ddorwin, 2012/08/20 21:27:07]

!defined ?

[xhwang, 2012/08/20 21:57:10]

This comment is saying "this '#else' corresponds to the above 'defined(WIN32)'".
It's ambiguous but it seems to be the style in chromium:
http://code.google.com/searchframe#OAMlx_jo-ck/src/content/common/content_exp...

+#if defined(CDM_IMPLEMENTATION)
+#define CDM_EXPORT __attribute__((visibility("default")))
+#else
+#define CDM_EXPORT
+#endif
+#endif
+
+#else  // defined(COMPONENT_BUILD)

[ddorwin, 2012/08/20 21:27:07]

same

[xhwang, 2012/08/20 21:57:10]

Done.

+#define CDM_EXPORT
+#endif
+
+#endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_CDM_EXPORT_H_