Vend common GL context

ui/gfx/compositor/compositor.h

 // Copyright (c) 2011 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.
 
 #ifndef UI_GFX_COMPOSITOR_COMPOSITOR_H_
 #define UI_GFX_COMPOSITOR_COMPOSITOR_H_
 #pragma once
 
 #include "base/memory/ref_counted.h"
 #include "ui/gfx/compositor/compositor_export.h"
 #include "ui/gfx/transform.h"
 #include "ui/gfx/native_widget_types.h"
+#include "ui/gfx/size.h"
 
 class SkCanvas;
 namespace gfx {
 class Point;
 class Rect;
-class Size;
 }
 
 namespace ui {
 
 struct TextureDrawParams {
   TextureDrawParams() : transform(), blend(false) {}
 
   // The transform to be applied to the texture.
   ui::Transform transform;
 
@@ skipping 14 matching lines @@
 // Views own the Texture.
 class COMPOSITOR_EXPORT Texture : public base::RefCounted<Texture> {
  public:
   // Sets the canvas of this texture. The origin is at |origin|.
   // |overall_size| gives the total size of texture.
   virtual void SetCanvas(const SkCanvas& canvas,
                          const gfx::Point& origin,
                          const gfx::Size& overall_size) = 0;
 
   // Draws the texture.
-  virtual void Draw(const ui::TextureDrawParams& params) = 0;
+  virtual void Draw(const ui::TextureDrawParams& params,
+                    const gfx::Size& surface_size) = 0;

[sky, 2011/08/24 21:17:08]

Move this into TextureDrawParams. I think the name surface_size is a bit
ambiguous here. Would be better to name it compositor_size. Alternatively maybe
you should pass in the Compositor (in TextureDRawParams) so that implementations
can query whatever they want from the compositor.

[jonathan.backer, 2011/08/25 18:57:18]

Done.

 
   // Draws the portion of the texture contained within clip_bounds
   virtual void Draw(const ui::TextureDrawParams& params,
-                    const gfx::Rect& clip_bounds_in_texture) = 0;
+                    const gfx::Rect& clip_bounds_in_texture,
+                    const gfx::Size& surface_size) = 0;
 
  protected:
   virtual ~Texture() {}
 
  private:
   friend class base::RefCounted<Texture>;
 };
 
 // Compositor object to take care of GPU painting.
 // A Browser compositor object is responsible for generating the final
@@ skipping 16 matching lines @@
   virtual void NotifyEnd() = 0;
 
   // Blurs the specific region in the compositor.
   virtual void Blur(const gfx::Rect& bounds) = 0;
 
   // Schedules a paint on the widget this Compositor was created for.
   virtual void SchedulePaint() = 0;
 
   // Notifies the compositor that the size of the widget that it is
   // drawing to has changed.
   virtual void OnWidgetSizeChanged(const gfx::Size& size) = 0;

[sky, 2011/08/24 21:17:08]

Rename this to WidgetSizeChanged, make it concrete, have it set size_ and invoke
the pure virtual method OnWidgetSizeChanged.

[jonathan.backer, 2011/08/25 18:57:18]

Done.

 
+  // Returns the size of the widget that is being drawn to.
+  const gfx::Size& size() { return size_; }
+
  protected:
+  explicit Compositor(const gfx::Size& size) : size_(size) {}
   virtual ~Compositor() {}
 
+  void SetSize(const gfx::Size& size) { size_ = size; }

[sky, 2011/08/24 21:17:08]

Is this needed?

[jonathan.backer, 2011/08/25 18:57:18]

Done.

+
  private:
+  gfx::Size size_;
+
   friend class base::RefCounted<Compositor>;
 };
 
 }  // namespace ui
 
 #endif  // UI_GFX_COMPOSITOR_COMPOSITOR_H_