Index: views/view.h |
diff --git a/views/view.h b/views/view.h |
index a76b1257ab7363a2713eed8a93acb8ed5678db00..bbf5f04ceff2c569f5b08adba4765d5acd33d012 100644 |
--- a/views/view.h |
+++ b/views/view.h |
@@ -49,6 +49,7 @@ namespace views { |
class Background; |
class Border; |
+class CallbackLock; |
class ContextMenuController; |
class DragController; |
class FocusManager; |
@@ -246,6 +247,11 @@ class View : public AcceleratorTarget { |
// Returns whether the view is enabled. |
virtual bool IsEnabled() const; |
+ //TODO(vollick) return a ref-counted lock that releases painting when destroyed. |
Jói
2011/06/30 19:50:50
+80
|
+ //These methods are dangerous. |
+ void SetPaintingEnabled(bool enabled); |
+ bool IsPaintingEnabled() const; |
+ |
// Transformations ----------------------------------------------------------- |
// Methods for setting transformations for a view (e.g. rotation, scaling). |
@@ -418,6 +424,9 @@ class View : public AcceleratorTarget { |
// relative to the Widget that is their parent. |
static void ConvertPointToWidget(const View* src, gfx::Point* point); |
+ // TODO(vollick) get from Sadrul's fix |
+ static void ConvertRectToWidget(const View* src, gfx::Rect* rect); |
+ |
// Convert a point from a view Widget to a View dest |
static void ConvertPointFromWidget(const View* dest, gfx::Point* p); |
@@ -440,6 +449,9 @@ class View : public AcceleratorTarget { |
virtual void SchedulePaint(); |
virtual void SchedulePaintInRect(const gfx::Rect& r); |
+ virtual void ScheduleComposite(); |
+ virtual void ScheduleCompositeInRect(const gfx::Rect& r); |
+ |
// Called by the framework to paint a View. Performs translation and clipping |
// for View coordinates and language direction as required, allows the View |
// to paint itself via the various OnPaint*() event handlers and then paints |
@@ -1176,6 +1188,9 @@ class View : public AcceleratorTarget { |
// successfully converted to the ancestor's coordinate system. |
bool ConvertPointForAncestor(const View* ancestor, gfx::Point* point) const; |
+ // TODO(vollick) use Sadrul's fix; |
+ bool ConvertRectForAncestor(const View* ancestor, gfx::Rect* rect) const; |
+ |
// Convert a point in the ancestor's coordinate system to the view's |
// coordinate system using necessary transformations. Returns whether the |
// point was successfully from the ancestor's coordinate system to the view's |
@@ -1405,6 +1420,9 @@ class View : public AcceleratorTarget { |
// even though it may not be normally focusable. |
bool accessibility_focusable_; |
+ // Whether this view can be painted |
+ bool painting_enabled_; |
+ |
// Context menus ------------------------------------------------------------- |
// The menu controller. |