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

Side by Side Diff: Source/WebCore/rendering/RenderObject.cpp

Issue 9968048: Merge 112200 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1025/
Patch Set: Created 8 years, 8 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) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
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 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 else { 322 else {
323 table = createAnonymousTable(); 323 table = createAnonymousTable();
324 addChild(table, beforeChild); 324 addChild(table, beforeChild);
325 } 325 }
326 table->addChild(newChild); 326 table->addChild(newChild);
327 } else { 327 } else {
328 // Just add it... 328 // Just add it...
329 children->insertChildNode(this, newChild, beforeChild); 329 children->insertChildNode(this, newChild, beforeChild);
330 } 330 }
331 331
332 if (newChild->isText() && newChild->style()->textTransform() == CAPITALIZE) { 332 if (newChild->isText() && newChild->style()->textTransform() == CAPITALIZE)
333 RefPtr<StringImpl> textToTransform = toRenderText(newChild)->originalTex t(); 333 toRenderText(newChild)->transformText();
334 if (textToTransform)
335 toRenderText(newChild)->setText(textToTransform.release(), true);
336 }
337 334
338 if (beforeChildHasBeforeAndAfterContent) 335 if (beforeChildHasBeforeAndAfterContent)
339 children->updateBeforeAfterContent(this, BEFORE); 336 children->updateBeforeAfterContent(this, BEFORE);
340 } 337 }
341 338
342 void RenderObject::removeChild(RenderObject* oldChild) 339 void RenderObject::removeChild(RenderObject* oldChild)
343 { 340 {
344 RenderObjectChildList* children = virtualChildren(); 341 RenderObjectChildList* children = virtualChildren();
345 ASSERT(children); 342 ASSERT(children);
346 if (!children) 343 if (!children)
(...skipping 2527 matching lines...) Expand 10 before | Expand all | Expand 10 after
2874 { 2871 {
2875 if (object1) { 2872 if (object1) {
2876 const WebCore::RenderObject* root = object1; 2873 const WebCore::RenderObject* root = object1;
2877 while (root->parent()) 2874 while (root->parent())
2878 root = root->parent(); 2875 root = root->parent();
2879 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 2876 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
2880 } 2877 }
2881 } 2878 }
2882 2879
2883 #endif 2880 #endif
OLDNEW
« no previous file with comments | « LayoutTests/fast/css/first-letter-capitalized-edit-select-crash-expected.txt ('k') | Source/WebCore/rendering/RenderText.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698