Update Xray for PNaCl

native_client_sdk/src/libraries/xray/xray.h

 /* Copyright (c) 2013 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.
  */
 
 /* XRay -- a simple profiler for Native Client */
 
 
 #ifndef LIBRARIES_XRAY_XRAY_H_
 #define LIBRARIES_XRAY_XRAY_H_
@@ skipping 35 matching lines @@
 XRAY_NO_INSTRUMENT void XRaySetAnnotationFilter(
     struct XRayTraceCapture* capture, uint32_t filter);
 XRAY_NO_INSTRUMENT void XRaySaveReport(struct XRayTraceCapture* capture,
                                        const char* filename,
                                        float percent_cutoff,
                                        int cycle_cutoff);
 XRAY_NO_INSTRUMENT void XRayReport(struct XRayTraceCapture* capture,
                                    FILE* f,
                                    float percent_cutoff,
                                    int ticks_cutoff);
+
+#ifndef XRAY_NOPEPPER
+#include "ppapi/c/ppb.h"
+XRAY_NO_INSTRUMENT void XRayBrowserTraceReport(
+    struct XRayTraceCapture* capture);
+XRAY_NO_INSTRUMENT void XRayBrowserRegisterInterface(
+    PPB_GetInterface get_browser_interface);
+#endif /* XRAY_NOPEPPER */
+
+
 #if defined(XRAY_ANNOTATE)
 #define XRayAnnotate(...) __XRayAnnotate(__VA_ARGS__)
 #define XRayAnnotateFiltered(...) __XRayAnnotateFiltered(__VA_ARGS__)
 #else
 #define XRayAnnotate(...)
 #define XRayAnnotateFiltered(...)
 #endif
 /* This is the end of the public XRay API */
 
 #else  /* defined(XRAY) */
@@ skipping 13 matching lines @@
 inline void XRaySetAnnotationFilter(struct XRayTraceCapture* capture,
                                     uint32_t filter) {}
 inline void XRaySaveReport(struct XRayTraceCapture* capture,
                            const char* filename,
                            float percent_cutoff,
                            int cycle_cutoff) {}
 inline void XRayReport(struct XRayTraceCapture* capture,
                        FILE* f,
                        float percent_cutoff,
                        int ticks_cutoff);
+
+#ifndef XRAY_NOPEPPER
+#include "ppapi/c/ppb.h"
+inline void XRayBrowserTraceReport(struct XRayTraceCapture* capture);

[nfullagar1, 2013/07/17 00:53:19]

add an empty {} function body

[grosse, 2013/07/17 19:37:56]

Done.

+inline void XRayBrowserRegisterInterface(

[nfullagar1, 2013/07/17 00:53:19]

XRayRegisterBrowserInterface(

[grosse, 2013/07/17 19:37:56]

Done.

+    PPB_GetInterface get_browser_interface);

[nfullagar1, 2013/07/17 00:53:19]

{}

[grosse, 2013/07/17 19:37:56]

Done.

+#endif /* XRAY_NOPEPPER */
+
+
 #endif  /* defined(XRAY) */
 
 #ifdef __cplusplus
 }
 #endif
 
 #endif  /* LIBRARIES_XRAY_XRAY_H_ */