From aca5a97af1eabd1e4668379225388cb853018ebd Mon Sep 17 00:00:00 2001 From: "brettw@chromium.org" Date: Wed, 16 Mar 2011 21:00:10 +0000 Subject: Fixing PPB_Graiphics2D::Describe to behave according to spec with an invalid graphics 2d resource parameter. BUG= http://code.google.com/p/chromium/issues/detail?id=76091 Original review http://codereview.chromium.org/6681043/ Patch by Sang Ahn git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78432 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/plugins/ppapi/ppb_graphics_2d_impl.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'webkit/plugins') diff --git a/webkit/plugins/ppapi/ppb_graphics_2d_impl.cc b/webkit/plugins/ppapi/ppb_graphics_2d_impl.cc index efeb544..5e98f44 100644 --- a/webkit/plugins/ppapi/ppb_graphics_2d_impl.cc +++ b/webkit/plugins/ppapi/ppb_graphics_2d_impl.cc @@ -132,12 +132,15 @@ PP_Bool IsGraphics2D(PP_Resource resource) { } PP_Bool Describe(PP_Resource graphics_2d, - PP_Size* size, - PP_Bool* is_always_opaque) { + PP_Size* size, + PP_Bool* is_always_opaque) { scoped_refptr context( Resource::GetAs(graphics_2d)); - if (!context) + if (!context) { + *size = PP_MakeSize(0, 0); + *is_always_opaque = PP_FALSE; return PP_FALSE; + } return context->Describe(size, is_always_opaque); } @@ -680,4 +683,3 @@ bool PPB_Graphics2D_Impl::HasPendingFlush() const { } // namespace ppapi } // namespace webkit - -- cgit v1.1