Index: Source/core/css/resolver/StyleResolver.cpp |
diff --git a/Source/core/css/resolver/StyleResolver.cpp b/Source/core/css/resolver/StyleResolver.cpp |
index eeaac0a9ae34a938d36d89f7e57ee922f0f1d550..318b47d4447f3fad0bb0ab3393ebecaa73b9451d 100644 |
--- a/Source/core/css/resolver/StyleResolver.cpp |
+++ b/Source/core/css/resolver/StyleResolver.cpp |
@@ -583,25 +583,12 @@ PassRefPtr<RenderStyle> StyleResolver::styleForDocument(Document& document, CSSF |
{ |
const Frame* frame = document.frame(); |
- // HTML5 states that seamless iframes should replace default CSS values |
- // with values inherited from the containing iframe element. However, |
- // some values (such as the case of designMode = "on") still need to |
- // be set by this "document style". |
RefPtr<RenderStyle> documentStyle = RenderStyle::create(); |
- bool seamlessWithParent = document.shouldDisplaySeamlesslyWithParent(); |
- if (seamlessWithParent) { |
- RenderStyle* iframeStyle = document.seamlessParentIFrame()->renderStyle(); |
- if (iframeStyle) |
- documentStyle->inheritFrom(iframeStyle); |
- } |
- |
- // FIXME: It's not clear which values below we want to override in the seamless case! |
documentStyle->setDisplay(BLOCK); |
- if (!seamlessWithParent) { |
- documentStyle->setRTLOrdering(document.visuallyOrdered() ? VisualOrder : LogicalOrder); |
- documentStyle->setZoom(frame && !document.printing() ? frame->pageZoomFactor() : 1); |
- documentStyle->setLocale(document.contentLanguage()); |
- } |
+ documentStyle->setRTLOrdering(document.visuallyOrdered() ? VisualOrder : LogicalOrder); |
+ documentStyle->setZoom(frame && !document.printing() ? frame->pageZoomFactor() : 1); |
+ documentStyle->setLocale(document.contentLanguage()); |
+ |
// This overrides any -webkit-user-modify inherited from the parent iframe. |
documentStyle->setUserModify(document.inDesignMode() ? READ_WRITE : READ_ONLY); |