diff options
Diffstat (limited to 'chromium/content/renderer/pepper/pepper_graphics_2d_host.cc')
| -rw-r--r-- | chromium/content/renderer/pepper/pepper_graphics_2d_host.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/chromium/content/renderer/pepper/pepper_graphics_2d_host.cc b/chromium/content/renderer/pepper/pepper_graphics_2d_host.cc index b5c5bc9d90a..5110e1478a8 100644 --- a/chromium/content/renderer/pepper/pepper_graphics_2d_host.cc +++ b/chromium/content/renderer/pepper/pepper_graphics_2d_host.cc @@ -19,9 +19,9 @@ #include "cc/paint/paint_flags.h" #include "cc/resources/cross_thread_shared_bitmap.h" #include "components/viz/common/gpu/context_provider.h" -#include "components/viz/common/quads/shared_bitmap.h" #include "components/viz/common/resources/bitmap_allocation.h" #include "components/viz/common/resources/resource_sizes.h" +#include "components/viz/common/resources/shared_bitmap.h" #include "content/public/renderer/render_thread.h" #include "content/public/renderer/renderer_ppapi_host.h" #include "content/renderer/pepper/gfx_conversion.h" @@ -338,7 +338,7 @@ bool PepperGraphics2DHost::BindToInstance( // The |backing_bitmap| must be clipped to the |plugin_rect| to avoid painting // outside the plugin area. This can happen if the plugin has been resized since // PaintImageData verified the image is within the plugin size. -void PepperGraphics2DHost::Paint(blink::WebCanvas* canvas, +void PepperGraphics2DHost::Paint(cc::PaintCanvas* canvas, const gfx::Rect& plugin_rect, const gfx::Rect& paint_rect) { TRACE_EVENT0("pepper", "PepperGraphics2DHost::Paint"); @@ -387,8 +387,10 @@ void PepperGraphics2DHost::Paint(blink::WebCanvas* canvas, canvas->scale(scale_, scale_); pixel_origin.scale(1.0f / scale_); } - canvas->drawBitmap(backing_bitmap, pixel_origin.x(), pixel_origin.y(), - &flags); + // TODO(khushalsagar): Can this be cached on image_data_, and invalidated when + // the bitmap changes? + canvas->drawImage(cc::PaintImage::CreateFromBitmap(std::move(backing_bitmap)), + pixel_origin.x(), pixel_origin.y(), &flags); } void PepperGraphics2DHost::ViewInitiatedPaint() { @@ -713,7 +715,6 @@ bool PepperGraphics2DHost::PrepareTransferableResource( 0, format, GL_UNSIGNED_BYTE, nullptr); } - gl->GenMailboxCHROMIUM(gpu_mailbox.name); gl->ProduceTextureDirectCHROMIUM(texture_id, gpu_mailbox.name); } |