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

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 1504 matching lines...) Expand 10 before | Expand all | Expand 10 after
1515 updatePseudoElement(AFTER, change); 1515 updatePseudoElement(AFTER, change);
1516 updatePseudoElement(BACKDROP, change); 1516 updatePseudoElement(BACKDROP, change);
1517 1517
1518 clearChildNeedsStyleRecalc(); 1518 clearChildNeedsStyleRecalc();
1519 } 1519 }
1520 1520
1521 if (hasCustomStyleCallbacks()) 1521 if (hasCustomStyleCallbacks())
1522 didRecalcStyle(change); 1522 didRecalcStyle(change);
1523 1523
1524 if (change == Reattach) 1524 if (change == Reattach)
1525 reattachWhitespaceSiblings(nextTextSibling); 1525 reattachWhitespaceSiblingsIfNeeded(nextTextSibling);
1526 } 1526 }
1527 1527
1528 StyleRecalcChange Element::recalcOwnStyle(StyleRecalcChange change) 1528 StyleRecalcChange Element::recalcOwnStyle(StyleRecalcChange change)
1529 { 1529 {
1530 ASSERT(document().inStyleRecalc()); 1530 ASSERT(document().inStyleRecalc());
1531 ASSERT(!parentOrShadowHostNode()->needsStyleRecalc()); 1531 ASSERT(!parentOrShadowHostNode()->needsStyleRecalc());
1532 ASSERT(change >= Inherit || needsStyleRecalc()); 1532 ASSERT(change >= Inherit || needsStyleRecalc());
1533 ASSERT(parentRenderStyle()); 1533 ASSERT(parentRenderStyle());
1534 1534
1535 RefPtr<RenderStyle> oldStyle = renderStyle(); 1535 RefPtr<RenderStyle> oldStyle = renderStyle();
(...skipping 1734 matching lines...) Expand 10 before | Expand all | Expand 10 after
3270 return wrapper; 3270 return wrapper;
3271 3271
3272 CustomElementBinding* binding = perContextData->customElementBinding(customE lementDefinition()); 3272 CustomElementBinding* binding = perContextData->customElementBinding(customE lementDefinition());
3273 3273
3274 wrapper->SetPrototype(binding->prototype()); 3274 wrapper->SetPrototype(binding->prototype());
3275 3275
3276 return V8DOMWrapper::associateObjectWithWrapperNonTemplate(this, wrapperType , wrapper, isolate); 3276 return V8DOMWrapper::associateObjectWithWrapperNonTemplate(this, wrapperType , wrapper, isolate);
3277 } 3277 }
3278 3278
3279 } // namespace blink 3279 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698