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

Side by Side Diff: sky/engine/core/rendering/RenderReplaced.cpp

Issue 711203002: Remove zoom() and effectiveZoom(). (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2000 Dirk Mueller (mueller@kde.org) 3 * Copyright (C) 2000 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2006, 2007 Apple Inc. All rights reserved.
5 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved. 5 * Copyright (C) Research In Motion Limited 2011-2012. All rights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 m_overflow.clear(); 77 m_overflow.clear();
78 addVisualEffectOverflow(); 78 addVisualEffectOverflow();
79 updateLayerTransformAfterLayout(); 79 updateLayerTransformAfterLayout();
80 invalidateBackgroundObscurationStatus(); 80 invalidateBackgroundObscurationStatus();
81 81
82 clearNeedsLayout(); 82 clearNeedsLayout();
83 } 83 }
84 84
85 void RenderReplaced::intrinsicSizeChanged() 85 void RenderReplaced::intrinsicSizeChanged()
86 { 86 {
87 int scaledWidth = static_cast<int>(defaultWidth * style()->effectiveZoom()); 87 m_intrinsicSize = IntSize(defaultWidth, defaultHeight);
88 int scaledHeight = static_cast<int>(defaultHeight * style()->effectiveZoom() );
89 m_intrinsicSize = IntSize(scaledWidth, scaledHeight);
90 setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation(); 88 setNeedsLayoutAndPrefWidthsRecalcAndFullPaintInvalidation();
91 } 89 }
92 90
93 void RenderReplaced::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset) 91 void RenderReplaced::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset)
94 { 92 {
95 ANNOTATE_GRAPHICS_CONTEXT(paintInfo, this); 93 ANNOTATE_GRAPHICS_CONTEXT(paintInfo, this);
96 94
97 if (!shouldPaint(paintInfo, paintOffset)) 95 if (!shouldPaint(paintInfo, paintOffset))
98 return; 96 return;
99 97
(...skipping 424 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 LayoutRect RenderReplaced::clippedOverflowRectForPaintInvalidation(const RenderL ayerModelObject* paintInvalidationContainer, const PaintInvalidationState* paint InvalidationState) const 522 LayoutRect RenderReplaced::clippedOverflowRectForPaintInvalidation(const RenderL ayerModelObject* paintInvalidationContainer, const PaintInvalidationState* paint InvalidationState) const
525 { 523 {
526 // The selectionRect can project outside of the overflowRect, so take their union 524 // The selectionRect can project outside of the overflowRect, so take their union
527 // for paint invalidation to avoid selection painting glitches. 525 // for paint invalidation to avoid selection painting glitches.
528 LayoutRect r = isSelected() ? localSelectionRect() : visualOverflowRect(); 526 LayoutRect r = isSelected() ? localSelectionRect() : visualOverflowRect();
529 mapRectToPaintInvalidationBacking(paintInvalidationContainer, r, paintInvali dationState); 527 mapRectToPaintInvalidationBacking(paintInvalidationContainer, r, paintInvali dationState);
530 return r; 528 return r;
531 } 529 }
532 530
533 } 531 }
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderObject.cpp ('k') | sky/engine/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698