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

Side by Side Diff: third_party/WebKit/Source/core/html/HTMLFrameElementBase.cpp

Issue 1858163002: Rename inDocument() to inShadowIncludingDocument() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 8 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) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2000 Simon Hausmann (hausmann@kde.org) 4 * (C) 2000 Simon Hausmann (hausmann@kde.org)
5 * (C) 2001 Dirk Mueller (mueller@kde.org) 5 * (C) 2001 Dirk Mueller (mueller@kde.org)
6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved. 6 * Copyright (C) 2004, 2006, 2008, 2009 Apple Inc. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 else if (frame->isRemoteFrame()) 181 else if (frame->isRemoteFrame())
182 setWidget(toRemoteFrame(frame)->view()); 182 setWidget(toRemoteFrame(frame)->view());
183 } 183 }
184 } 184 }
185 } 185 }
186 186
187 void HTMLFrameElementBase::setLocation(const String& str) 187 void HTMLFrameElementBase::setLocation(const String& str)
188 { 188 {
189 m_URL = AtomicString(str); 189 m_URL = AtomicString(str);
190 190
191 if (inDocument()) 191 if (inShadowIncludingDocument())
192 openURL(false); 192 openURL(false);
193 } 193 }
194 194
195 bool HTMLFrameElementBase::supportsFocus() const 195 bool HTMLFrameElementBase::supportsFocus() const
196 { 196 {
197 return true; 197 return true;
198 } 198 }
199 199
200 void HTMLFrameElementBase::setFocus(bool received) 200 void HTMLFrameElementBase::setFocus(bool received)
201 { 201 {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 frameOwnerPropertiesChanged(); 247 frameOwnerPropertiesChanged();
248 } 248 }
249 249
250 void HTMLFrameElementBase::setMarginHeight(int marginHeight) 250 void HTMLFrameElementBase::setMarginHeight(int marginHeight)
251 { 251 {
252 m_marginHeight = marginHeight; 252 m_marginHeight = marginHeight;
253 frameOwnerPropertiesChanged(); 253 frameOwnerPropertiesChanged();
254 } 254 }
255 255
256 } // namespace blink 256 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLFormElement.cpp ('k') | third_party/WebKit/Source/core/html/HTMLFrameOwnerElement.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698