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

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

Issue 1785123003: Rework embeddedContentBox into embeddedReplacedContent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 9 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, 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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 return view->usesCompositing(); 133 return view->usesCompositing();
134 } 134 }
135 135
136 return false; 136 return false;
137 } 137 }
138 138
139 bool LayoutPart::needsPreferredWidthsRecalculation() const 139 bool LayoutPart::needsPreferredWidthsRecalculation() const
140 { 140 {
141 if (LayoutReplaced::needsPreferredWidthsRecalculation()) 141 if (LayoutReplaced::needsPreferredWidthsRecalculation())
142 return true; 142 return true;
143 return embeddedContentBox(); 143 return embeddedReplacedContent();
144 } 144 }
145 145
146 bool LayoutPart::nodeAtPointOverWidget(HitTestResult& result, const HitTestLocat ion& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction ac tion) 146 bool LayoutPart::nodeAtPointOverWidget(HitTestResult& result, const HitTestLocat ion& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction ac tion)
147 { 147 {
148 bool hadResult = result.innerNode(); 148 bool hadResult = result.innerNode();
149 bool inside = LayoutReplaced::nodeAtPoint(result, locationInContainer, accum ulatedOffset, action); 149 bool inside = LayoutReplaced::nodeAtPoint(result, locationInContainer, accum ulatedOffset, action);
150 150
151 // Check to see if we are really over the widget itself (and not just in the border/padding area). 151 // Check to see if we are really over the widget itself (and not just in the border/padding area).
152 if ((inside || result.isRectBasedTest()) && !hadResult && result.innerNode() == node()) 152 if ((inside || result.isRectBasedTest()) && !hadResult && result.innerNode() == node())
153 result.setIsOverWidget(contentBoxRect().contains(result.localPoint())); 153 result.setIsOverWidget(contentBoxRect().contains(result.localPoint()));
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 365
366 bool LayoutPart::isThrottledFrameView() const 366 bool LayoutPart::isThrottledFrameView() const
367 { 367 {
368 if (!widget() || !widget()->isFrameView()) 368 if (!widget() || !widget()->isFrameView())
369 return false; 369 return false;
370 const FrameView* frameView = toFrameView(widget()); 370 const FrameView* frameView = toFrameView(widget());
371 return frameView->shouldThrottleRendering(); 371 return frameView->shouldThrottleRendering();
372 } 372 }
373 373
374 } // namespace blink 374 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/LayoutImage.cpp ('k') | third_party/WebKit/Source/core/layout/LayoutReplaced.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698