Title: [153796] trunk/Source/WebCore
- Revision
- 153796
- Author
- [email protected]
- Date
- 2013-08-07 12:13:29 -0700 (Wed, 07 Aug 2013)
Log Message
fast/frames/seamless/seamless-custom-font-pruning-crash.html asserts
https://bugs.webkit.org/show_bug.cgi?id=119557
Rubber-stamped by Eric Carlson.
Pass Style::Detach style change to seamless document as Style::Force. Style::resolveTree does not expect to be called with Detach.
* html/HTMLIFrameElement.cpp:
(WebCore::HTMLIFrameElement::didRecalcStyle):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (153795 => 153796)
--- trunk/Source/WebCore/ChangeLog 2013-08-07 18:40:31 UTC (rev 153795)
+++ trunk/Source/WebCore/ChangeLog 2013-08-07 19:13:29 UTC (rev 153796)
@@ -1,3 +1,15 @@
+2013-08-07 Antti Koivisto <[email protected]>
+
+ fast/frames/seamless/seamless-custom-font-pruning-crash.html asserts
+ https://bugs.webkit.org/show_bug.cgi?id=119557
+
+ Rubber-stamped by Eric Carlson.
+
+ Pass Style::Detach style change to seamless document as Style::Force. Style::resolveTree does not expect to be called with Detach.
+
+ * html/HTMLIFrameElement.cpp:
+ (WebCore::HTMLIFrameElement::didRecalcStyle):
+
2013-08-07 Andre Moreira Magalhaes <[email protected]>
Disable HTTP request "Accept-Encoding:" header field on gstreamer source element to avoid receiving the wrong size when retrieving data
Modified: trunk/Source/WebCore/html/HTMLIFrameElement.cpp (153795 => 153796)
--- trunk/Source/WebCore/html/HTMLIFrameElement.cpp 2013-08-07 18:40:31 UTC (rev 153795)
+++ trunk/Source/WebCore/html/HTMLIFrameElement.cpp 2013-08-07 19:13:29 UTC (rev 153796)
@@ -112,7 +112,7 @@
return;
Document* childDocument = contentDocument();
if (styleChange >= Style::Inherit || childDocument->childNeedsStyleRecalc() || childDocument->needsStyleRecalc())
- contentDocument()->recalcStyle(styleChange);
+ contentDocument()->recalcStyle(styleChange == Style::Detach ? Style::Force : styleChange);
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
