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

Side by Side Diff: Source/WebCore/dom/Node.cpp

Issue 9546037: Merge 107622 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 9 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 Dirk Mueller (mueller@kde.org) 4 * (C) 2001 Dirk Mueller (mueller@kde.org)
5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 6 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 7 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 344 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 // When text-combine property has been changed, we need to prepare a separat e renderer object. 355 // When text-combine property has been changed, we need to prepare a separat e renderer object.
356 // When text-combine is on, we use RenderCombineText, otherwise RenderText. 356 // When text-combine is on, we use RenderCombineText, otherwise RenderText.
357 // https://bugs.webkit.org/show_bug.cgi?id=55069 357 // https://bugs.webkit.org/show_bug.cgi?id=55069
358 if ((s1 && s2) && (s1->hasTextCombine() != s2->hasTextCombine())) 358 if ((s1 && s2) && (s1->hasTextCombine() != s2->hasTextCombine()))
359 ch = Detach; 359 ch = Detach;
360 360
361 // We need to reattach the node, so that it is moved to the correct RenderFl owThread. 361 // We need to reattach the node, so that it is moved to the correct RenderFl owThread.
362 if ((s1 && s2) && (s1->flowThread() != s2->flowThread())) 362 if ((s1 && s2) && (s1->flowThread() != s2->flowThread()))
363 ch = Detach; 363 ch = Detach;
364 364
365 // When either the region thread or the region index has changed, 365 // When the region thread has changed, we need to prepare a separate render region object.
366 // we need to prepare a separate render region object.
367 if ((s1 && s2) && (s1->regionThread() != s2->regionThread())) 366 if ((s1 && s2) && (s1->regionThread() != s2->regionThread()))
368 ch = Detach; 367 ch = Detach;
369 368
370 return ch; 369 return ch;
371 } 370 }
372 371
373 void Node::trackForDebugging() 372 void Node::trackForDebugging()
374 { 373 {
375 #ifndef NDEBUG 374 #ifndef NDEBUG
376 if (shouldIgnoreLeaks) 375 if (shouldIgnoreLeaks)
(...skipping 2581 matching lines...) Expand 10 before | Expand all | Expand 10 after
2958 2957
2959 #ifndef NDEBUG 2958 #ifndef NDEBUG
2960 2959
2961 void showTree(const WebCore::Node* node) 2960 void showTree(const WebCore::Node* node)
2962 { 2961 {
2963 if (node) 2962 if (node)
2964 node->showTreeForThis(); 2963 node->showTreeForThis();
2965 } 2964 }
2966 2965
2967 #endif 2966 #endif
OLDNEW
« no previous file with comments | « LayoutTests/fast/regions/set-box-style-in-region-crash-expected.txt ('k') | Source/WebCore/rendering/RenderBlock.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698