Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 349 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 360 return nullptr; | 360 return nullptr; |
| 361 } | 361 } |
| 362 | 362 |
| 363 void LocalFrame::createView(const IntSize& viewportSize, const Color& background Color, bool transparent, | 363 void LocalFrame::createView(const IntSize& viewportSize, const Color& background Color, bool transparent, |
| 364 ScrollbarMode horizontalScrollbarMode, bool horizontalLock, | 364 ScrollbarMode horizontalScrollbarMode, bool horizontalLock, |
| 365 ScrollbarMode verticalScrollbarMode, bool verticalLock) | 365 ScrollbarMode verticalScrollbarMode, bool verticalLock) |
| 366 { | 366 { |
| 367 ASSERT(this); | 367 ASSERT(this); |
| 368 ASSERT(page()); | 368 ASSERT(page()); |
| 369 | 369 |
| 370 bool isMainFrame = this->isMainFrame(); | 370 bool isMainFrame = this->isLocalRoot(); |
|
dcheng
2014/07/10 21:14:54
Should we rename the bool here too?
kenrb
2014/07/11 16:06:17
Done.
| |
| 371 | 371 |
| 372 if (isMainFrame && view()) | 372 if (isMainFrame && view()) |
| 373 view()->setParentVisible(false); | 373 view()->setParentVisible(false); |
| 374 | 374 |
| 375 setView(nullptr); | 375 setView(nullptr); |
| 376 | 376 |
| 377 RefPtr<FrameView> frameView; | 377 RefPtr<FrameView> frameView; |
| 378 if (isMainFrame) { | 378 if (isMainFrame) { |
| 379 frameView = FrameView::create(this, viewportSize); | 379 frameView = FrameView::create(this, viewportSize); |
| 380 | 380 |
| (...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 645 LocalFrame* LocalFrame::localFrameRoot() | 645 LocalFrame* LocalFrame::localFrameRoot() |
| 646 { | 646 { |
| 647 LocalFrame* curFrame = this; | 647 LocalFrame* curFrame = this; |
| 648 while (curFrame && curFrame->tree().parent() && curFrame->tree().parent()->i sLocalFrame()) | 648 while (curFrame && curFrame->tree().parent() && curFrame->tree().parent()->i sLocalFrame()) |
| 649 curFrame = toLocalFrame(curFrame->tree().parent()); | 649 curFrame = toLocalFrame(curFrame->tree().parent()); |
| 650 | 650 |
| 651 return curFrame; | 651 return curFrame; |
| 652 } | 652 } |
| 653 | 653 |
| 654 } // namespace WebCore | 654 } // namespace WebCore |
| OLD | NEW |