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

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

Issue 710113003: Initial step of removing CSS zoom related properties. (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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 } 58 }
59 59
60 void RenderReplaced::willBeDestroyed() 60 void RenderReplaced::willBeDestroyed()
61 { 61 {
62 if (!documentBeingDestroyed() && parent()) 62 if (!documentBeingDestroyed() && parent())
63 parent()->dirtyLinesFromChangedChild(this); 63 parent()->dirtyLinesFromChangedChild(this);
64 64
65 RenderBox::willBeDestroyed(); 65 RenderBox::willBeDestroyed();
66 } 66 }
67 67
68 void RenderReplaced::styleDidChange(StyleDifference diff, const RenderStyle* old Style)
69 {
70 RenderBox::styleDidChange(diff, oldStyle);
71
72 bool hadStyle = (oldStyle != 0);
73 float oldZoom = hadStyle ? oldStyle->effectiveZoom() : RenderStyle::initialZ oom();
74 if (style() && style()->effectiveZoom() != oldZoom)
75 intrinsicSizeChanged();
76 }
77
78 void RenderReplaced::layout() 68 void RenderReplaced::layout()
79 { 69 {
80 ASSERT(needsLayout()); 70 ASSERT(needsLayout());
81 71
82 setHeight(minimumReplacedHeight()); 72 setHeight(minimumReplacedHeight());
83 73
84 updateLogicalWidth(); 74 updateLogicalWidth();
85 updateLogicalHeight(); 75 updateLogicalHeight();
86 76
87 m_overflow.clear(); 77 m_overflow.clear();
(...skipping 446 matching lines...) Expand 10 before | Expand all | Expand 10 after
534 LayoutRect RenderReplaced::clippedOverflowRectForPaintInvalidation(const RenderL ayerModelObject* paintInvalidationContainer, const PaintInvalidationState* paint InvalidationState) const 524 LayoutRect RenderReplaced::clippedOverflowRectForPaintInvalidation(const RenderL ayerModelObject* paintInvalidationContainer, const PaintInvalidationState* paint InvalidationState) const
535 { 525 {
536 // The selectionRect can project outside of the overflowRect, so take their union 526 // The selectionRect can project outside of the overflowRect, so take their union
537 // for paint invalidation to avoid selection painting glitches. 527 // for paint invalidation to avoid selection painting glitches.
538 LayoutRect r = isSelected() ? localSelectionRect() : visualOverflowRect(); 528 LayoutRect r = isSelected() ? localSelectionRect() : visualOverflowRect();
539 mapRectToPaintInvalidationBacking(paintInvalidationContainer, r, paintInvali dationState); 529 mapRectToPaintInvalidationBacking(paintInvalidationContainer, r, paintInvali dationState);
540 return r; 530 return r;
541 } 531 }
542 532
543 } 533 }
OLDNEW
« no previous file with comments | « sky/engine/core/rendering/RenderReplaced.h ('k') | sky/engine/core/rendering/style/RenderStyle.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698