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

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

Issue 12703031: Revert 146726 "AXObjectCache gets recreated during document tear..." (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1453/
Patch Set: Created 7 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 * (C) 1999 Lars Knoll (knoll@kde.org) 2 * (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Dirk Mueller (mueller@kde.org) 3 * (C) 2000 Dirk Mueller (mueller@kde.org)
4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved. 4 * Copyright (C) 2004, 2005, 2006, 2007 Apple Inc. All rights reserved.
5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net) 5 * Copyright (C) 2006 Andrew Wellington (proton@wiretapped.net)
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 1447 matching lines...) Expand 10 before | Expand all | Expand 10 after
1458 { 1458 {
1459 ASSERT(text); 1459 ASSERT(text);
1460 1460
1461 if (!force && equal(m_text.impl(), text.get())) 1461 if (!force && equal(m_text.impl(), text.get()))
1462 return; 1462 return;
1463 1463
1464 setTextInternal(text); 1464 setTextInternal(text);
1465 setNeedsLayoutAndPrefWidthsRecalc(); 1465 setNeedsLayoutAndPrefWidthsRecalc();
1466 m_knownToHaveNoOverflowAndNoFallbackFonts = false; 1466 m_knownToHaveNoOverflowAndNoFallbackFonts = false;
1467 1467
1468 if (AXObjectCache* cache = document()->existingAXObjectCache()) 1468 AXObjectCache* axObjectCache = document()->axObjectCache();
1469 cache->textChanged(this); 1469 if (axObjectCache->accessibilityEnabled())
1470 axObjectCache->textChanged(this);
1470 } 1471 }
1471 1472
1472 String RenderText::textWithoutTranscoding() const 1473 String RenderText::textWithoutTranscoding() const
1473 { 1474 {
1474 // If m_text isn't transcoded or is secure, we can just return the modified text. 1475 // If m_text isn't transcoded or is secure, we can just return the modified text.
1475 if (!m_needsTranscoding || style()->textSecurity() != TSNONE) 1476 if (!m_needsTranscoding || style()->textSecurity() != TSNONE)
1476 return text(); 1477 return text();
1477 1478
1478 // Otherwise, we should use original text. If text-transform is 1479 // Otherwise, we should use original text. If text-transform is
1479 // specified, we should transform the text on the fly. 1480 // specified, we should transform the text on the fly.
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
1933 void RenderText::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const 1934 void RenderText::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
1934 { 1935 {
1935 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ; 1936 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ;
1936 RenderObject::reportMemoryUsage(memoryObjectInfo); 1937 RenderObject::reportMemoryUsage(memoryObjectInfo);
1937 info.addMember(m_text, "text"); 1938 info.addMember(m_text, "text");
1938 info.addMember(m_firstTextBox, "firstTextBox"); 1939 info.addMember(m_firstTextBox, "firstTextBox");
1939 info.addMember(m_lastTextBox, "lastTextBox"); 1940 info.addMember(m_lastTextBox, "lastTextBox");
1940 } 1941 }
1941 1942
1942 } // namespace WebCore 1943 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/WebCore/rendering/RenderObjectChildList.cpp ('k') | Source/WebCore/rendering/RenderWidget.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698