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

Side by Side Diff: Source/core/dom/Element.cpp

Issue 16951003: Fix broken AttachContext from r152289 (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Final patch Created 7 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2001 Peter Kelly (pmk@post.com) 4 * (C) 2001 Peter Kelly (pmk@post.com)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * (C) 2007 David Smith (catfish.man@gmail.com) 6 * (C) 2007 David Smith (catfish.man@gmail.com)
7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved. 7 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
8 * (C) 2007 Eric Seidel (eric@webkit.org) 8 * (C) 2007 Eric Seidel (eric@webkit.org)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 1262 matching lines...) Expand 10 before | Expand all | Expand 10 after
1273 createRendererIfNeeded(context); 1273 createRendererIfNeeded(context);
1274 1274
1275 if (parentElement() && parentElement()->isInCanvasSubtree()) 1275 if (parentElement() && parentElement()->isInCanvasSubtree())
1276 setIsInCanvasSubtree(true); 1276 setIsInCanvasSubtree(true);
1277 1277
1278 createPseudoElementIfNeeded(BEFORE); 1278 createPseudoElementIfNeeded(BEFORE);
1279 1279
1280 // When a shadow root exists, it does the work of attaching the children. 1280 // When a shadow root exists, it does the work of attaching the children.
1281 if (ElementShadow* shadow = this->shadow()) { 1281 if (ElementShadow* shadow = this->shadow()) {
1282 parentPusher.push(); 1282 parentPusher.push();
1283 shadow->attach(); 1283 shadow->attach(context);
1284 } else if (firstChild()) 1284 } else if (firstChild())
1285 parentPusher.push(); 1285 parentPusher.push();
1286 1286
1287 ContainerNode::attach(context); 1287 ContainerNode::attach(context);
1288 1288
1289 createPseudoElementIfNeeded(AFTER); 1289 createPseudoElementIfNeeded(AFTER);
1290 1290
1291 if (hasRareData()) { 1291 if (hasRareData()) {
1292 ElementRareData* data = elementRareData(); 1292 ElementRareData* data = elementRareData();
1293 if (data->needsFocusAppearanceUpdateSoonAfterAttach()) { 1293 if (data->needsFocusAppearanceUpdateSoonAfterAttach()) {
(...skipping 18 matching lines...) Expand all
1312 if (hasRareData()) { 1312 if (hasRareData()) {
1313 ElementRareData* data = elementRareData(); 1313 ElementRareData* data = elementRareData();
1314 data->setPseudoElement(BEFORE, 0); 1314 data->setPseudoElement(BEFORE, 0);
1315 data->setPseudoElement(AFTER, 0); 1315 data->setPseudoElement(AFTER, 0);
1316 data->setIsInCanvasSubtree(false); 1316 data->setIsInCanvasSubtree(false);
1317 data->resetComputedStyle(); 1317 data->resetComputedStyle();
1318 data->resetDynamicRestyleObservations(); 1318 data->resetDynamicRestyleObservations();
1319 } 1319 }
1320 1320
1321 if (ElementShadow* shadow = this->shadow()) { 1321 if (ElementShadow* shadow = this->shadow()) {
1322 detachChildrenIfNeeded(); 1322 detachChildrenIfNeeded(context);
1323 shadow->detach(); 1323 shadow->detach(context);
1324 } 1324 }
1325 ContainerNode::detach(context); 1325 ContainerNode::detach(context);
1326 } 1326 }
1327 1327
1328 bool Element::pseudoStyleCacheIsInvalid(const RenderStyle* currentStyle, RenderS tyle* newStyle) 1328 bool Element::pseudoStyleCacheIsInvalid(const RenderStyle* currentStyle, RenderS tyle* newStyle)
1329 { 1329 {
1330 ASSERT(currentStyle == renderStyle()); 1330 ASSERT(currentStyle == renderStyle());
1331 ASSERT(renderer()); 1331 ASSERT(renderer());
1332 1332
1333 if (!currentStyle) 1333 if (!currentStyle)
(...skipping 1780 matching lines...) Expand 10 before | Expand all | Expand 10 after
3114 return 0; 3114 return 0;
3115 } 3115 }
3116 3116
3117 Attribute* UniqueElementData::attributeItem(unsigned index) 3117 Attribute* UniqueElementData::attributeItem(unsigned index)
3118 { 3118 {
3119 ASSERT_WITH_SECURITY_IMPLICATION(index < length()); 3119 ASSERT_WITH_SECURITY_IMPLICATION(index < length());
3120 return &m_attributeVector.at(index); 3120 return &m_attributeVector.at(index);
3121 } 3121 }
3122 3122
3123 } // namespace WebCore 3123 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698