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

Side by Side 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: 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org> 2 * Copyright (C) 1998, 1999 Torben Weis <weis@kde.org>
3 * 1999 Lars Knoll <knoll@kde.org> 3 * 1999 Lars Knoll <knoll@kde.org>
4 * 1999 Antti Koivisto <koivisto@kde.org> 4 * 1999 Antti Koivisto <koivisto@kde.org>
5 * 2000 Simon Hausmann <hausmann@kde.org> 5 * 2000 Simon Hausmann <hausmann@kde.org>
6 * 2000 Stefan Schimanski <1Stein@gmx.de> 6 * 2000 Stefan Schimanski <1Stein@gmx.de>
7 * 2001 George Staikos <staikos@kde.org> 7 * 2001 George Staikos <staikos@kde.org>
8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved. 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 9 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies) 10 * Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies)
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 if (ownerLayoutObject()) { 181 if (ownerLayoutObject()) {
182 HTMLFrameOwnerElement* owner = deprecatedLocalOwner(); 182 HTMLFrameOwnerElement* owner = deprecatedLocalOwner();
183 ASSERT(owner); 183 ASSERT(owner);
184 // FIXME: OOPI might lead to us temporarily lying to a frame and telling it 184 // FIXME: OOPI might lead to us temporarily lying to a frame and telling it
185 // that it's owned by a FrameOwner that knows nothing about it. If we're 185 // that it's owned by a FrameOwner that knows nothing about it. If we're
186 // lying to this frame, don't let it clobber the existing widget. 186 // lying to this frame, don't let it clobber the existing widget.
187 if (owner->contentFrame() == this) 187 if (owner->contentFrame() == this)
188 owner->setWidget(frameView); 188 owner->setWidget(frameView);
189 } 189 }
190 190
191 if (HTMLFrameOwnerElement* owner = deprecatedLocalOwner()) 191 if (owner())
192 view()->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOf f); 192 view()->setCanHaveScrollbars(owner()->scrollingMode() != ScrollbarAlways Off);
193 } 193 }
194 194
195 LocalFrame::~LocalFrame() 195 LocalFrame::~LocalFrame()
196 { 196 {
197 // Verify that the FrameView has been cleared as part of detaching 197 // Verify that the FrameView has been cleared as part of detaching
198 // the frame owner. 198 // the frame owner.
199 ASSERT(!m_view); 199 ASSERT(!m_view);
200 #if !ENABLE(OILPAN) 200 #if !ENABLE(OILPAN)
201 // Oilpan: see setDOMWindow() comment why it is acceptable not to 201 // Oilpan: see setDOMWindow() comment why it is acceptable not to
202 // explicitly call setDOMWindow() here. 202 // explicitly call setDOMWindow() here.
(...skipping 700 matching lines...) Expand 10 before | Expand all | Expand 10 after
903 if (!context) 903 if (!context)
904 return; 904 return;
905 905
906 WebSecurityOrigin securityOrigin(context->securityOrigin()); 906 WebSecurityOrigin securityOrigin(context->securityOrigin());
907 frameScheduler()->setFrameOrigin(&securityOrigin); 907 frameScheduler()->setFrameOrigin(&securityOrigin);
908 } 908 }
909 909
910 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame); 910 DEFINE_WEAK_IDENTIFIER_MAP(LocalFrame);
911 911
912 } // namespace blink 912 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.cpp ('k') | third_party/WebKit/Source/core/html/HTMLBodyElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698