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

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

Issue 1511183003: Reland: Fix incorrect sign in scroll and content box offset in absoluteToLocalPoint. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserv ed.
4 * 4 *
5 * This library is free software; you can redistribute it and/or 5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Library General Public 6 * modify it under the terms of the GNU Library General Public
7 * License as published by the Free Software Foundation; either 7 * License as published by the Free Software Foundation; either
8 * version 2 of the License, or (at your option) any later version. 8 * version 2 of the License, or (at your option) any later version.
9 * 9 *
10 * This library is distributed in the hope that it will be useful, 10 * This library is distributed in the hope that it will be useful,
(...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 390
391 if (mode & UseTransforms && shouldUseTransformFromContainer(0)) { 391 if (mode & UseTransforms && shouldUseTransformFromContainer(0)) {
392 TransformationMatrix t; 392 TransformationMatrix t;
393 getTransformFromContainer(0, LayoutSize(), t); 393 getTransformFromContainer(0, LayoutSize(), t);
394 transformState.applyTransform(t); 394 transformState.applyTransform(t);
395 } 395 }
396 396
397 if (mode & TraverseDocumentBoundaries) { 397 if (mode & TraverseDocumentBoundaries) {
398 if (LayoutPart* parentDocLayoutObject = frame()->ownerLayoutObject()) { 398 if (LayoutPart* parentDocLayoutObject = frame()->ownerLayoutObject()) {
399 parentDocLayoutObject->mapAbsoluteToLocalPoint(mode, transformState) ; 399 parentDocLayoutObject->mapAbsoluteToLocalPoint(mode, transformState) ;
400 400 transformState.move(parentDocLayoutObject->contentBoxOffset());
401 transformState.move(-parentDocLayoutObject->contentBoxOffset()); 401 transformState.move(-frame()->view()->scrollOffset());
402 transformState.move(frame()->view()->scrollOffset());
403 } 402 }
404 } 403 }
405 } 404 }
406 405
407 void LayoutView::computeSelfHitTestRects(Vector<LayoutRect>& rects, const Layout Point&) const 406 void LayoutView::computeSelfHitTestRects(Vector<LayoutRect>& rects, const Layout Point&) const
408 { 407 {
409 // Record the entire size of the contents of the frame. Note that we don't j ust 408 // Record the entire size of the contents of the frame. Note that we don't j ust
410 // use the viewport size (containing block) here because we want to ensure t his includes 409 // use the viewport size (containing block) here because we want to ensure t his includes
411 // all children (so we can avoid walking them explicitly). 410 // all children (so we can avoid walking them explicitly).
412 rects.append(LayoutRect(LayoutPoint::zero(), LayoutSize(frameView()->content sSize()))); 411 rects.append(LayoutRect(LayoutPoint::zero(), LayoutSize(frameView()->content sSize())));
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
1006 } 1005 }
1007 1006
1008 void LayoutView::sendMediaPositionChangeNotifications(const IntRect& visibleRect ) 1007 void LayoutView::sendMediaPositionChangeNotifications(const IntRect& visibleRect )
1009 { 1008 {
1010 for (auto& media : m_mediaForPositionNotification) { 1009 for (auto& media : m_mediaForPositionNotification) {
1011 media->notifyPositionMayHaveChanged(visibleRect); 1010 media->notifyPositionMayHaveChanged(visibleRect);
1012 } 1011 }
1013 } 1012 }
1014 1013
1015 } // namespace blink 1014 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698