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

Side by Side Diff: third_party/WebKit/Source/core/layout/LayoutEmbeddedObject.cpp

Issue 2810873007: Replace LayoutPart::GetFrameViewBase with GetNodeFrameView (Closed)
Patch Set: No need for child_frame_view var Created 3 years, 8 months 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Simon Hausmann <hausmann@kde.org> 3 * (C) 2000 Simon Hausmann <hausmann@kde.org>
4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de) 4 * (C) 2000 Stefan Schimanski (1Stein@gmx.de)
5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc. 5 * Copyright (C) 2004, 2005, 2006, 2008, 2009, 2010 Apple Inc.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 return ScrollResult(); 150 return ScrollResult();
151 } 151 }
152 152
153 CompositingReasons LayoutEmbeddedObject::AdditionalCompositingReasons() const { 153 CompositingReasons LayoutEmbeddedObject::AdditionalCompositingReasons() const {
154 if (RequiresAcceleratedCompositing()) 154 if (RequiresAcceleratedCompositing())
155 return kCompositingReasonPlugin; 155 return kCompositingReasonPlugin;
156 return kCompositingReasonNone; 156 return kCompositingReasonNone;
157 } 157 }
158 158
159 LayoutReplaced* LayoutEmbeddedObject::EmbeddedReplacedContent() const { 159 LayoutReplaced* LayoutEmbeddedObject::EmbeddedReplacedContent() const {
160 if (!GetNode() || !GetFrameViewBase() || !GetFrameViewBase()->IsFrameView()) 160 if (FrameView* frame_view = ChildFrameView())
161 return nullptr; 161 return frame_view->EmbeddedReplacedContent();
162 return ToFrameView(GetFrameViewBase())->EmbeddedReplacedContent(); 162 return nullptr;
163 } 163 }
164 164
165 } // namespace blink 165 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698