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

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: Revised method for widget lifetime management. 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
« no previous file with comments | « no previous file | Source/core/frame/FrameView.cpp » ('j') | Source/core/html/HTMLObjectElement.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 462 matching lines...) Expand 10 before | Expand all | Expand 10 after
473 frameView->setScrollbarModes(horizontalScrollbarMode, verticalScrollbarMode, horizontalLock, verticalLock); 473 frameView->setScrollbarModes(horizontalScrollbarMode, verticalScrollbarMode, horizontalLock, verticalLock);
474 474
475 setView(frameView); 475 setView(frameView);
476 476
477 if (backgroundColor.isValid()) 477 if (backgroundColor.isValid())
478 frameView->updateBackgroundRecursively(backgroundColor, transparent); 478 frameView->updateBackgroundRecursively(backgroundColor, transparent);
479 479
480 if (isMainFrame) 480 if (isMainFrame)
481 frameView->setParentVisible(true); 481 frameView->setParentVisible(true);
482 482
483 if (ownerRenderer()) 483 if (HTMLFrameOwnerElement* owner = ownerElement()) {
484 ownerRenderer()->setWidget(frameView); 484 owner->setWidget(frameView);
485
486 if (HTMLFrameOwnerElement* owner = ownerElement())
487 view()->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOf f); 485 view()->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOf f);
486 }
488 } 487 }
489 488
490 String Frame::layerTreeAsText(unsigned flags) const 489 String Frame::layerTreeAsText(unsigned flags) const
491 { 490 {
492 document()->updateLayout(); 491 document()->updateLayout();
493 492
494 if (!contentRenderer()) 493 if (!contentRenderer())
495 return String(); 494 return String();
496 495
497 return contentRenderer()->compositor()->layerTreeAsText(static_cast<LayerTre eFlags>(flags)); 496 return contentRenderer()->compositor()->layerTreeAsText(static_cast<LayerTre eFlags>(flags));
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
696 if (!m_page) 695 if (!m_page)
697 return 0; 696 return 0;
698 697
699 double ratio = m_page->deviceScaleFactor(); 698 double ratio = m_page->deviceScaleFactor();
700 if (RuntimeEnabledFeatures::devicePixelRatioIncludesZoomEnabled()) 699 if (RuntimeEnabledFeatures::devicePixelRatioIncludesZoomEnabled())
701 ratio *= pageZoomFactor(); 700 ratio *= pageZoomFactor();
702 return ratio; 701 return ratio;
703 } 702 }
704 703
705 } // namespace WebCore 704 } // namespace WebCore
OLDNEW
« no previous file with comments | « no previous file | Source/core/frame/FrameView.cpp » ('j') | Source/core/html/HTMLObjectElement.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698