summaryrefslogtreecommitdiffstats
path: root/ppapi
diff options
context:
space:
mode:
Diffstat (limited to 'ppapi')
-rw-r--r--ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_off_main_thread.cc3
-rw-r--r--ppapi/native_client/tests/ppapi_browser/ppb_core/ppapi_ppb_core.cc3
-rw-r--r--ppapi/native_client/tests/ppapi_browser/ppb_scrollbar/ppapi_ppb_scrollbar.cc6
3 files changed, 7 insertions, 5 deletions
diff --git a/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_off_main_thread.cc b/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_off_main_thread.cc
index c604932..5204255 100644
--- a/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_off_main_thread.cc
+++ b/ppapi/native_client/tests/ppapi_browser/crash/ppapi_crash_off_main_thread.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 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.
//
@@ -6,6 +6,7 @@
#include <pthread.h>
#include <stdio.h>
+#include <unistd.h>
#include "native_client/src/shared/platform/nacl_check.h"
#include "native_client/tests/ppapi_test_lib/test_interface.h"
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_core/ppapi_ppb_core.cc b/ppapi/native_client/tests/ppapi_browser/ppb_core/ppapi_ppb_core.cc
index b944132..b683b17 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_core/ppapi_ppb_core.cc
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_core/ppapi_ppb_core.cc
@@ -1,10 +1,11 @@
-// Copyright (c) 2011 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.
#include <pthread.h>
#include <stdio.h>
#include <string.h>
+#include <unistd.h>
#include "native_client/src/shared/platform/nacl_check.h"
#include "native_client/tests/ppapi_test_lib/get_browser_interface.h"
diff --git a/ppapi/native_client/tests/ppapi_browser/ppb_scrollbar/ppapi_ppb_scrollbar.cc b/ppapi/native_client/tests/ppapi_browser/ppb_scrollbar/ppapi_ppb_scrollbar.cc
index 3a64d24..0f7f6fb 100644
--- a/ppapi/native_client/tests/ppapi_browser/ppb_scrollbar/ppapi_ppb_scrollbar.cc
+++ b/ppapi/native_client/tests/ppapi_browser/ppb_scrollbar/ppapi_ppb_scrollbar.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 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.
@@ -116,7 +116,8 @@ void TestScrollBy() {
void TestSetTickMarks() {
PP_Resource scrollbar = PPBScrollbarDev()->Create(pp_instance(),
kVertical);
- uint32_t thickness = PPBScrollbarDev()->GetThickness(scrollbar);
+ // GetThickness returns uint32_t, but PP_Rect initializers must be int32_t.
+ int32_t thickness = PPBScrollbarDev()->GetThickness(scrollbar);
const int32_t kCount = 2;
PP_Rect tick_marks[kCount] = {
{ {0, 0}, {thickness, 1} },
@@ -142,4 +143,3 @@ void SetupTests() {
void SetupPluginInterfaces() {
}
-