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

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: move setSandboxFlags call 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 23 matching lines...) Expand all
34 34
35 #include "bindings/core/v8/ScriptController.h" 35 #include "bindings/core/v8/ScriptController.h"
36 #include "core/HTMLNames.h" 36 #include "core/HTMLNames.h"
37 #include "core/dom/Document.h" 37 #include "core/dom/Document.h"
38 #include "core/dom/Fullscreen.h" 38 #include "core/dom/Fullscreen.h"
39 #include "core/events/MessageEvent.h" 39 #include "core/events/MessageEvent.h"
40 #include "core/events/MouseEvent.h" 40 #include "core/events/MouseEvent.h"
41 #include "core/events/UIEventWithKeyState.h" 41 #include "core/events/UIEventWithKeyState.h"
42 #include "core/frame/FrameView.h" 42 #include "core/frame/FrameView.h"
43 #include "core/frame/Settings.h" 43 #include "core/frame/Settings.h"
44 #include "core/html/HTMLFrameElementBase.h"
44 #include "core/html/HTMLMediaElement.h" 45 #include "core/html/HTMLMediaElement.h"
45 #include "core/html/HTMLPlugInElement.h" 46 #include "core/html/HTMLPlugInElement.h"
46 #include "core/input/EventHandler.h" 47 #include "core/input/EventHandler.h"
47 #include "core/layout/HitTestResult.h" 48 #include "core/layout/HitTestResult.h"
48 #include "core/loader/DocumentLoader.h" 49 #include "core/loader/DocumentLoader.h"
49 #include "core/loader/FrameLoadRequest.h" 50 #include "core/loader/FrameLoadRequest.h"
50 #include "core/loader/FrameLoader.h" 51 #include "core/loader/FrameLoader.h"
51 #include "core/loader/HistoryItem.h" 52 #include "core/loader/HistoryItem.h"
52 #include "core/page/Page.h" 53 #include "core/page/Page.h"
53 #include "core/page/WindowFeatures.h" 54 #include "core/page/WindowFeatures.h"
(...skipping 806 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 m_webFrame->client()->didChangeName(m_webFrame, name); 861 m_webFrame->client()->didChangeName(m_webFrame, name);
861 } 862 }
862 863
863 void FrameLoaderClientImpl::didChangeSandboxFlags(Frame* childFrame, SandboxFlag s flags) 864 void FrameLoaderClientImpl::didChangeSandboxFlags(Frame* childFrame, SandboxFlag s flags)
864 { 865 {
865 if (!m_webFrame->client()) 866 if (!m_webFrame->client())
866 return; 867 return;
867 m_webFrame->client()->didChangeSandboxFlags(WebFrame::fromFrame(childFrame), static_cast<WebSandboxFlags>(flags)); 868 m_webFrame->client()->didChangeSandboxFlags(WebFrame::fromFrame(childFrame), static_cast<WebSandboxFlags>(flags));
868 } 869 }
869 870
871 void FrameLoaderClientImpl::didChangeFrameOwnerProperties(HTMLFrameElementBase* frameElement)
872 {
873 if (!m_webFrame->client())
874 return;
875
876 m_webFrame->client()->didChangeFrameOwnerProperties(WebFrame::fromFrame(fram eElement->contentFrame()), WebFrameOwnerProperties(frameElement->scrollingMode() , frameElement->marginWidth(), frameElement->marginHeight()));
877 }
878
870 void FrameLoaderClientImpl::dispatchWillOpenWebSocket(WebSocketHandle* handle) 879 void FrameLoaderClientImpl::dispatchWillOpenWebSocket(WebSocketHandle* handle)
871 { 880 {
872 m_webFrame->client()->willOpenWebSocket(handle); 881 m_webFrame->client()->willOpenWebSocket(handle);
873 } 882 }
874 883
875 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler(WebRTCPe erConnectionHandler* handler) 884 void FrameLoaderClientImpl::dispatchWillStartUsingPeerConnectionHandler(WebRTCPe erConnectionHandler* handler)
876 { 885 {
877 m_webFrame->client()->willStartUsingPeerConnectionHandler(webFrame(), handle r); 886 m_webFrame->client()->willStartUsingPeerConnectionHandler(webFrame(), handle r);
878 } 887 }
879 888
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
964 973
965 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type) 974 void FrameLoaderClientImpl::suddenTerminationDisablerChanged(bool present, Sudde nTerminationDisablerType type)
966 { 975 {
967 if (m_webFrame->client()) { 976 if (m_webFrame->client()) {
968 m_webFrame->client()->suddenTerminationDisablerChanged( 977 m_webFrame->client()->suddenTerminationDisablerChanged(
969 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type)); 978 present, static_cast<WebFrameClient::SuddenTerminationDisablerType>( type));
970 } 979 }
971 } 980 }
972 981
973 } // namespace blink 982 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698