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

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: Fixed failing test (/fast/forms/file/input-file-re-render.html) 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 1296 matching lines...) Expand 10 before | Expand all | Expand 10 after
1307 createRendererIfNeeded(context); 1307 createRendererIfNeeded(context);
1308 1308
1309 if (parentElement() && parentElement()->isInCanvasSubtree()) 1309 if (parentElement() && parentElement()->isInCanvasSubtree())
1310 setIsInCanvasSubtree(true); 1310 setIsInCanvasSubtree(true);
1311 1311
1312 createPseudoElementIfNeeded(BEFORE); 1312 createPseudoElementIfNeeded(BEFORE);
1313 1313
1314 // When a shadow root exists, it does the work of attaching the children. 1314 // When a shadow root exists, it does the work of attaching the children.
1315 if (ElementShadow* shadow = this->shadow()) { 1315 if (ElementShadow* shadow = this->shadow()) {
1316 parentPusher.push(); 1316 parentPusher.push();
1317 shadow->attach(); 1317 shadow->attach(context);
1318 } else if (firstChild()) 1318 } else if (firstChild())
1319 parentPusher.push(); 1319 parentPusher.push();
1320 1320
1321 ContainerNode::attach(context); 1321 ContainerNode::attach(context);
1322 1322
1323 createPseudoElementIfNeeded(AFTER); 1323 createPseudoElementIfNeeded(AFTER);
1324 1324
1325 if (hasRareData()) { 1325 if (hasRareData()) {
1326 ElementRareData* data = elementRareData(); 1326 ElementRareData* data = elementRareData();
1327 if (data->needsFocusAppearanceUpdateSoonAfterAttach()) { 1327 if (data->needsFocusAppearanceUpdateSoonAfterAttach()) {
(...skipping 18 matching lines...) Expand all
1346 if (hasRareData()) { 1346 if (hasRareData()) {
1347 ElementRareData* data = elementRareData(); 1347 ElementRareData* data = elementRareData();
1348 data->setPseudoElement(BEFORE, 0); 1348 data->setPseudoElement(BEFORE, 0);
1349 data->setPseudoElement(AFTER, 0); 1349 data->setPseudoElement(AFTER, 0);
1350 data->setIsInCanvasSubtree(false); 1350 data->setIsInCanvasSubtree(false);
1351 data->resetComputedStyle(); 1351 data->resetComputedStyle();
1352 data->resetDynamicRestyleObservations(); 1352 data->resetDynamicRestyleObservations();
1353 } 1353 }
1354 1354
1355 if (ElementShadow* shadow = this->shadow()) { 1355 if (ElementShadow* shadow = this->shadow()) {
1356 detachChildrenIfNeeded(); 1356 detachChildrenIfNeeded(context);
1357 shadow->detach(); 1357 shadow->detach(context);
1358 } 1358 }
1359 ContainerNode::detach(context); 1359 ContainerNode::detach(context);
1360 } 1360 }
1361 1361
1362 bool Element::pseudoStyleCacheIsInvalid(const RenderStyle* currentStyle, RenderS tyle* newStyle) 1362 bool Element::pseudoStyleCacheIsInvalid(const RenderStyle* currentStyle, RenderS tyle* newStyle)
1363 { 1363 {
1364 ASSERT(currentStyle == renderStyle()); 1364 ASSERT(currentStyle == renderStyle());
1365 ASSERT(renderer()); 1365 ASSERT(renderer());
1366 1366
1367 if (!currentStyle) 1367 if (!currentStyle)
(...skipping 1780 matching lines...) Expand 10 before | Expand all | Expand 10 after
3148 return 0; 3148 return 0;
3149 } 3149 }
3150 3150
3151 Attribute* UniqueElementData::attributeItem(unsigned index) 3151 Attribute* UniqueElementData::attributeItem(unsigned index)
3152 { 3152 {
3153 ASSERT_WITH_SECURITY_IMPLICATION(index < length()); 3153 ASSERT_WITH_SECURITY_IMPLICATION(index < length());
3154 return &m_attributeVector.at(index); 3154 return &m_attributeVector.at(index);
3155 } 3155 }
3156 3156
3157 } // namespace WebCore 3157 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698