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

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

Issue 1506053004: Revert of 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 371 matching lines...) Expand 10 before | Expand all | Expand 10 after
382 382
383 if (mode & UseTransforms && shouldUseTransformFromContainer(0)) { 383 if (mode & UseTransforms && shouldUseTransformFromContainer(0)) {
384 TransformationMatrix t; 384 TransformationMatrix t;
385 getTransformFromContainer(0, LayoutSize(), t); 385 getTransformFromContainer(0, LayoutSize(), t);
386 transformState.applyTransform(t); 386 transformState.applyTransform(t);
387 } 387 }
388 388
389 if (mode & TraverseDocumentBoundaries) { 389 if (mode & TraverseDocumentBoundaries) {
390 if (LayoutPart* parentDocLayoutObject = frame()->ownerLayoutObject()) { 390 if (LayoutPart* parentDocLayoutObject = frame()->ownerLayoutObject()) {
391 parentDocLayoutObject->mapAbsoluteToLocalPoint(mode, transformState) ; 391 parentDocLayoutObject->mapAbsoluteToLocalPoint(mode, transformState) ;
392 transformState.move(parentDocLayoutObject->contentBoxOffset()); 392
393 transformState.move(-frame()->view()->scrollOffset()); 393 transformState.move(-parentDocLayoutObject->contentBoxOffset());
394 transformState.move(frame()->view()->scrollOffset());
394 } 395 }
395 } 396 }
396 } 397 }
397 398
398 void LayoutView::computeSelfHitTestRects(Vector<LayoutRect>& rects, const Layout Point&) const 399 void LayoutView::computeSelfHitTestRects(Vector<LayoutRect>& rects, const Layout Point&) const
399 { 400 {
400 // Record the entire size of the contents of the frame. Note that we don't j ust 401 // Record the entire size of the contents of the frame. Note that we don't j ust
401 // use the viewport size (containing block) here because we want to ensure t his includes 402 // use the viewport size (containing block) here because we want to ensure t his includes
402 // all children (so we can avoid walking them explicitly). 403 // all children (so we can avoid walking them explicitly).
403 rects.append(LayoutRect(LayoutPoint::zero(), LayoutSize(frameView()->content sSize()))); 404 rects.append(LayoutRect(LayoutPoint::zero(), LayoutSize(frameView()->content sSize())));
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
997 } 998 }
998 999
999 void LayoutView::sendMediaPositionChangeNotifications(const IntRect& visibleRect ) 1000 void LayoutView::sendMediaPositionChangeNotifications(const IntRect& visibleRect )
1000 { 1001 {
1001 for (auto& media : m_mediaForPositionNotification) { 1002 for (auto& media : m_mediaForPositionNotification) {
1002 media->notifyPositionMayHaveChanged(visibleRect); 1003 media->notifyPositionMayHaveChanged(visibleRect);
1003 } 1004 }
1004 } 1005 }
1005 1006
1006 } // namespace blink 1007 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698