Add an instance parameter to var objects, audio, and the 2D API. This replace...

remoting/client/plugin/pepper_view.cc

 // Copyright (c) 2010 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.
 
 #include "remoting/client/plugin/pepper_view.h"
 
 #include "base/message_loop.h"
 #include "ppapi/cpp/graphics_2d.h"
 #include "ppapi/cpp/image_data.h"
 #include "ppapi/cpp/point.h"
@@ skipping 30 matching lines @@
   if (!instance_->CurrentlyOnPluginThread()) {
     RunTaskOnPluginThread(NewTracedMethod(this, &PepperView::Paint));
     return;
   }
 
   TraceContext::tracer()->PrintString("Start Paint.");
   // TODO(ajwong): We're assuming the native format is BGRA_PREMUL below. This
   // is wrong.
   if (is_static_fill_) {
     LOG(ERROR) << "Static filling " << static_fill_color_;
-    pp::ImageData image(pp::ImageData::GetNativeImageDataFormat(),
+    pp::ImageData image(instance_, pp::ImageData::GetNativeImageDataFormat(),
                         pp::Size(viewport_width_, viewport_height_),
                         false);
     if (image.is_null()) {
       LOG(ERROR) << "Unable to allocate image of size: "
                  << viewport_width_ << "x" << viewport_height_;
       return;
     }
 
     for (int y = 0; y < image.size().height(); y++) {
       for (int x = 0; x < image.size().width(); x++) {
@@ skipping 13 matching lines @@
   }
   TraceContext::tracer()->PrintString("End Paint.");
 }
 
 void PepperView::PaintFrame(media::VideoFrame* frame, UpdatedRects* rects) {
   DCHECK(instance_->CurrentlyOnPluginThread());
 
   TraceContext::tracer()->PrintString("Start Paint Frame.");
   // TODO(ajwong): We're assuming the native format is BGRA_PREMUL below. This
   // is wrong.
-  pp::ImageData image(pp::ImageData::GetNativeImageDataFormat(),
+  pp::ImageData image(instance_, pp::ImageData::GetNativeImageDataFormat(),
                       pp::Size(viewport_width_, viewport_height_),
                       false);
   if (image.is_null()) {
     LOG(ERROR) << "Unable to allocate image of size: "
                << frame->width() << "x" << frame->height();
     return;
   }
 
   uint32_t* frame_data =
       reinterpret_cast<uint32_t*>(frame->data(media::VideoFrame::kRGBPlane));
@@ skipping 78 matching lines @@
   }
 
   // TODO(ajwong): Should we ignore x & y updates?  What do those even mean?
 
   // TODO(ajwong): What does viewport x, y mean to a plugin anyways?
   viewport_x_ = x;
   viewport_y_ = y;
   viewport_width_ = width;
   viewport_height_ = height;
 
-  graphics2d_ = pp::Graphics2D(pp::Size(viewport_width_, viewport_height_),
+  graphics2d_ = pp::Graphics2D(instance_,
+                               pp::Size(viewport_width_, viewport_height_),
                                false);
   if (!instance_->BindGraphics(graphics2d_)) {
     LOG(ERROR) << "Couldn't bind the device context.";
     return;
   }
 }
 
 void PepperView::AllocateFrame(media::VideoFrame::Format format,
                                size_t width,
                                size_t height,
@@ skipping 40 matching lines @@
 }
 
 void PepperView::OnPaintDone() {
   // TODO(ajwong):Probably should set some variable to allow repaints to
   // actually paint.
   TraceContext::tracer()->PrintString("Paint flushed");
   return;
 }
 
 }  // namespace remoting