Title: [104077] branches/safari-534.54-branch
Diff
Modified: branches/safari-534.54-branch/LayoutTests/ChangeLog (104076 => 104077)
--- branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-04 22:34:52 UTC (rev 104076)
+++ branches/safari-534.54-branch/LayoutTests/ChangeLog 2012-01-04 22:37:51 UTC (rev 104077)
@@ -1,5 +1,20 @@
2011-1-4 Lucas Forschler <[email protected]>
+ Merge 95959
+
+ 2011-09-26 Abhishek Arya <[email protected]>
+
+ Delete retired custom font data only on document
+ destruction, and not on recalc style.
+ https://bugs.webkit.org/show_bug.cgi?id=68805
+
+ Reviewed by Dave Hyatt.
+
+ * fast/text/custom-font-data-crash-expected.txt: Added.
+ * fast/text/custom-font-data-crash.html: Added.
+
+2011-1-4 Lucas Forschler <[email protected]>
+
Merge 95926
2011-09-25 Dan Bernstein <[email protected]>
Copied: branches/safari-534.54-branch/LayoutTests/fast/text/custom-font-data-crash-expected.txt (from rev 95959, trunk/LayoutTests/fast/text/custom-font-data-crash-expected.txt) (0 => 104077)
--- branches/safari-534.54-branch/LayoutTests/fast/text/custom-font-data-crash-expected.txt (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/fast/text/custom-font-data-crash-expected.txt 2012-01-04 22:37:51 UTC (rev 104077)
@@ -0,0 +1,2 @@
+PASS
+
Copied: branches/safari-534.54-branch/LayoutTests/fast/text/custom-font-data-crash.html (from rev 95959, trunk/LayoutTests/fast/text/custom-font-data-crash.html) (0 => 104077)
--- branches/safari-534.54-branch/LayoutTests/fast/text/custom-font-data-crash.html (rev 0)
+++ branches/safari-534.54-branch/LayoutTests/fast/text/custom-font-data-crash.html 2012-01-04 22:37:51 UTC (rev 104077)
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<body style="font: 1px ahem;">
+<script>
+if (window.layoutTestController) {
+ layoutTestController.dumpAsText();
+ layoutTestController.waitUntilDone();
+}
+
+setTimeout("if (window.layoutTestController) { layoutTestController.notifyDone(); }", 50);
+</script>
+<style>
+@font-face { font-family: "A"; src: url(); }
+* { font-family: A; }
+</style>
+<nobr><table><hr>PASS
+</body>
+</html>
\ No newline at end of file
Modified: branches/safari-534.54-branch/Source/WebCore/ChangeLog (104076 => 104077)
--- branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-04 22:34:52 UTC (rev 104076)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog 2012-01-04 22:37:51 UTC (rev 104077)
@@ -1,5 +1,22 @@
2011-1-4 Lucas Forschler <[email protected]>
+ Merge 95959
+
+ 2011-09-26 Abhishek Arya <[email protected]>
+
+ Delete retired custom font data only on document
+ destruction, and not on recalc style.
+ https://bugs.webkit.org/show_bug.cgi?id=68805
+
+ Reviewed by Dave Hyatt.
+
+ Test: fast/text/custom-font-data-crash.html
+
+ * dom/Document.cpp:
+ (WebCore::Document::recalcStyle):
+
+2011-1-4 Lucas Forschler <[email protected]>
+
Merge 95926
2011-09-25 Dan Bernstein <[email protected]>
Modified: branches/safari-534.54-branch/Source/WebCore/dom/Document.cpp (104076 => 104077)
--- branches/safari-534.54-branch/Source/WebCore/dom/Document.cpp 2012-01-04 22:34:52 UTC (rev 104076)
+++ branches/safari-534.54-branch/Source/WebCore/dom/Document.cpp 2012-01-04 22:37:51 UTC (rev 104077)
@@ -1528,8 +1528,14 @@
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()) {
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
