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

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: Fix mac compile issue. 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 463 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 frameView->setScrollbarModes(horizontalScrollbarMode, verticalScrollbarMode, horizontalLock, verticalLock); 474 frameView->setScrollbarModes(horizontalScrollbarMode, verticalScrollbarMode, horizontalLock, verticalLock);
475 475
476 setView(frameView); 476 setView(frameView);
477 477
478 if (backgroundColor.isValid()) 478 if (backgroundColor.isValid())
479 frameView->updateBackgroundRecursively(backgroundColor, transparent); 479 frameView->updateBackgroundRecursively(backgroundColor, transparent);
480 480
481 if (isMainFrame) 481 if (isMainFrame)
482 frameView->setParentVisible(true); 482 frameView->setParentVisible(true);
483 483
484 if (ownerRenderer()) 484 if (HTMLFrameOwnerElement* owner = ownerElement()) {
485 ownerRenderer()->setWidget(frameView); 485 if (ownerRenderer())
486 486 owner->setWidget(frameView);
487 if (HTMLFrameOwnerElement* owner = ownerElement())
488 view()->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOf f); 487 view()->setCanHaveScrollbars(owner->scrollingMode() != ScrollbarAlwaysOf f);
488 }
489 } 489 }
490 490
491 String Frame::layerTreeAsText(unsigned flags) const 491 String Frame::layerTreeAsText(unsigned flags) const
492 { 492 {
493 document()->updateLayout(); 493 document()->updateLayout();
494 494
495 if (!contentRenderer()) 495 if (!contentRenderer())
496 return String(); 496 return String();
497 497
498 return contentRenderer()->compositor()->layerTreeAsText(static_cast<LayerTre eFlags>(flags)); 498 return contentRenderer()->compositor()->layerTreeAsText(static_cast<LayerTre eFlags>(flags));
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after
699 if (!m_page) 699 if (!m_page)
700 return 0; 700 return 0;
701 701
702 double ratio = m_page->deviceScaleFactor(); 702 double ratio = m_page->deviceScaleFactor();
703 if (RuntimeEnabledFeatures::devicePixelRatioIncludesZoomEnabled()) 703 if (RuntimeEnabledFeatures::devicePixelRatioIncludesZoomEnabled())
704 ratio *= pageZoomFactor(); 704 ratio *= pageZoomFactor();
705 return ratio; 705 return ratio;
706 } 706 }
707 707
708 } // namespace WebCore 708 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698