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

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: Add tests, make plugin creation synchronous. 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 461 matching lines...) Expand 10 before | Expand all | Expand 10 after
472 frameView->setScrollbarModes(horizontalScrollbarMode, verticalScrollbarMode, horizontalLock, verticalLock); 472 frameView->setScrollbarModes(horizontalScrollbarMode, verticalScrollbarMode, horizontalLock, verticalLock);
473 473
474 setView(frameView); 474 setView(frameView);
475 475
476 if (backgroundColor.isValid()) 476 if (backgroundColor.isValid())
477 frameView->updateBackgroundRecursively(backgroundColor, transparent); 477 frameView->updateBackgroundRecursively(backgroundColor, transparent);
478 478
479 if (isMainFrame) 479 if (isMainFrame)
480 frameView->setParentVisible(true); 480 frameView->setParentVisible(true);
481 481
482 if (ownerRenderer()) 482 if (HTMLFrameOwnerElement* owner = ownerElement()) {
483 ownerRenderer()->setWidget(frameView); 483 if (ownerRenderer())
484 484 owner->setWidget(frameView);
485 if (HTMLFrameOwnerElement* owner = ownerElement())
486 view()->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOf f); 485 view()->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOf f);
486 }
487 } 487 }
488 488
489 String Frame::layerTreeAsText(unsigned flags) const 489 String Frame::layerTreeAsText(unsigned flags) const
490 { 490 {
491 document()->updateLayout(); 491 document()->updateLayout();
492 492
493 if (!contentRenderer()) 493 if (!contentRenderer())
494 return String(); 494 return String();
495 495
496 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
695 if (!m_page) 695 if (!m_page)
696 return 0; 696 return 0;
697 697
698 double ratio = m_page->deviceScaleFactor(); 698 double ratio = m_page->deviceScaleFactor();
699 if (RuntimeEnabledFeatures::devicePixelRatioIncludesZoomEnabled()) 699 if (RuntimeEnabledFeatures::devicePixelRatioIncludesZoomEnabled())
700 ratio *= pageZoomFactor(); 700 ratio *= pageZoomFactor();
701 return ratio; 701 return ratio;
702 } 702 }
703 703
704 } // namespace WebCore 704 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698