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

Side by Side Diff: Source/core/rendering/InlineFlowBox.cpp

Issue 137123009: Add hittest mode for Touch-action which ignore inline elements and svg elements (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: incorporated review comments Created 6 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
« no previous file with comments | « Source/core/rendering/HitTestRequest.h ('k') | Source/core/rendering/RenderBlock.h » ('j') | 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) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 1035 matching lines...) Expand 10 before | Expand all | Expand 10 after
1046 LayoutUnit bottom = min(rootBox->lineBottom(), top + logicalHeight); 1046 LayoutUnit bottom = min(rootBox->lineBottom(), top + logicalHeight);
1047 top = max(rootBox->lineTop(), top); 1047 top = max(rootBox->lineTop(), top);
1048 logicalHeight = bottom - top; 1048 logicalHeight = bottom - top;
1049 } 1049 }
1050 1050
1051 // Move x/y to our coordinates. 1051 // Move x/y to our coordinates.
1052 LayoutRect rect(minX, minY, width, height); 1052 LayoutRect rect(minX, minY, width, height);
1053 flipForWritingMode(rect); 1053 flipForWritingMode(rect);
1054 rect.moveBy(accumulatedOffset); 1054 rect.moveBy(accumulatedOffset);
1055 1055
1056 if (request.touchAction())
1057 return false;
1058
1056 if (visibleToHitTestRequest(request) && locationInContainer.intersects(rect) ) { 1059 if (visibleToHitTestRequest(request) && locationInContainer.intersects(rect) ) {
gnana 2014/02/27 13:26:59 i feel this rect should have been computed from re
Rick Byers 2014/02/27 14:53:11 Ah, this makes sense. The RenderBlock has a bunch
gnana 2014/02/28 10:04:25 Moved the change to InlineBox Done.
1057 renderer()->updateHitTestResult(result, flipForWritingMode(locationInCon tainer.point() - toLayoutSize(accumulatedOffset))); // Don't add in m_x or m_y h ere, we want coords in the containing block's space. 1060 renderer()->updateHitTestResult(result, flipForWritingMode(locationInCon tainer.point() - toLayoutSize(accumulatedOffset))); // Don't add in m_x or m_y h ere, we want coords in the containing block's space.
1058 if (!result.addNodeToRectBasedTestResult(renderer()->node(), request, lo cationInContainer, rect)) 1061 if (!result.addNodeToRectBasedTestResult(renderer()->node(), request, lo cationInContainer, rect))
1059 return true; 1062 return true;
1060 } 1063 }
1061 1064
1062 return false; 1065 return false;
1063 } 1066 }
1064 1067
1065 void InlineFlowBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom) 1068 void InlineFlowBox::paint(PaintInfo& paintInfo, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom)
1066 { 1069 {
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
1634 ASSERT(child->prevOnLine() == prev); 1637 ASSERT(child->prevOnLine() == prev);
1635 prev = child; 1638 prev = child;
1636 } 1639 }
1637 ASSERT(prev == m_lastChild); 1640 ASSERT(prev == m_lastChild);
1638 #endif 1641 #endif
1639 } 1642 }
1640 1643
1641 #endif 1644 #endif
1642 1645
1643 } // namespace WebCore 1646 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/HitTestRequest.h ('k') | Source/core/rendering/RenderBlock.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698