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

Unified Diff: third_party/WebKit/Source/web/FrameLoaderClientImpl.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/web/FrameLoaderClientImpl.cpp
diff --git a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
index affe69afc6cfc7baa73cbf6cd721461be056fb58..d1a53a3b6fa2e7723c6932f0e42f06d1e1adedb6 100644
--- a/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
+++ b/third_party/WebKit/Source/web/FrameLoaderClientImpl.cpp
@@ -854,6 +854,14 @@ void FrameLoaderClientImpl::didChangeSandboxFlags(Frame* childFrame, SandboxFlag
m_webFrame->client()->didChangeSandboxFlags(WebFrame::fromFrame(childFrame), static_cast<WebSandboxFlags>(flags));
}
+void FrameLoaderClientImpl::didChangeFrameOwnerProperties(Frame* childFrame, ScrollbarMode scrollingMode, int marginWidth, int marginHeight)
+{
+ if (!m_webFrame->client())
+ return;
+
+ m_webFrame->client()->didChangeFrameOwnerProperties(WebFrame::fromFrame(childFrame), WebFrameOwnerProperties(static_cast<WebFrameOwnerProperties::ScrollingMode>(scrollingMode), marginWidth, marginHeight));
+}
+
void FrameLoaderClientImpl::dispatchWillOpenWebSocket(WebSocketHandle* handle)
{
m_webFrame->client()->willOpenWebSocket(handle);

Powered by Google App Engine
This is Rietveld 408576698