Title: [100571] branches/chromium/912
- Revision
- 100571
- Author
- [email protected]
- Date
- 2011-11-17 00:10:07 -0800 (Thu, 17 Nov 2011)
Log Message
Revert 100566 - Merge 99649
BUG=102037
Review URL: http://codereview.chromium.org/8587026
Modified Paths
Removed Paths
Diff
Deleted: branches/chromium/912/LayoutTests/fast/css/css-fontface-rule-crash-expected.txt (100570 => 100571)
--- branches/chromium/912/LayoutTests/fast/css/css-fontface-rule-crash-expected.txt 2011-11-17 08:08:31 UTC (rev 100570)
+++ branches/chromium/912/LayoutTests/fast/css/css-fontface-rule-crash-expected.txt 2011-11-17 08:10:07 UTC (rev 100571)
@@ -1 +0,0 @@
-PASS
Deleted: branches/chromium/912/LayoutTests/fast/css/css-fontface-rule-crash.html (100570 => 100571)
--- branches/chromium/912/LayoutTests/fast/css/css-fontface-rule-crash.html 2011-11-17 08:08:31 UTC (rev 100570)
+++ branches/chromium/912/LayoutTests/fast/css/css-fontface-rule-crash.html 2011-11-17 08:10:07 UTC (rev 100571)
@@ -1,37 +0,0 @@
-<html>
-<head>
-<script src=""
-<script>
-if (window.layoutTestController) {
- layoutTestController.dumpAsText();
- layoutTestController.waitUntilDone();
-}
-
-function load()
-{
- style = document.createElement('style');
- style.textContent = '@font-face { font-family: "A"; }';
- document.head.appendChild(style);
- rulestyle = document.styleSheets[0].cssRules[0].style;
- document.head.removeChild(style);
- style = null;
- setTimeout(crash, 0);
-}
-
-function crash()
-{
- gc();
- obj = rulestyle.parentRule;
- // If the gc() actually successfully reaps everything it can, then obj
- // will end up null (post-fix). gc() is not guaranteed to reap the font-face
- // rule, however, particularly in the browser context.
- if (obj)
- obj = obj.foo;
- document.body.innerText = 'PASS';
- if (window.layoutTestController)
- layoutTestController.notifyDone()
-}
-</script>
-</head>
-<body _onload_="load()"></body>
-</html>
Deleted: branches/chromium/912/LayoutTests/resources/gc.js (100570 => 100571)
--- branches/chromium/912/LayoutTests/resources/gc.js 2011-11-17 08:08:31 UTC (rev 100570)
+++ branches/chromium/912/LayoutTests/resources/gc.js 2011-11-17 08:10:07 UTC (rev 100571)
@@ -1,20 +0,0 @@
-// If there is no window.gc() already defined, define one using the best
-// method we can find.
-// The slow fallback should not hit in the actual test environment.
-if (!window.gc)
-{
- window.gc = function()
- {
- if (window.GCController)
- return GCController.collect();
- function gcRec(n) {
- if (n < 1)
- return {};
- var temp = {i: "ab" + i + (i / 100000)};
- temp += "foo";
- gcRec(n-1);
- }
- for (var i = 0; i < 10000; i++)
- gcRec(10);
- }
-}
Modified: branches/chromium/912/Source/WebCore/css/CSSFontFaceRule.cpp (100570 => 100571)
--- branches/chromium/912/Source/WebCore/css/CSSFontFaceRule.cpp 2011-11-17 08:08:31 UTC (rev 100570)
+++ branches/chromium/912/Source/WebCore/css/CSSFontFaceRule.cpp 2011-11-17 08:10:07 UTC (rev 100571)
@@ -33,8 +33,6 @@
CSSFontFaceRule::~CSSFontFaceRule()
{
- if (m_style)
- m_style->setParentRule(0);
}
void CSSFontFaceRule::setDeclaration(PassRefPtr<CSSMutableStyleDeclaration> style)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
