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

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: Rebase 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 1491 matching lines...) Expand 10 before | Expand all | Expand 10 after
1502 // non-floating we have to take it into account for the first letter. 1502 // non-floating we have to take it into account for the first letter.
1503 updatePseudoElement(FIRST_LETTER, childNeedsStyleRecalc() ? Force : chan ge); 1503 updatePseudoElement(FIRST_LETTER, childNeedsStyleRecalc() ? Force : chan ge);
1504 1504
1505 clearChildNeedsStyleRecalc(); 1505 clearChildNeedsStyleRecalc();
1506 } 1506 }
1507 1507
1508 if (hasCustomStyleCallbacks()) 1508 if (hasCustomStyleCallbacks())
1509 didRecalcStyle(change); 1509 didRecalcStyle(change);
1510 1510
1511 if (change == Reattach) 1511 if (change == Reattach)
1512 reattachWhitespaceSiblings(nextTextSibling); 1512 reattachWhitespaceSiblingsIfNeeded(nextTextSibling);
1513 } 1513 }
1514 1514
1515 StyleRecalcChange Element::recalcOwnStyle(StyleRecalcChange change) 1515 StyleRecalcChange Element::recalcOwnStyle(StyleRecalcChange change)
1516 { 1516 {
1517 ASSERT(document().inStyleRecalc()); 1517 ASSERT(document().inStyleRecalc());
1518 ASSERT(!parentOrShadowHostNode()->needsStyleRecalc()); 1518 ASSERT(!parentOrShadowHostNode()->needsStyleRecalc());
1519 ASSERT(change >= Inherit || needsStyleRecalc()); 1519 ASSERT(change >= Inherit || needsStyleRecalc());
1520 ASSERT(parentRenderStyle()); 1520 ASSERT(parentRenderStyle());
1521 1521
1522 RefPtr<RenderStyle> oldStyle = renderStyle(); 1522 RefPtr<RenderStyle> oldStyle = renderStyle();
(...skipping 1772 matching lines...) Expand 10 before | Expand all | Expand 10 after
3295 return wrapper; 3295 return wrapper;
3296 3296
3297 CustomElementBinding* binding = perContextData->customElementBinding(customE lementDefinition()); 3297 CustomElementBinding* binding = perContextData->customElementBinding(customE lementDefinition());
3298 3298
3299 wrapper->SetPrototype(binding->prototype()); 3299 wrapper->SetPrototype(binding->prototype());
3300 3300
3301 return V8DOMWrapper::associateObjectWithWrapper(isolate, this, wrapperType, wrapper); 3301 return V8DOMWrapper::associateObjectWithWrapper(isolate, this, wrapperType, wrapper);
3302 } 3302 }
3303 3303
3304 } // namespace blink 3304 } // namespace blink
OLDNEW
« no previous file with comments | « LayoutTests/fast/repaint/absolute-display-block-to-none-expected.txt ('k') | Source/core/dom/Node.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698