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

Side by Side 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, 2 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
3 * Copyright (C) 2011 Apple Inc. All rights reserved. 3 * Copyright (C) 2011 Apple Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 836 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 m_webFrame->client()->didChangeName(m_webFrame, name); 847 m_webFrame->client()->didChangeName(m_webFrame, name);
848 } 848 }
849 849
850 void FrameLoaderClientImpl::didChangeSandboxFlags(Frame* childFrame, SandboxFlag s flags) 850 void FrameLoaderClientImpl::didChangeSandboxFlags(Frame* childFrame, SandboxFlag s flags)
851 { 851 {
852 if (!m_webFrame->client()) 852 if (!m_webFrame->client())
853 return; 853 return;
854 m_webFrame->client()->didChangeSandboxFlags(WebFrame::fromFrame(childFrame), static_cast<WebSandboxFlags>(flags)); 854 m_webFrame->client()->didChangeSandboxFlags(WebFrame::fromFrame(childFrame), static_cast<WebSandboxFlags>(flags));
855 } 855 }
856 856
857 void FrameLoaderClientImpl::didChangeFrameOwnerProperties(Frame* childFrame, Scr ollbarMode scrollingMode, int marginWidth, int marginHeight)
858 {
859 if (!m_webFrame->client())
860 return;
861
862 m_webFrame->client()->didChangeFrameOwnerProperties(WebFrame::fromFrame(chil dFrame), WebFrameOwnerProperties(static_cast<WebFrameOwnerProperties::ScrollingM ode>(scrollingMode), marginWidth, marginHeight));
863 }
864
857 void FrameLoaderClientImpl::dispatchWillOpenWebSocket(WebSocketHandle* handle) 865 void FrameLoaderClientImpl::dispatchWillOpenWebSocket(WebSocketHandle* handle)
858 { 866 {
859 m_webFrame->client()->willOpenWebSocket(handle); 867 m_webFrame->client()->willOpenWebSocket(handle);
860 } 868 }
861 869
862 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler(WebRTCPe erConnectionHandler* handler) 870 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler(WebRTCPe erConnectionHandler* handler)
863 { 871 {
864 m_webFrame->client()->willStartUsingPeerConnectionHandler(webFrame(), handle r); 872 m_webFrame->client()->willStartUsingPeerConnectionHandler(webFrame(), handle r);
865 } 873 }
866 874
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
951 959
952 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type) 960 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type)
953 { 961 {
954 if (m_webFrame->client()) { 962 if (m_webFrame->client()) {
955 m_webFrame->client()->suddenTerminationDisablerChanged( 963 m_webFrame->client()->suddenTerminationDisablerChanged(
956 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type)); 964 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type));
957 } 965 }
958 } 966 }
959 967
960 } // namespace blink 968 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698