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

Side by Side Diff: Source/WebCore/rendering/RenderReplaced.cpp

Issue 7292017: Merge 90068 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/782/
Patch Set: Created 9 years, 5 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
« no previous file with comments | « Source/WebCore/rendering/RenderReplaced.h ('k') | Source/WebCore/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) 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 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 , m_intrinsicSize(intrinsicSize) 50 , m_intrinsicSize(intrinsicSize)
51 , m_hasIntrinsicSize(true) 51 , m_hasIntrinsicSize(true)
52 { 52 {
53 setReplaced(true); 53 setReplaced(true);
54 } 54 }
55 55
56 RenderReplaced::~RenderReplaced() 56 RenderReplaced::~RenderReplaced()
57 { 57 {
58 } 58 }
59 59
60 void RenderReplaced::destroy()
61 {
62 if (!documentBeingDestroyed() && parent())
63 parent()->dirtyLinesFromChangedChild(this);
64
65 RenderBox::destroy();
66 }
67
60 void RenderReplaced::styleDidChange(StyleDifference diff, const RenderStyle* old Style) 68 void RenderReplaced::styleDidChange(StyleDifference diff, const RenderStyle* old Style)
61 { 69 {
62 RenderBox::styleDidChange(diff, oldStyle); 70 RenderBox::styleDidChange(diff, oldStyle);
63 71
64 bool hadStyle = (oldStyle != 0); 72 bool hadStyle = (oldStyle != 0);
65 float oldZoom = hadStyle ? oldStyle->effectiveZoom() : RenderStyle::initialZ oom(); 73 float oldZoom = hadStyle ? oldStyle->effectiveZoom() : RenderStyle::initialZ oom();
66 if (style() && style()->effectiveZoom() != oldZoom) 74 if (style() && style()->effectiveZoom() != oldZoom)
67 intrinsicSizeChanged(); 75 intrinsicSizeChanged();
68 } 76 }
69 77
(...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 // The theme may wish to inflate the rect used when repainting. 408 // The theme may wish to inflate the rect used when repainting.
401 theme()->adjustRepaintRect(this, r); 409 theme()->adjustRepaintRect(this, r);
402 if (v) 410 if (v)
403 r.inflate(style()->outlineSize()); 411 r.inflate(style()->outlineSize());
404 } 412 }
405 computeRectForRepaint(repaintContainer, r); 413 computeRectForRepaint(repaintContainer, r);
406 return r; 414 return r;
407 } 415 }
408 416
409 } 417 }
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderReplaced.h ('k') | Source/WebCore/rendering/RenderWidget.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698