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 343 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
354 frameView->setScrollbarModes(horizontalScrollbarMode, verticalScrollbarMode,
horizontalLock, verticalLock); | 354 frameView->setScrollbarModes(horizontalScrollbarMode, verticalScrollbarMode,
horizontalLock, verticalLock); |
355 | 355 |
356 setView(frameView); | 356 setView(frameView); |
357 | 357 |
358 if (backgroundColor.alpha()) | 358 if (backgroundColor.alpha()) |
359 frameView->updateBackgroundRecursively(backgroundColor, transparent); | 359 frameView->updateBackgroundRecursively(backgroundColor, transparent); |
360 | 360 |
361 if (isMainFrame) | 361 if (isMainFrame) |
362 frameView->setParentVisible(true); | 362 frameView->setParentVisible(true); |
363 | 363 |
364 if (ownerRenderer()) | 364 if (ownerRenderer()) { |
365 ownerRenderer()->setWidget(frameView); | 365 HTMLFrameOwnerElement* owner = ownerElement(); |
| 366 ASSERT(owner); |
| 367 owner->setWidget(frameView); |
| 368 } |
366 | 369 |
367 if (HTMLFrameOwnerElement* owner = ownerElement()) | 370 if (HTMLFrameOwnerElement* owner = ownerElement()) |
368 view()->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOf
f); | 371 view()->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOf
f); |
369 } | 372 } |
370 | 373 |
371 | 374 |
372 void LocalFrame::countObjectsNeedingLayout(unsigned& needsLayoutObjects, unsigne
d& totalObjects, bool& isPartial) | 375 void LocalFrame::countObjectsNeedingLayout(unsigned& needsLayoutObjects, unsigne
d& totalObjects, bool& isPartial) |
373 { | 376 { |
374 RenderObject* root = view()->layoutRoot(); | 377 RenderObject* root = view()->layoutRoot(); |
375 isPartial = true; | 378 isPartial = true; |
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
594 { | 597 { |
595 if (!m_host) | 598 if (!m_host) |
596 return 0; | 599 return 0; |
597 | 600 |
598 double ratio = m_host->deviceScaleFactor(); | 601 double ratio = m_host->deviceScaleFactor(); |
599 ratio *= pageZoomFactor(); | 602 ratio *= pageZoomFactor(); |
600 return ratio; | 603 return ratio; |
601 } | 604 } |
602 | 605 |
603 } // namespace WebCore | 606 } // namespace WebCore |
OLD | NEW |