Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(129)

Side by Side Diff: Source/core/rendering/RenderView.cpp

Issue 318803002: Rename Repaint to Paint Invalidation part 3 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderTheme.cpp ('k') | Source/core/rendering/RenderWidget.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
478 } else if (RenderBox* obj = owner->renderBox()) { 478 } else if (RenderBox* obj = owner->renderBox()) {
479 LayoutRect viewRectangle = viewRect(); 479 LayoutRect viewRectangle = viewRect();
480 LayoutRect rectToRepaint = intersection(repaintRect, viewRectangle); 480 LayoutRect rectToRepaint = intersection(repaintRect, viewRectangle);
481 481
482 // Subtract out the contentsX and contentsY offsets to get our coords wi thin the viewing 482 // Subtract out the contentsX and contentsY offsets to get our coords wi thin the viewing
483 // rectangle. 483 // rectangle.
484 rectToRepaint.moveBy(-viewRectangle.location()); 484 rectToRepaint.moveBy(-viewRectangle.location());
485 485
486 // FIXME: Hardcoded offsets here are not good. 486 // FIXME: Hardcoded offsets here are not good.
487 rectToRepaint.moveBy(obj->contentBoxRect().location()); 487 rectToRepaint.moveBy(obj->contentBoxRect().location());
488 obj->repaintRectangle(rectToRepaint); 488 obj->invalidatePaintRectangle(rectToRepaint);
489 } 489 }
490 } 490 }
491 491
492 void RenderView::repaintViewAndCompositedLayers() 492 void RenderView::repaintViewAndCompositedLayers()
493 { 493 {
494 repaint(); 494 paintInvalidationForWholeRenderer();
495 495
496 // The only way we know how to hit these ASSERTS below this point is via the Chromium OS login screen. 496 // The only way we know how to hit these ASSERTS below this point is via the Chromium OS login screen.
497 DisableCompositingQueryAsserts disabler; 497 DisableCompositingQueryAsserts disabler;
498 498
499 if (compositor()->inCompositingMode()) 499 if (compositor()->inCompositingMode())
500 compositor()->repaintCompositedLayers(); 500 compositor()->repaintCompositedLayers();
501 } 501 }
502 502
503 void RenderView::mapRectToRepaintBacking(const RenderLayerModelObject* repaintCo ntainer, LayoutRect& rect, bool fixed) const 503 void RenderView::mapRectToRepaintBacking(const RenderLayerModelObject* repaintCo ntainer, LayoutRect& rect, bool fixed) const
504 { 504 {
(...skipping 513 matching lines...) Expand 10 before | Expand all | Expand 10 after
1018 return viewWidth(IncludeScrollbars) / scale; 1018 return viewWidth(IncludeScrollbars) / scale;
1019 } 1019 }
1020 1020
1021 double RenderView::layoutViewportHeight() const 1021 double RenderView::layoutViewportHeight() const
1022 { 1022 {
1023 float scale = m_frameView ? m_frameView->frame().pageZoomFactor() : 1; 1023 float scale = m_frameView ? m_frameView->frame().pageZoomFactor() : 1;
1024 return viewHeight(IncludeScrollbars) / scale; 1024 return viewHeight(IncludeScrollbars) / scale;
1025 } 1025 }
1026 1026
1027 } // namespace WebCore 1027 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderTheme.cpp ('k') | Source/core/rendering/RenderWidget.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698