summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/api/ppb.idl2
-rw-r--r--ppapi/api/ppb_audio.idl2
-rw-r--r--ppapi/api/ppb_audio_config.idl2
-rw-r--r--ppapi/c/ppb.h4
-rw-r--r--ppapi/c/ppb_audio.h4
-rw-r--r--ppapi/c/ppb_audio_config.h4
-rw-r--r--ppapi/cpp/audio.h2
-rw-r--r--ppapi/cpp/audio_config.h2
-rw-r--r--ppapi/cpp/image_data.h2
-rw-r--r--ppapi/thunk/ppb_uma_private_thunk.cc10
10 files changed, 16 insertions, 18 deletions
diff --git a/ppapi/api/ppb.idl b/ppapi/api/ppb.idl
index 465b7e5..76d80b3 100644
--- a/ppapi/api/ppb.idl
+++ b/ppapi/api/ppb.idl
@@ -19,7 +19,7 @@
* <code>ppb.audio.h</code> or
* <code>PPB_GRAPHICS_2D_INTERFACE</code> in <code>ppb_graphics_2d.h</code>.
* Click
- * <a href="/native-client/{{pepperversion}}/pepperc/globals_defs"
+ * <a href="globals_defs.html"
* title="macros">here</a> for a complete list of interface
* names.
*
diff --git a/ppapi/api/ppb_audio.idl b/ppapi/api/ppb_audio.idl
index 7a996ba..d79ca97 100644
--- a/ppapi/api/ppb_audio.idl
+++ b/ppapi/api/ppb_audio.idl
@@ -33,7 +33,7 @@ typedef void PPB_Audio_Callback([out] mem_t sample_buffer,
/**
* The <code>PPB_Audio</code> interface contains pointers to several functions
* for handling audio resources. Refer to the
- * <a href="/native-client/{{pepperversion}}/devguide/coding/audio">Audio</a>
+ * <a href="/native-client/devguide/coding/audio.html">Audio</a>
* chapter in the Developer's Guide for information on using this interface.
* Please see descriptions for each <code>PPB_Audio</code> and
* <code>PPB_AudioConfig</code> function for more details. A C example using
diff --git a/ppapi/api/ppb_audio_config.idl b/ppapi/api/ppb_audio_config.idl
index 1d64b4f..fd4cef4 100644
--- a/ppapi/api/ppb_audio_config.idl
+++ b/ppapi/api/ppb_audio_config.idl
@@ -45,7 +45,7 @@ enum PP_AudioSampleRate {
* This interface only supports 16-bit stereo output.
*
* Refer to the
- * <a href="/native-client/{{pepperversion}}/devguide/coding/audio">Audio
+ * <a href="/native-client/devguide/coding/audio.html">Audio
* </a> chapter in the Developer's Guide for information on using this
* interface.
*/
diff --git a/ppapi/c/ppb.h b/ppapi/c/ppb.h
index 4c228b0..cb6e6b4 100644
--- a/ppapi/c/ppb.h
+++ b/ppapi/c/ppb.h
@@ -3,7 +3,7 @@
* found in the LICENSE file.
*/
-/* From ppb.idl modified Thu Mar 1 14:49:34 2012. */
+/* From ppb.idl modified Fri Jan 24 16:19:56 2014. */
#ifndef PPAPI_C_PPB_H_
#define PPAPI_C_PPB_H_
@@ -33,7 +33,7 @@
* <code>ppb.audio.h</code> or
* <code>PPB_GRAPHICS_2D_INTERFACE</code> in <code>ppb_graphics_2d.h</code>.
* Click
- * <a href="/native-client/{{pepperversion}}/pepperc/globals_defs"
+ * <a href="globals_defs.html"
* title="macros">here</a> for a complete list of interface
* names.
*
diff --git a/ppapi/c/ppb_audio.h b/ppapi/c/ppb_audio.h
index d41839a..edfb7f7 100644
--- a/ppapi/c/ppb_audio.h
+++ b/ppapi/c/ppb_audio.h
@@ -3,7 +3,7 @@
* found in the LICENSE file.
*/
-/* From ppb_audio.idl modified Thu Aug 01 13:19:46 2013. */
+/* From ppb_audio.idl modified Fri Jan 24 16:18:44 2014. */
#ifndef PPAPI_C_PPB_AUDIO_H_
#define PPAPI_C_PPB_AUDIO_H_
@@ -61,7 +61,7 @@ typedef void (*PPB_Audio_Callback_1_0)(void* sample_buffer,
/**
* The <code>PPB_Audio</code> interface contains pointers to several functions
* for handling audio resources. Refer to the
- * <a href="/native-client/{{pepperversion}}/devguide/coding/audio">Audio</a>
+ * <a href="/native-client/devguide/coding/audio.html">Audio</a>
* chapter in the Developer's Guide for information on using this interface.
* Please see descriptions for each <code>PPB_Audio</code> and
* <code>PPB_AudioConfig</code> function for more details. A C example using
diff --git a/ppapi/c/ppb_audio_config.h b/ppapi/c/ppb_audio_config.h
index a1e2e4b..87f861b 100644
--- a/ppapi/c/ppb_audio_config.h
+++ b/ppapi/c/ppb_audio_config.h
@@ -3,7 +3,7 @@
* found in the LICENSE file.
*/
-/* From ppb_audio_config.idl modified Thu Mar 28 10:07:11 2013. */
+/* From ppb_audio_config.idl modified Fri Jan 24 16:19:35 2014. */
#ifndef PPAPI_C_PPB_AUDIO_CONFIG_H_
#define PPAPI_C_PPB_AUDIO_CONFIG_H_
@@ -66,7 +66,7 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES(PP_AudioSampleRate, 4);
* This interface only supports 16-bit stereo output.
*
* Refer to the
- * <a href="/native-client/{{pepperversion}}/devguide/coding/audio">Audio
+ * <a href="/native-client/devguide/coding/audio.html">Audio
* </a> chapter in the Developer's Guide for information on using this
* interface.
*/
diff --git a/ppapi/cpp/audio.h b/ppapi/cpp/audio.h
index 29a19f3..7f37cb8 100644
--- a/ppapi/cpp/audio.h
+++ b/ppapi/cpp/audio.h
@@ -19,7 +19,7 @@ namespace pp {
class InstanceHandle;
/// An audio resource. Refer to the
-/// <a href="/native-client/devguide/coding/audio">Audio</a>
+/// <a href="/native-client/devguide/coding/audio.html">Audio</a>
/// chapter in the Developer's Guide for information on using this interface.
class Audio : public Resource {
public:
diff --git a/ppapi/cpp/audio_config.h b/ppapi/cpp/audio_config.h
index e7ade54..7e12e9d 100644
--- a/ppapi/cpp/audio_config.h
+++ b/ppapi/cpp/audio_config.h
@@ -18,7 +18,7 @@ namespace pp {
class InstanceHandle;
/// A 16 bit stereo AudioConfig resource. Refer to the
-/// <a href="/native-client/{{pepperversion}}/devguide/coding/audio">Audio
+/// <a href="/native-client/devguide/coding/audio.html">Audio
/// </a>chapter in the Developer's Guide for information on using this
/// interface.
///
diff --git a/ppapi/cpp/image_data.h b/ppapi/cpp/image_data.h
index d94ea82..e9366ce 100644
--- a/ppapi/cpp/image_data.h
+++ b/ppapi/cpp/image_data.h
@@ -46,7 +46,7 @@ class ImageData : public Resource {
/// @param[in] format A PP_ImageDataFormat containing desired image format.
/// PP_ImageDataFormat is an enumeration of the different types of
/// image data formats. Refer to
- /// <a href="../pepperc/ppb__image__data_8h.html">
+ /// <a href="../c/ppb__image__data_8h.html">
/// <code>ppb_image_data.h</code></a> for further information.
///
/// @param[in] size A pointer to a <code>Size</code> containing the image
diff --git a/ppapi/thunk/ppb_uma_private_thunk.cc b/ppapi/thunk/ppb_uma_private_thunk.cc
index 4a0d9d3..1171d19 100644
--- a/ppapi/thunk/ppb_uma_private_thunk.cc
+++ b/ppapi/thunk/ppb_uma_private_thunk.cc
@@ -1,17 +1,15 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// 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.
-// From private/ppb_uma_private.idl modified Mon Nov 18 14:39:43 2013.
+// From private/ppb_uma_private.idl modified Fri Jan 24 13:23:21 2014.
#include "ppapi/c/pp_errors.h"
#include "ppapi/c/private/ppb_uma_private.h"
#include "ppapi/shared_impl/tracked_callback.h"
#include "ppapi/thunk/enter.h"
-#include "ppapi/thunk/ppb_instance_api.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
#include "ppapi/thunk/ppb_uma_singleton_api.h"
-#include "ppapi/thunk/resource_creation_api.h"
-#include "ppapi/thunk/thunk.h"
namespace ppapi {
namespace thunk {
@@ -76,7 +74,7 @@ const PPB_UMA_Private_0_2 g_ppb_uma_private_thunk_0_2 = {
} // namespace
-const PPB_UMA_Private_0_2* GetPPB_UMA_Private_0_2_Thunk() {
+PPAPI_THUNK_EXPORT const PPB_UMA_Private_0_2* GetPPB_UMA_Private_0_2_Thunk() {
return &g_ppb_uma_private_thunk_0_2;
}