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

Unified Diff: Source/core/frame/FrameView.h

Issue 967213004: Removed FrameView's windowToContents and contentsToWindow methods. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/frame/FrameView.h
diff --git a/Source/core/frame/FrameView.h b/Source/core/frame/FrameView.h
index e17893b2d44f73bce4eb4d9826adfb86e757c15c..769f4cdad8378cb1922b11b76b71a6458dc12214 100644
--- a/Source/core/frame/FrameView.h
+++ b/Source/core/frame/FrameView.h
@@ -473,18 +473,21 @@ public:
bool drawPanScrollIcon() { return m_shouldDrawPanScrollIcon; }
IntPoint rootFrameToContents(const IntPoint&) const;
Rick Byers 2015/03/05 17:56:20 Can you add a brief description of each of the co-
bokan 2015/03/06 21:54:37 Done.
+ FloatPoint rootFrameToContents(const FloatPoint&) const;
IntRect rootFrameToContents(const IntRect&) const;
IntPoint contentsToRootFrame(const IntPoint&) const;
IntRect contentsToRootFrame(const IntRect&) const;
- // Event coordinates are assumed to be in the coordinate space of a window that contains
- // the entire widget hierarchy. It is up to the platform to decide what the precise definition
- // of containing window is. (For example on Mac it is the containing NSWindow.)
Rick Byers 2015/03/05 17:56:20 Does any of this comment still apply? Eg. your CL
bokan 2015/03/06 21:54:37 I don't think so, I think this comment is out of d
Rick Byers 2015/03/07 15:44:08 Nice, that would be an improvement if it's true (a
- IntPoint windowToContents(const IntPoint&) const;
- FloatPoint windowToContents(const FloatPoint&) const;
- IntPoint contentsToWindow(const IntPoint&) const;
- IntRect windowToContents(const IntRect&) const;
- IntRect contentsToWindow(const IntRect&) const;
+ IntRect viewportToContents(const IntRect&) const;
+ IntRect contentsToViewport(const IntRect&) const;
+ IntPoint contentsToViewport(const IntPoint&) const;
+ IntPoint viewportToContents(const IntPoint&) const;
+
+ // FIXME: Some external callers expect to get back a rect that's positioned
+ // in viewport space, but sized in CSS pixels. This is an artefact of the
Rick Byers 2015/03/05 17:56:20 nit: artifact
bokan 2015/03/06 21:54:37 Done. (Though either works: http://english.stackex
Rick Byers 2015/03/07 15:44:08 Oh sorry! I thought this was just a typo - I'm no
+ // old pinch-zoom path. These callers should be converted to expect a rect
+ // fully in viewport space. crbug.com/459591.
+ IntRect soonToBeRemovedContentsToUnscaledViewport(const IntRect&) const;
// Methods for converting between Frame and Content (i.e. Document) coordinates.
// Frame coordinates are relative to the top left corner of the frame and so

Powered by Google App Engine
This is Rietveld 408576698