| 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 366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 377 | 377 |
| 378 // The layout size is set by WebViewImpl to support @viewport | 378 // The layout size is set by WebViewImpl to support @viewport |
| 379 frameView->setLayoutSizeFixedToFrameSize(false); | 379 frameView->setLayoutSizeFixedToFrameSize(false); |
| 380 } else | 380 } else |
| 381 frameView = FrameView::create(this); | 381 frameView = FrameView::create(this); |
| 382 | 382 |
| 383 frameView->setScrollbarModes(horizontalScrollbarMode, verticalScrollbarMode,
horizontalLock, verticalLock); | 383 frameView->setScrollbarModes(horizontalScrollbarMode, verticalScrollbarMode,
horizontalLock, verticalLock); |
| 384 | 384 |
| 385 setView(frameView); | 385 setView(frameView); |
| 386 | 386 |
| 387 if (backgroundColor.alpha()) | 387 frameView->updateBackgroundRecursively(backgroundColor, transparent); |
| 388 frameView->updateBackgroundRecursively(backgroundColor, transparent); | |
| 389 | 388 |
| 390 if (isMainFrame) | 389 if (isMainFrame) |
| 391 frameView->setParentVisible(true); | 390 frameView->setParentVisible(true); |
| 392 | 391 |
| 393 // FIXME: Not clear what the right thing for OOPI is here. | 392 // FIXME: Not clear what the right thing for OOPI is here. |
| 394 if (ownerRenderer()) { | 393 if (ownerRenderer()) { |
| 395 HTMLFrameOwnerElement* owner = deprecatedLocalOwner(); | 394 HTMLFrameOwnerElement* owner = deprecatedLocalOwner(); |
| 396 ASSERT(owner); | 395 ASSERT(owner); |
| 397 owner->setWidget(frameView); | 396 owner->setWidget(frameView); |
| 398 } | 397 } |
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 658 LocalFrame* LocalFrame::localFrameRoot() | 657 LocalFrame* LocalFrame::localFrameRoot() |
| 659 { | 658 { |
| 660 LocalFrame* curFrame = this; | 659 LocalFrame* curFrame = this; |
| 661 while (curFrame && curFrame->tree().parent() && curFrame->tree().parent()->i
sLocalFrame()) | 660 while (curFrame && curFrame->tree().parent() && curFrame->tree().parent()->i
sLocalFrame()) |
| 662 curFrame = curFrame->tree().parent(); | 661 curFrame = curFrame->tree().parent(); |
| 663 | 662 |
| 664 return curFrame; | 663 return curFrame; |
| 665 } | 664 } |
| 666 | 665 |
| 667 } // namespace WebCore | 666 } // namespace WebCore |
| OLD | NEW |