Index: ppapi/thunk/ppb_widget_thunk.cc |
diff --git a/ppapi/thunk/ppb_widget_thunk.cc b/ppapi/thunk/ppb_widget_thunk.cc |
index f00b48b3d9b71d81da06e866ede8d65ff5e73c0c..0b4acde5f85988ffff40cb79ad845f3ad3610292 100644 |
--- a/ppapi/thunk/ppb_widget_thunk.cc |
+++ b/ppapi/thunk/ppb_widget_thunk.cc |
@@ -1,11 +1,18 @@ |
-// 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. |
+/* 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. |
+ */ |
dmichael (off chromium)
2012/11/16 18:24:44
How hard would it be to do a C++ style copyright h
teravest
2012/11/16 18:52:36
Done. I changed the "From...modified..." to be C++
|
-#include "ppapi/thunk/thunk.h" |
+/* From dev/ppb_widget_dev.idl modified Thu Nov 15 11:21:48 2012. */ |
+ |
+#include "ppapi/c/dev/ppb_widget_dev.h" |
+#include "ppapi/c/pp_errors.h" |
+#include "ppapi/shared_impl/tracked_callback.h" |
#include "ppapi/thunk/enter.h" |
+#include "ppapi/thunk/ppb_instance_api.h" |
#include "ppapi/thunk/ppb_widget_api.h" |
#include "ppapi/thunk/resource_creation_api.h" |
+#include "ppapi/thunk/thunk.h" |
namespace ppapi { |
namespace thunk { |
@@ -17,28 +24,30 @@ PP_Bool IsWidget(PP_Resource resource) { |
return PP_FromBool(enter.succeeded()); |
} |
-PP_Bool Paint(PP_Resource widget, const PP_Rect* rect, PP_Resource image_id) { |
+PP_Bool Paint(PP_Resource widget, |
+ const struct PP_Rect* rect, |
dmichael (off chromium)
2012/11/16 18:24:44
since this is C++, the struct is superfluous. If t
teravest
2012/11/16 18:52:36
This is easiest because it's what IDL gives me for
|
+ PP_Resource image) { |
EnterResource<PPB_Widget_API> enter(widget, false); |
if (enter.failed()) |
return PP_FALSE; |
- return enter.object()->Paint(rect, image_id); |
+ return enter.object()->Paint(rect, image); |
} |
-PP_Bool HandleEvent(PP_Resource widget, PP_Resource pp_input_event) { |
+PP_Bool HandleEvent(PP_Resource widget, PP_Resource input_event) { |
EnterResource<PPB_Widget_API> enter(widget, false); |
if (enter.failed()) |
return PP_FALSE; |
- return enter.object()->HandleEvent(pp_input_event); |
+ return enter.object()->HandleEvent(input_event); |
} |
-PP_Bool GetLocation(PP_Resource widget, PP_Rect* location) { |
+PP_Bool GetLocation(PP_Resource widget, struct PP_Rect* location) { |
EnterResource<PPB_Widget_API> enter(widget, false); |
if (enter.failed()) |
return PP_FALSE; |
return enter.object()->GetLocation(location); |
} |
-void SetLocation(PP_Resource widget, const PP_Rect* location) { |
+void SetLocation(PP_Resource widget, const struct PP_Rect* location) { |
EnterResource<PPB_Widget_API> enter(widget, false); |
if (enter.succeeded()) |
enter.object()->SetLocation(location); |
@@ -50,7 +59,7 @@ void SetScale(PP_Resource widget, float scale) { |
enter.object()->SetScale(scale); |
} |
-const PPB_Widget_Dev_0_3 g_ppb_widget_thunk_0_3 = { |
+const PPB_Widget_Dev_0_3 g_ppb_widget_dev_thunk_0_3 = { |
&IsWidget, |
&Paint, |
&HandleEvent, |
@@ -58,23 +67,23 @@ const PPB_Widget_Dev_0_3 g_ppb_widget_thunk_0_3 = { |
&SetLocation, |
}; |
-const PPB_Widget_Dev_0_4 g_ppb_widget_thunk_0_4 = { |
+const PPB_Widget_Dev_0_4 g_ppb_widget_dev_thunk_0_4 = { |
&IsWidget, |
&Paint, |
&HandleEvent, |
&GetLocation, |
&SetLocation, |
- &SetScale |
+ &SetScale, |
}; |
} // namespace |
const PPB_Widget_Dev_0_3* GetPPB_Widget_Dev_0_3_Thunk() { |
- return &g_ppb_widget_thunk_0_3; |
+ return &g_ppb_widget_dev_thunk_0_3; |
} |
const PPB_Widget_Dev_0_4* GetPPB_Widget_Dev_0_4_Thunk() { |
- return &g_ppb_widget_thunk_0_4; |
+ return &g_ppb_widget_dev_thunk_0_4; |
} |
} // namespace thunk |