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

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

Issue 684633006: Reattach whitespace siblings only when needed (Closed) Base URL: svn://svn.chromium.org/blink/trunk
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 | Annotate | Revision Log
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 1505 matching lines...) Expand 10 before | Expand all | Expand 10 after
1516 updatePseudoElement(AFTER, change); 1516 updatePseudoElement(AFTER, change);
1517 updatePseudoElement(BACKDROP, change); 1517 updatePseudoElement(BACKDROP, change);
1518 1518
1519 clearChildNeedsStyleRecalc(); 1519 clearChildNeedsStyleRecalc();
1520 } 1520 }
1521 1521
1522 if (hasCustomStyleCallbacks()) 1522 if (hasCustomStyleCallbacks())
1523 didRecalcStyle(change); 1523 didRecalcStyle(change);
1524 1524
1525 if (change == Reattach) 1525 if (change == Reattach)
1526 reattachWhitespaceSiblings(nextTextSibling); 1526 reattachWhitespaceSiblingsIfNeeded(nextTextSibling);
1527 } 1527 }
1528 1528
1529 StyleRecalcChange Element::recalcOwnStyle(StyleRecalcChange change) 1529 StyleRecalcChange Element::recalcOwnStyle(StyleRecalcChange change)
1530 { 1530 {
1531 ASSERT(document().inStyleRecalc()); 1531 ASSERT(document().inStyleRecalc());
1532 ASSERT(!parentOrShadowHostNode()->needsStyleRecalc()); 1532 ASSERT(!parentOrShadowHostNode()->needsStyleRecalc());
1533 ASSERT(change >= Inherit || needsStyleRecalc()); 1533 ASSERT(change >= Inherit || needsStyleRecalc());
1534 ASSERT(parentRenderStyle()); 1534 ASSERT(parentRenderStyle());
1535 1535
1536 RefPtr<RenderStyle> oldStyle = renderStyle(); 1536 RefPtr<RenderStyle> oldStyle = renderStyle();
(...skipping 1734 matching lines...) Expand 10 before | Expand all | Expand 10 after
3271 return wrapper; 3271 return wrapper;
3272 3272
3273 CustomElementBinding* binding = perContextData->customElementBinding(customE lementDefinition()); 3273 CustomElementBinding* binding = perContextData->customElementBinding(customE lementDefinition());
3274 3274
3275 wrapper->SetPrototype(binding->prototype()); 3275 wrapper->SetPrototype(binding->prototype());
3276 3276
3277 return V8DOMWrapper::associateObjectWithWrapperNonTemplate(isolate, this, wr apperType, wrapper); 3277 return V8DOMWrapper::associateObjectWithWrapperNonTemplate(isolate, this, wr apperType, wrapper);
3278 } 3278 }
3279 3279
3280 } // namespace blink 3280 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698