diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-11 00:55:04 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-11 00:55:04 +0000 |
| commit | c3e815ac39d136f1e20892ea3bb348be04f15384 (patch) | |
| tree | 691a18f07b8917fee80388fb08a01017c400b804 /webkit | |
| parent | ddbbfe2acf8c482df256c99e23c59ff54aa70b5f (diff) | |
| download | chromium_src-c3e815ac39d136f1e20892ea3bb348be04f15384.zip chromium_src-c3e815ac39d136f1e20892ea3bb348be04f15384.tar.gz chromium_src-c3e815ac39d136f1e20892ea3bb348be04f15384.tar.bz2 | |
Revert 46876 - Pull latest ppapi, update rect usage.
Broke the build: http://build.chromium.org/buildbot/waterfall/builders/Chromium%20XP/builds/11847/steps/compile/logs/stdio
Review URL: http://codereview.chromium.org/1981010
TBR=brettw@chromium.org
Review URL: http://codereview.chromium.org/2057004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46879 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/plugins/pepper_device_context_2d.cc | 12 | ||||
| -rw-r--r-- | webkit/glue/plugins/pepper_plugin_instance.cc | 6 |
2 files changed, 10 insertions, 8 deletions
diff --git a/webkit/glue/plugins/pepper_device_context_2d.cc b/webkit/glue/plugins/pepper_device_context_2d.cc index bd5cca3..3fbc685 100644 --- a/webkit/glue/plugins/pepper_device_context_2d.cc +++ b/webkit/glue/plugins/pepper_device_context_2d.cc @@ -106,18 +106,18 @@ void DeviceContext2D::PaintImageData(PP_Resource image, // Draw the bitmap to the backing store. SkIRect src_rect; - if (dirty->point.x == 0 && dirty->point.y == 0 && - dirty->size.width == 0 && dirty->size.height == 0) { + if (dirty->left == 0 && dirty->top == 0 && + dirty->right == 0 && dirty->bottom == 0) { // Default to the entire bitmap. src_rect.fLeft = 0; src_rect.fTop = 0; src_rect.fRight = new_image_bitmap.width(); src_rect.fBottom = new_image_bitmap.height(); } else { - src_rect.fLeft = dirty->point.x; - src_rect.fTop = dirty->point.y; - src_rect.fRight = dirty->point.x + dirty->size.width; - src_rect.fBottom = dirty->point.y + dirty->size.height; + src_rect.fLeft = dirty->left; + src_rect.fTop = dirty->top; + src_rect.fRight = dirty->right; + src_rect.fBottom = dirty->bottom; } SkRect dest_rect = { SkIntToScalar(src_rect.fLeft), SkIntToScalar(src_rect.fTop), diff --git a/webkit/glue/plugins/pepper_plugin_instance.cc b/webkit/glue/plugins/pepper_plugin_instance.cc index 2de26be..17edef3 100644 --- a/webkit/glue/plugins/pepper_plugin_instance.cc +++ b/webkit/glue/plugins/pepper_plugin_instance.cc @@ -25,8 +25,10 @@ namespace pepper { namespace { void RectToPPRect(const gfx::Rect& input, PP_Rect* output) { - *output = PP_MakeRectFromXYWH(input.x(), input.y(), - input.width(), input.height()); + output->left = input.x(); + output->top = input.y(); + output->right = input.right(); + output->bottom = input.bottom(); } PP_Event_Type ConvertEventTypes(WebInputEvent::Type wetype) { |