diff options
| author | Victoria Lease <violets@google.com> | 2012-04-30 16:34:41 -0700 |
|---|---|---|
| committer | Victoria Lease <violets@google.com> | 2012-05-07 10:01:54 -0700 |
| commit | a90fcfc47657b249c6d17f6c945d75aee5f1c112 (patch) | |
| tree | c3956264263e89335b4024fc365dbfefd3d5be52 /Source/WebCore/dom | |
| parent | 2c3ac3ef31c36dba2fd46d8f94658e6d00283f9f (diff) | |
| download | external_webkit-a90fcfc47657b249c6d17f6c945d75aee5f1c112.zip external_webkit-a90fcfc47657b249c6d17f6c945d75aee5f1c112.tar.gz external_webkit-a90fcfc47657b249c6d17f6c945d75aee5f1c112.tar.bz2 | |
Cherrypick WebKit r95959.
http://trac.webkit.org/changeset/95959
This, in conjunction with WebKit r94508, addresses our issue involving
referencing deleted fonts.
Bug: 6105670
Change-Id: Ida486c92d33aee792486f49e784f64d978e2fb81
Diffstat (limited to 'Source/WebCore/dom')
| -rw-r--r-- | Source/WebCore/dom/Document.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp index e7e1124..ff50390 100644 --- a/Source/WebCore/dom/Document.cpp +++ b/Source/WebCore/dom/Document.cpp @@ -1489,8 +1489,14 @@ void Document::recalcStyle(StyleChange change) if (change >= Inherit || n->childNeedsStyleRecalc() || n->needsStyleRecalc()) n->recalcStyle(change); + // FIXME: Disabling the deletion of retired custom font data until + // we fix all the stale style bugs (68804, 68624, etc). These bugs + // indicate problems where some styles were not updated in recalcStyle, + // thereby retaining stale copy of font data. To prevent that, we + // disable this code for now and only delete retired custom font data + // in Document destructor. // Now that all RenderStyles that pointed to retired fonts have been updated, the fonts can safely be deleted. - deleteRetiredCustomFonts(); + // deleteRetiredCustomFonts(); #if USE(ACCELERATED_COMPOSITING) if (view()) { |