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

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

Issue 23618022: BrowserPlugin/WebView - Move plugin lifetime to DOM (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ASSERT on ownerElement->widget() == this causes many tests to fail. Created 7 years 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 | Annotate | Revision Log
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 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 480 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 frameView->setScrollbarModes(horizontalScrollbarMode, verticalScrollbarMode, horizontalLock, verticalLock); 491 frameView->setScrollbarModes(horizontalScrollbarMode, verticalScrollbarMode, horizontalLock, verticalLock);
492 492
493 setView(frameView); 493 setView(frameView);
494 494
495 if (backgroundColor.isValid()) 495 if (backgroundColor.isValid())
496 frameView->updateBackgroundRecursively(backgroundColor, transparent); 496 frameView->updateBackgroundRecursively(backgroundColor, transparent);
497 497
498 if (isMainFrame) 498 if (isMainFrame)
499 frameView->setParentVisible(true); 499 frameView->setParentVisible(true);
500 500
501 if (ownerRenderer()) 501 if (HTMLFrameOwnerElement* owner = ownerElement()) {
502 ownerRenderer()->setWidget(frameView); 502 if (ownerRenderer())
503 503 owner->setWidget(frameView);
504 if (HTMLFrameOwnerElement* owner = ownerElement())
505 view()->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOf f); 504 view()->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOf f);
505 }
506 } 506 }
507 507
508 String Frame::layerTreeAsText(unsigned flags) const 508 String Frame::layerTreeAsText(unsigned flags) const
509 { 509 {
510 document()->updateLayout(); 510 document()->updateLayout();
511 511
512 if (!contentRenderer()) 512 if (!contentRenderer())
513 return String(); 513 return String();
514 514
515 return contentRenderer()->compositor()->layerTreeAsText(static_cast<LayerTre eFlags>(flags)); 515 return contentRenderer()->compositor()->layerTreeAsText(static_cast<LayerTre eFlags>(flags));
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
714 if (!m_host) 714 if (!m_host)
715 return 0; 715 return 0;
716 716
717 double ratio = m_host->deviceScaleFactor(); 717 double ratio = m_host->deviceScaleFactor();
718 if (RuntimeEnabledFeatures::devicePixelRatioIncludesZoomEnabled()) 718 if (RuntimeEnabledFeatures::devicePixelRatioIncludesZoomEnabled())
719 ratio *= pageZoomFactor(); 719 ratio *= pageZoomFactor();
720 return ratio; 720 return ratio;
721 } 721 }
722 722
723 } // namespace WebCore 723 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698