Various OpenGLUI changes:

runtime/embedders/openglui/common/canvas_context.h

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef EMBEDDERS_OPENGLUI_COMMON_CANVAS_CONTEXT_H_
 #define EMBEDDERS_OPENGLUI_COMMON_CANVAS_CONTEXT_H_
 
 #include "embedders/openglui/common/canvas_state.h"
 #include "embedders/openglui/common/graphics_handler.h"
 #include "embedders/openglui/common/log.h"
@@ skipping 85 matching lines @@
 
   inline void setImageSmoothingEnabled(bool enabled) {
     // TODO(gram): We're not actually doing anything with this yet.
     imageSmoothingEnabled_ = enabled;
   }
 
   inline void setGlobalCompositeOperation(const char* op) {
     state_->setGlobalCompositeOperation(op);
   }
 
-  inline void Save() {
-    state_ = state_->Save();
-  }
-
-  inline void Restore() {
-    CanvasState* popped_state = state_;
-    state_ = state_->Restore();
-    if (state_ != popped_state) {
-      // Only delete if the pop was successful.
-      delete popped_state;
-    }
-  }
+  void Save();
+  void Restore();
 
   inline void Rotate(float angle) {
     canvas_->rotate(Radians2Degrees(angle));
   }
 
   inline void Translate(float x, float y) {
     canvas_->translate(x, y);
   }
 
   inline void Scale(float x, float y) {
@@ skipping 171 matching lines @@
 
   inline void ResetClip() {
     // TODO(gram): Check this. Is it affected by the transform?
     canvas_->clipRect(SkRect::MakeLTRB(0, 0, width_, height_),
                       SkRegion::kReplace_Op);
   }
 
   virtual void Flush() {
     canvas_->flush();
   }
+
+  inline void SetFillGradient(bool is_radial, double x0, double y0, double r0,
+      double x1, double y1, double r1,
+      int stops, float* positions, char** colors) {
+    state_->SetFillGradient(is_radial, x0, y0, r0, x1, y1, r1,
+        stops, positions, colors);
+  }
+
+  inline void SetStrokeGradient(bool is_radial, double x0, double y0, double r0,
+      double x1, double y1, double r1,
+      int stops, float* positions, char** colors) {
+    state_->SetStrokeGradient(is_radial, x0, y0, r0, x1, y1, r1,
+        stops, positions, colors);
+  }
+
+  inline const SkBitmap* GetBitmap() {
+    SkDevice* device = canvas_->getDevice();
+    return &device->accessBitmap(false);
+  }
 };
 
 CanvasContext* Context2D(int handle);
 void FreeContexts();
 
 #endif  // EMBEDDERS_OPENGLUI_COMMON_CANVAS_CONTEXT_H_