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

Side by Side Diff: third_party/WebKit/Source/core/frame/Frame.cpp

Issue 2709263003: Removed FrameHost::settings() (Closed)
Patch Set: Switched if statement to use page Created 3 years, 9 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) 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 8 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
9 * rights reserved. 9 * rights reserved.
10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com> 10 * Copyright (C) 2005 Alexey Proskuryakov <ap@nypop.com>
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 if (!object->isLayoutPart()) 377 if (!object->isLayoutPart())
378 return nullptr; 378 return nullptr;
379 return toLayoutPart(object); 379 return toLayoutPart(object);
380 } 380 }
381 381
382 LayoutPartItem Frame::ownerLayoutItem() const { 382 LayoutPartItem Frame::ownerLayoutItem() const {
383 return LayoutPartItem(ownerLayoutObject()); 383 return LayoutPartItem(ownerLayoutObject());
384 } 384 }
385 385
386 Settings* Frame::settings() const { 386 Settings* Frame::settings() const {
387 if (m_host) 387 if (page())
388 return &m_host->settings(); 388 return &page()->settings();
389 return nullptr; 389 return nullptr;
390 } 390 }
391 391
392 void Frame::didChangeVisibilityState() { 392 void Frame::didChangeVisibilityState() {
393 HeapVector<Member<Frame>> childFrames; 393 HeapVector<Member<Frame>> childFrames;
394 for (Frame* child = tree().firstChild(); child; 394 for (Frame* child = tree().firstChild(); child;
395 child = child->tree().nextSibling()) 395 child = child->tree().nextSibling())
396 childFrames.push_back(child); 396 childFrames.push_back(child);
397 for (size_t i = 0; i < childFrames.size(); ++i) 397 for (size_t i = 0; i < childFrames.size(); ++i)
398 childFrames[i]->didChangeVisibilityState(); 398 childFrames[i]->didChangeVisibilityState();
(...skipping 15 matching lines...) Expand all
414 414
415 ASSERT(page()); 415 ASSERT(page());
416 416
417 if (m_owner) 417 if (m_owner)
418 m_owner->setContentFrame(*this); 418 m_owner->setContentFrame(*this);
419 else 419 else
420 page()->setMainFrame(this); 420 page()->setMainFrame(this);
421 } 421 }
422 422
423 } // namespace blink 423 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/css/MediaValues.cpp ('k') | third_party/WebKit/Source/core/frame/FrameHost.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698