Title: [88472] trunk
- Revision
- 88472
- Author
- [email protected]
- Date
- 2011-06-09 12:41:10 -0700 (Thu, 09 Jun 2011)
Log Message
2011-06-09 Julien Chaffraix <[email protected]>
Reviewed by David Hyatt.
Test for chrome.dll!WebCore::RenderStyle::fontMetrics ReadAV@NULL (two crashes)
https://bugs.webkit.org/show_bug.cgi?id=57756
* fast/css/fontMetric-border-radius-null-crash-expected.txt: Added.
* fast/css/fontMetric-border-radius-null-crash.html: Added.
* fast/css/fontMetric-webkit-border-end-width-null-crash-expected.txt: Added.
* fast/css/fontMetric-webkit-border-end-width-null-crash.html: Added.
2011-06-09 Julien Chaffraix <[email protected]>
Reviewed by David Hyatt.
chrome.dll!WebCore::RenderStyle::fontMetrics ReadAV@NULL (two crashes)
https://bugs.webkit.org/show_bug.cgi?id=57756
Tests: fast/css/fontMetric-border-radius-null-crash.html
fast/css/fontMetric-webkit-border-end-width-null-crash.html
* css/CSSStyleSelector.cpp:
(WebCore::CSSStyleSelector::styleForElement): Added a call to Font::update
so that our FontFallbackList is allocated if we ever need it when applying our
style rules.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (88471 => 88472)
--- trunk/LayoutTests/ChangeLog 2011-06-09 19:30:55 UTC (rev 88471)
+++ trunk/LayoutTests/ChangeLog 2011-06-09 19:41:10 UTC (rev 88472)
@@ -1,3 +1,15 @@
+2011-06-09 Julien Chaffraix <[email protected]>
+
+ Reviewed by David Hyatt.
+
+ Test for chrome.dll!WebCore::RenderStyle::fontMetrics ReadAV@NULL (two crashes)
+ https://bugs.webkit.org/show_bug.cgi?id=57756
+
+ * fast/css/fontMetric-border-radius-null-crash-expected.txt: Added.
+ * fast/css/fontMetric-border-radius-null-crash.html: Added.
+ * fast/css/fontMetric-webkit-border-end-width-null-crash-expected.txt: Added.
+ * fast/css/fontMetric-webkit-border-end-width-null-crash.html: Added.
+
2011-06-09 Martin Robinson <[email protected]>
Reviewed by Andreas Kling.
Added: trunk/LayoutTests/fast/css/fontMetric-border-radius-null-crash-expected.txt (0 => 88472)
--- trunk/LayoutTests/fast/css/fontMetric-border-radius-null-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/fontMetric-border-radius-null-crash-expected.txt 2011-06-09 19:41:10 UTC (rev 88472)
@@ -0,0 +1,2 @@
+chrome.dll!WebCore::RenderStyle::fontMetrics ReadAV@NULL (two crashes)
+PASSED: This test did not crash!
Added: trunk/LayoutTests/fast/css/fontMetric-border-radius-null-crash.html (0 => 88472)
--- trunk/LayoutTests/fast/css/fontMetric-border-radius-null-crash.html (rev 0)
+++ trunk/LayoutTests/fast/css/fontMetric-border-radius-null-crash.html 2011-06-09 19:41:10 UTC (rev 88472)
@@ -0,0 +1,8 @@
+<script>
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+ document.writeln("<v>");
+ document.body.innerHTML="<style>*{border-radius:5ex;}</style>";
+ document.write("<title>x");
+ document.body.innerHTML = "<a href=''>chrome.dll!WebCore::RenderStyle::fontMetrics ReadAV@NULL (two crashes)<br>PASSED: This test did not crash!";
+</script>
Added: trunk/LayoutTests/fast/css/fontMetric-webkit-border-end-width-null-crash-expected.txt (0 => 88472)
--- trunk/LayoutTests/fast/css/fontMetric-webkit-border-end-width-null-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/css/fontMetric-webkit-border-end-width-null-crash-expected.txt 2011-06-09 19:41:10 UTC (rev 88472)
@@ -0,0 +1,2 @@
+chrome.dll!WebCore::RenderStyle::fontMetrics ReadAV@NULL (two crashes)
+PASSED: This test did not crash!
Added: trunk/LayoutTests/fast/css/fontMetric-webkit-border-end-width-null-crash.html (0 => 88472)
--- trunk/LayoutTests/fast/css/fontMetric-webkit-border-end-width-null-crash.html (rev 0)
+++ trunk/LayoutTests/fast/css/fontMetric-webkit-border-end-width-null-crash.html 2011-06-09 19:41:10 UTC (rev 88472)
@@ -0,0 +1,8 @@
+<script>
+ if (window.layoutTestController)
+ layoutTestController.dumpAsText();
+ document.writeln("<v>");
+ document.body.innerHTML="<style>*{-webkit-border-end-width:0ex;}</style>";
+ document.write("<title>x");
+ document.body.innerHTML = "<a href=''>chrome.dll!WebCore::RenderStyle::fontMetrics ReadAV@NULL (two crashes)<br>PASSED: This test did not crash!";
+</script>
Modified: trunk/Source/WebCore/ChangeLog (88471 => 88472)
--- trunk/Source/WebCore/ChangeLog 2011-06-09 19:30:55 UTC (rev 88471)
+++ trunk/Source/WebCore/ChangeLog 2011-06-09 19:41:10 UTC (rev 88472)
@@ -1,3 +1,18 @@
+2011-06-09 Julien Chaffraix <[email protected]>
+
+ Reviewed by David Hyatt.
+
+ chrome.dll!WebCore::RenderStyle::fontMetrics ReadAV@NULL (two crashes)
+ https://bugs.webkit.org/show_bug.cgi?id=57756
+
+ Tests: fast/css/fontMetric-border-radius-null-crash.html
+ fast/css/fontMetric-webkit-border-end-width-null-crash.html
+
+ * css/CSSStyleSelector.cpp:
+ (WebCore::CSSStyleSelector::styleForElement): Added a call to Font::update
+ so that our FontFallbackList is allocated if we ever need it when applying our
+ style rules.
+
2011-06-09 Cary Clark <[email protected]>
Reviewed by Eric Seidel.
Modified: trunk/Source/WebCore/css/CSSStyleSelector.cpp (88471 => 88472)
--- trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-06-09 19:30:55 UTC (rev 88471)
+++ trunk/Source/WebCore/css/CSSStyleSelector.cpp 2011-06-09 19:41:10 UTC (rev 88472)
@@ -1317,8 +1317,11 @@
if (m_parentStyle)
m_style->inheritFrom(m_parentStyle);
- else
+ else {
m_parentStyle = style();
+ // Make sure our fonts are initialized if we don't inherit them from our parent style.
+ m_style->font().update(0);
+ }
if (e->isLink()) {
m_style->setIsLink(true);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
