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

Side by Side Diff: Source/web/FindInPageCoordinates.cpp

Issue 751573002: Use viewportConstrainedVisibleContentRect() to get the scrolling offset (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Removed the 'DEPRECATED' comment Created 6 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/rendering/RenderView.cpp ('k') | no next file » | 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 return FloatRect(); 80 return FloatRect();
81 81
82 // Make the coordinates relative to the container enclosing bounding box. 82 // Make the coordinates relative to the container enclosing bounding box.
83 // Since we work with rects enclosing quad unions this is still transform-fr iendly. 83 // Since we work with rects enclosing quad unions this is still transform-fr iendly.
84 FloatRect normalizedRect = absoluteRect; 84 FloatRect normalizedRect = absoluteRect;
85 normalizedRect.moveBy(-containerRect.location()); 85 normalizedRect.moveBy(-containerRect.location());
86 86
87 // Fixed positions do not make sense in this coordinate system, but need to leave consistent tickmarks. 87 // Fixed positions do not make sense in this coordinate system, but need to leave consistent tickmarks.
88 // So, use their position when the view is not scrolled, like an absolute po sition. 88 // So, use their position when the view is not scrolled, like an absolute po sition.
89 if (renderer->style()->position() == FixedPosition && container->isRenderVie w()) 89 if (renderer->style()->position() == FixedPosition && container->isRenderVie w())
90 normalizedRect.move(-toRenderView(container)->frameView()->scrollOffsetF orFixedPosition()); 90 normalizedRect.move(-toRenderView(container)->frameView()->scrollOffsetF orViewportConstrainedObjects());
91 91
92 normalizedRect.scale(1 / containerRect.width(), 1 / containerRect.height()); 92 normalizedRect.scale(1 / containerRect.width(), 1 / containerRect.height());
93 return normalizedRect; 93 return normalizedRect;
94 } 94 }
95 95
96 FloatRect findInPageRectFromAbsoluteRect(const FloatRect& inputRect, const Rende rObject* baseRenderer) 96 FloatRect findInPageRectFromAbsoluteRect(const FloatRect& inputRect, const Rende rObject* baseRenderer)
97 { 97 {
98 if (!baseRenderer || inputRect.isEmpty()) 98 if (!baseRenderer || inputRect.isEmpty())
99 return FloatRect(); 99 return FloatRect();
100 100
(...skipping 27 matching lines...) Expand all
128 128
129 FloatRect findInPageRectFromRange(Range* range) 129 FloatRect findInPageRectFromRange(Range* range)
130 { 130 {
131 if (!range || !range->firstNode()) 131 if (!range || !range->firstNode())
132 return FloatRect(); 132 return FloatRect();
133 133
134 return findInPageRectFromAbsoluteRect(RenderObject::absoluteBoundingBoxRectF orRange(range), range->firstNode()->renderer()); 134 return findInPageRectFromAbsoluteRect(RenderObject::absoluteBoundingBoxRectF orRange(range), range->firstNode()->renderer());
135 } 135 }
136 136
137 } // namespace blink 137 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderView.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698