Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(700)

Unified Diff: third_party/WebKit/Source/core/frame/LocalFrame.cpp

Issue 1307013004: Propagate scrolling/marginwidth/marginheight property values to child frame. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address comments for tests + merge blink/cr changes. Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/frame/LocalFrame.cpp
diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
index def62f7a800d391e54a03564c9502d9862894565..47c482f1a39e666957a8ac15a7f628fdcbf2a809 100644
--- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
+++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
@@ -188,8 +188,8 @@ void LocalFrame::createView(const IntSize& viewportSize, const Color& background
owner->setWidget(frameView);
}
- if (HTMLFrameOwnerElement* owner = deprecatedLocalOwner())
- view()->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOff);
+ if (owner())
+ view()->setCanHaveScrollbars(owner()->scrollingMode() != ScrollbarAlwaysOff);
}
LocalFrame::~LocalFrame()

Powered by Google App Engine
This is Rietveld 408576698