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

Side by Side Diff: Source/core/rendering/RenderPart.cpp

Issue 246933007: Make <iframe> containing SVG behave as every other <iframe> (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add NeedsRebaseline to test for landing Created 6 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
« no previous file with comments | « Source/core/rendering/RenderPart.h ('k') | Source/core/rendering/RenderReplaced.h » ('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) 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, 2009 Apple Inc. All rights reserved. 5 * Copyright (C) 2004, 2005, 2006, 2009 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2011. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2011. 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 return false; 81 return false;
82 } 82 }
83 83
84 bool RenderPart::needsPreferredWidthsRecalculation() const 84 bool RenderPart::needsPreferredWidthsRecalculation() const
85 { 85 {
86 if (RenderWidget::needsPreferredWidthsRecalculation()) 86 if (RenderWidget::needsPreferredWidthsRecalculation())
87 return true; 87 return true;
88 return embeddedContentBox(); 88 return embeddedContentBox();
89 } 89 }
90 90
91 RenderBox* RenderPart::embeddedContentBox() const
92 {
93 if (!node() || !widget() || !widget()->isFrameView())
94 return 0;
95 return toFrameView(widget())->embeddedContentBox();
96 }
97
98 bool RenderPart::nodeAtPoint(const HitTestRequest& request, HitTestResult& resul t, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOff set, HitTestAction action) 91 bool RenderPart::nodeAtPoint(const HitTestRequest& request, HitTestResult& resul t, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOff set, HitTestAction action)
99 { 92 {
100 if (!widget() || !widget()->isFrameView() || !request.allowsChildFrameConten t()) 93 if (!widget() || !widget()->isFrameView() || !request.allowsChildFrameConten t())
101 return RenderWidget::nodeAtPoint(request, result, locationInContainer, a ccumulatedOffset, action); 94 return RenderWidget::nodeAtPoint(request, result, locationInContainer, a ccumulatedOffset, action);
102 95
103 // FIXME: Until RemoteFrames use RemoteFrameViews, we need an explicit check here. 96 // FIXME: Until RemoteFrames use RemoteFrameViews, we need an explicit check here.
104 if (toFrameView(widget())->frame().isRemoteFrameTemporary()) 97 if (toFrameView(widget())->frame().isRemoteFrameTemporary())
105 return RenderWidget::nodeAtPoint(request, result, locationInContainer, a ccumulatedOffset, action); 98 return RenderWidget::nodeAtPoint(request, result, locationInContainer, a ccumulatedOffset, action);
106 99
107 FrameView* childFrameView = toFrameView(widget()); 100 FrameView* childFrameView = toFrameView(widget());
(...skipping 30 matching lines...) Expand all
138 } 131 }
139 132
140 CompositingReasons RenderPart::additionalCompositingReasons(CompositingTriggerFl ags) const 133 CompositingReasons RenderPart::additionalCompositingReasons(CompositingTriggerFl ags) const
141 { 134 {
142 if (requiresAcceleratedCompositing()) 135 if (requiresAcceleratedCompositing())
143 return CompositingReasonIFrame; 136 return CompositingReasonIFrame;
144 return CompositingReasonNone; 137 return CompositingReasonNone;
145 } 138 }
146 139
147 } 140 }
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderPart.h ('k') | Source/core/rendering/RenderReplaced.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698