| Index: views/widget/root_view.cc
|
| ===================================================================
|
| --- views/widget/root_view.cc (revision 100773)
|
| +++ views/widget/root_view.cc (working copy)
|
| @@ -155,11 +155,6 @@
|
| }
|
|
|
| void RootView::SchedulePaintInRect(const gfx::Rect& rect) {
|
| - MarkLayerDirty();
|
| - SchedulePaintInternal(rect);
|
| -}
|
| -
|
| -void RootView::SchedulePaintInternal(const gfx::Rect& rect) {
|
| gfx::Rect xrect = ConvertRectToParent(rect);
|
| gfx::Rect invalid_rect = GetLocalBounds().Intersect(xrect);
|
| if (!invalid_rect.IsEmpty())
|
| @@ -430,17 +425,11 @@
|
| return widget_->GetCompositor();
|
| }
|
|
|
| -void RootView::MarkLayerDirty() {
|
| - View::MarkLayerDirty();
|
| - if (!layer())
|
| - widget_->MarkLayerDirty();
|
| -}
|
| -
|
| void RootView::CalculateOffsetToAncestorWithLayer(gfx::Point* offset,
|
| - View** ancestor) {
|
| - View::CalculateOffsetToAncestorWithLayer(offset, ancestor);
|
| + ui::Layer** layer_parent) {
|
| + View::CalculateOffsetToAncestorWithLayer(offset, layer_parent);
|
| if (!layer())
|
| - widget_->CalculateOffsetToAncestorWithLayer(offset, ancestor);
|
| + widget_->CalculateOffsetToAncestorWithLayer(offset, layer_parent);
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
|
|