(blink) Propagate scrolling/marginwidth/marginheight property values to child frame.

Source/core/frame/FrameView.cpp

Index: Source/core/frame/FrameView.cpp
diff --git a/Source/core/frame/FrameView.cpp b/Source/core/frame/FrameView.cpp
index a956cd4ee393e62f18998302b8d94965cdf65e8a..5f40a693d7bdbb67b448efee63f4cabdb621b6b6 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -234,13 +234,8 @@ void FrameView::init()
     m_size = LayoutSize();
 
     // Propagate the marginwidth/height and scrolling modes to the view.
-    // FIXME: Do we need to do this for OOPI?
-    Element* ownerElement = m_frame->deprecatedLocalOwner();
-    if (ownerElement && (isHTMLFrameElement(*ownerElement) || isHTMLIFrameElement(*ownerElement))) {
-        HTMLFrameElementBase* frameElt = toHTMLFrameElementBase(ownerElement);
-        if (frameElt->scrollingMode() == ScrollbarAlwaysOff)
-            setCanHaveScrollbars(false);
-    }
+    if (m_frame->owner() && m_frame->owner()->scrollingMode() == ScrollbarAlwaysOff)
+        setCanHaveScrollbars(false);
 }
 
 void FrameView::dispose()
@@ -588,9 +583,7 @@ void FrameView::applyOverflowToViewport(LayoutObject* o, ScrollbarMode& hMode, S
 
 void FrameView::calculateScrollbarModesForLayout(ScrollbarMode& hMode, ScrollbarMode& vMode, ScrollbarModesCalculationStrategy strategy)
 {
-    // FIXME: How do we handle this for OOPI?
-    const HTMLFrameOwnerElement* owner = m_frame->deprecatedLocalOwner();
-    if (owner && (owner->scrollingMode() == ScrollbarAlwaysOff)) {
+    if (m_frame->owner() && m_frame->owner()->scrollingMode() == ScrollbarAlwaysOff) {
         hMode = ScrollbarAlwaysOff;
         vMode = ScrollbarAlwaysOff;
         return;