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

Side by Side Diff: Source/WebCore/rendering/RenderWidget.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.cpp ('k') | no next file » | 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, 2009, 2010 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2006, 2009, 2010 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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 animation()->cancelAnimations(this); 119 animation()->cancelAnimations(this);
120 120
121 if (RenderView* v = view()) 121 if (RenderView* v = view())
122 v->removeWidget(this); 122 v->removeWidget(this);
123 123
124 124
125 if (AXObjectCache::accessibilityEnabled()) { 125 if (AXObjectCache::accessibilityEnabled()) {
126 document()->axObjectCache()->childrenChanged(this->parent()); 126 document()->axObjectCache()->childrenChanged(this->parent());
127 document()->axObjectCache()->remove(this); 127 document()->axObjectCache()->remove(this);
128 } 128 }
129
130 if (!documentBeingDestroyed() && parent())
131 parent()->dirtyLinesFromChangedChild(this);
132
129 remove(); 133 remove();
130 134
131 if (m_hasCounterNodeMap) 135 if (m_hasCounterNodeMap)
132 RenderCounter::destroyCounterNodes(this); 136 RenderCounter::destroyCounterNodes(this);
133 137
134 setWidget(0); 138 setWidget(0);
135 139
136 // removes from override size map 140 // removes from override size map
137 if (hasOverrideSize()) 141 if (hasOverrideSize())
138 setOverrideSize(-1); 142 setOverrideSize(-1);
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 bool hadResult = result.innerNode(); 400 bool hadResult = result.innerNode();
397 bool inside = RenderReplaced::nodeAtPoint(request, result, pointInContainer, tx, ty, action); 401 bool inside = RenderReplaced::nodeAtPoint(request, result, pointInContainer, tx, ty, action);
398 402
399 // Check to see if we are really over the widget itself (and not just in the border/padding area). 403 // Check to see if we are really over the widget itself (and not just in the border/padding area).
400 if ((inside || result.isRectBasedTest()) && !hadResult && result.innerNode() == node()) 404 if ((inside || result.isRectBasedTest()) && !hadResult && result.innerNode() == node())
401 result.setIsOverWidget(contentBoxRect().contains(result.localPoint())); 405 result.setIsOverWidget(contentBoxRect().contains(result.localPoint()));
402 return inside; 406 return inside;
403 } 407 }
404 408
405 } // namespace WebCore 409 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderReplaced.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698