(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 030c5f6a111f4eea8be10ceabe9a194324aed8fe..f62e0e5f5cd5bcb3a11674399fb9b8fd2fc03712 100644
--- a/Source/core/frame/FrameView.cpp
+++ b/Source/core/frame/FrameView.cpp
@@ -587,9 +587,13 @@ 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)) {
+    const HTMLFrameOwnerElement* ownerElement = m_frame->deprecatedLocalOwner();
+    if (ownerElement && (ownerElement->scrollingMode() == ScrollbarAlwaysOff)) {
+        hMode = ScrollbarAlwaysOff;
+        vMode = ScrollbarAlwaysOff;
+        return;
+    }
+    if (!ownerElement && m_frame->owner() && (m_frame->owner()->scrollingMode() == ScrollbarAlwaysOff)) {
         hMode = ScrollbarAlwaysOff;
         vMode = ScrollbarAlwaysOff;
         return;