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

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

Issue 104433003: Attach a WebLayer to a frame element for out-of-process iframes. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Added missing null check 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
« no previous file with comments | « Source/core/frame/Frame.h ('k') | Source/core/rendering/CompositedLayerMapping.cpp » ('j') | no next file with comments »
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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #include "core/frame/animation/AnimationController.h" 58 #include "core/frame/animation/AnimationController.h"
59 #include "core/page/scrolling/ScrollingCoordinator.h" 59 #include "core/page/scrolling/ScrollingCoordinator.h"
60 #include "core/platform/DragImage.h" 60 #include "core/platform/DragImage.h"
61 #include "core/rendering/HitTestResult.h" 61 #include "core/rendering/HitTestResult.h"
62 #include "core/rendering/RenderLayerCompositor.h" 62 #include "core/rendering/RenderLayerCompositor.h"
63 #include "core/rendering/RenderPart.h" 63 #include "core/rendering/RenderPart.h"
64 #include "core/rendering/RenderView.h" 64 #include "core/rendering/RenderView.h"
65 #include "core/svg/SVGDocument.h" 65 #include "core/svg/SVGDocument.h"
66 #include "platform/graphics/GraphicsContext.h" 66 #include "platform/graphics/GraphicsContext.h"
67 #include "platform/graphics/ImageBuffer.h" 67 #include "platform/graphics/ImageBuffer.h"
68 #include "public/platform/WebLayer.h"
68 #include "wtf/PassOwnPtr.h" 69 #include "wtf/PassOwnPtr.h"
69 #include "wtf/RefCountedLeakCounter.h" 70 #include "wtf/RefCountedLeakCounter.h"
70 #include "wtf/StdLibExtras.h" 71 #include "wtf/StdLibExtras.h"
71 72
72 using namespace std; 73 using namespace std;
73 74
74 namespace WebCore { 75 namespace WebCore {
75 76
76 using namespace HTMLNames; 77 using namespace HTMLNames;
77 78
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 , m_eventHandler(adoptPtr(new EventHandler(this))) 113 , m_eventHandler(adoptPtr(new EventHandler(this)))
113 , m_animationController(adoptPtr(new AnimationController(this))) 114 , m_animationController(adoptPtr(new AnimationController(this)))
114 , m_inputMethodController(InputMethodController::create(*this)) 115 , m_inputMethodController(InputMethodController::create(*this))
115 , m_frameInit(frameInit) 116 , m_frameInit(frameInit)
116 , m_pageZoomFactor(parentPageZoomFactor(this)) 117 , m_pageZoomFactor(parentPageZoomFactor(this))
117 , m_textZoomFactor(parentTextZoomFactor(this)) 118 , m_textZoomFactor(parentTextZoomFactor(this))
118 #if ENABLE(ORIENTATION_EVENTS) 119 #if ENABLE(ORIENTATION_EVENTS)
119 , m_orientation(0) 120 , m_orientation(0)
120 #endif 121 #endif
121 , m_inViewSourceMode(false) 122 , m_inViewSourceMode(false)
123 , m_remotePlatformLayer(0)
122 { 124 {
123 ASSERT(m_page); 125 ASSERT(m_page);
124 126
125 if (ownerElement()) { 127 if (ownerElement()) {
126 m_page->incrementSubframeCount(); 128 m_page->incrementSubframeCount();
127 ownerElement()->setContentFrame(*this); 129 ownerElement()->setContentFrame(*this);
128 } 130 }
129 131
130 #ifndef NDEBUG 132 #ifndef NDEBUG
131 frameCounter.increment(); 133 frameCounter.increment();
(...skipping 563 matching lines...) Expand 10 before | Expand all | Expand 10 after
695 if (!m_page) 697 if (!m_page)
696 return 0; 698 return 0;
697 699
698 double ratio = m_page->deviceScaleFactor(); 700 double ratio = m_page->deviceScaleFactor();
699 if (RuntimeEnabledFeatures::devicePixelRatioIncludesZoomEnabled()) 701 if (RuntimeEnabledFeatures::devicePixelRatioIncludesZoomEnabled())
700 ratio *= pageZoomFactor(); 702 ratio *= pageZoomFactor();
701 return ratio; 703 return ratio;
702 } 704 }
703 705
704 } // namespace WebCore 706 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/frame/Frame.h ('k') | Source/core/rendering/CompositedLayerMapping.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698