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

Unified Diff: third_party/WebKit/Source/web/RemoteBridgeFrameOwner.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: content_unittests compile fix Created 5 years, 1 month 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
« no previous file with comments | « third_party/WebKit/Source/web/RemoteBridgeFrameOwner.h ('k') | third_party/WebKit/Source/web/WebFrame.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/RemoteBridgeFrameOwner.cpp
diff --git a/third_party/WebKit/Source/web/RemoteBridgeFrameOwner.cpp b/third_party/WebKit/Source/web/RemoteBridgeFrameOwner.cpp
index 51afd66fa37a425ddd54e99086b26770d93273cb..8ce2deb0fadd0a1bac9310fac42397b7736dfb01 100644
--- a/third_party/WebKit/Source/web/RemoteBridgeFrameOwner.cpp
+++ b/third_party/WebKit/Source/web/RemoteBridgeFrameOwner.cpp
@@ -9,9 +9,12 @@
namespace blink {
-RemoteBridgeFrameOwner::RemoteBridgeFrameOwner(PassRefPtrWillBeRawPtr<WebLocalFrameImpl> frame, SandboxFlags flags)
+RemoteBridgeFrameOwner::RemoteBridgeFrameOwner(PassRefPtrWillBeRawPtr<WebLocalFrameImpl> frame, SandboxFlags flags, const WebFrameOwnerProperties& frameOwnerProperties)
: m_frame(frame)
, m_sandboxFlags(flags)
+ , m_scrolling(static_cast<ScrollbarMode>(frameOwnerProperties.scrollingMode))
+ , m_marginWidth(frameOwnerProperties.marginWidth)
+ , m_marginHeight(frameOwnerProperties.marginHeight)
{
}
@@ -21,6 +24,11 @@ DEFINE_TRACE(RemoteBridgeFrameOwner)
FrameOwner::trace(visitor);
}
+void RemoteBridgeFrameOwner::setScrollingMode(WebFrameOwnerProperties::ScrollingMode mode)
+{
+ m_scrolling = static_cast<ScrollbarMode>(mode);
+}
+
void RemoteBridgeFrameOwner::dispatchLoad()
{
if (m_frame->client())
« no previous file with comments | « third_party/WebKit/Source/web/RemoteBridgeFrameOwner.h ('k') | third_party/WebKit/Source/web/WebFrame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698