Index: webkit/glue/plugins/pepper_device_context_2d.cc |
=================================================================== |
--- webkit/glue/plugins/pepper_device_context_2d.cc (revision 51931) |
+++ webkit/glue/plugins/pepper_device_context_2d.cc (working copy) |
@@ -124,7 +124,7 @@ |
scoped_refptr<DeviceContext2D> context( |
Resource::GetAs<DeviceContext2D>(device_context)); |
if (!context.get()) |
- return PP_Error_BadResource; |
+ return PP_ERROR_BADRESOURCE; |
return context->Flush(callback); |
} |
@@ -280,12 +280,12 @@ |
int32_t DeviceContext2D::Flush(const PP_CompletionCallback& callback) { |
// Don't allow more than one pending flush at a time. |
if (HasPendingFlush()) |
- return PP_Error_InProgress; |
+ return PP_ERROR_INPROGRESS; |
// TODO(brettw) check that the current thread is not the main one and |
// implement blocking flushes in this case. |
if (!callback.func) |
- return PP_Error_BadArgument; |
+ return PP_ERROR_BADARGUMENT; |
gfx::Rect changed_rect; |
for (size_t i = 0; i < queued_operations_.size(); i++) { |
@@ -328,7 +328,7 @@ |
// execute in the next round of the message loop. |
ScheduleOffscreenCallback(FlushCallbackData(callback)); |
} |
- return PP_Error_WouldBlock; |
+ return PP_ERROR_WOULDBLOCK; |
} |
bool DeviceContext2D::ReadImageData(PP_Resource image, int32_t x, int32_t y) { |