| Index: ui/views/view.h | 
| diff --git a/ui/views/view.h b/ui/views/view.h | 
| index dddf1590e616fb08b5bb9c3f3d6a0f841af302f2..73fd7f86343aa4190c22c004e7976d8c58680606 100644 | 
| --- a/ui/views/view.h | 
| +++ b/ui/views/view.h | 
| @@ -1046,6 +1046,10 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, | 
| void RemoveObserver(ViewObserver* observer); | 
| bool HasObserver(const ViewObserver* observer) const; | 
|  | 
| +  // Returns the type of scaling to be done for this View. Values should be from | 
| +  // ui::PaintContext::ScaleType. | 
| +  virtual int GetContextScaleType() const; | 
| + | 
| protected: | 
| // Used to track a drag. RootView passes this into | 
| // ProcessMousePressed/Dragged. | 
| @@ -1316,12 +1320,13 @@ class VIEWS_EXPORT View : public ui::LayerDelegate, | 
| // during painting. | 
| bool ShouldPaint() const; | 
|  | 
| -  // Returns the offset that should be used when constructing the paint context | 
| +  // Returns the bounds that should be used when constructing the paint context | 
| // for this view. | 
| -  gfx::Vector2d GetPaintContextOffset() const; | 
| +  gfx::Rect GetPaintContextBounds() const; | 
|  | 
| // Adjusts the transform of |recorder| in advance of painting. | 
| -  void SetupTransformRecorderForPainting(ui::TransformRecorder* recorder) const; | 
| +  void SetupTransformRecorderForPainting(ui::TransformRecorder* recorder, | 
| +                                         const ui::PaintContext& context) const; | 
|  | 
| // Recursively calls the painting method |func| on all non-layered children, | 
| // in Z order. | 
|  |