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

Side by Side Diff: Source/core/layout/LayoutFlowThread.cpp

Issue 1032823003: Refactor HitTestResult to store the HitTestRequest (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Updated as per review comments Created 5 years, 8 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/layout/LayoutFlowThread.h ('k') | Source/core/layout/LayoutImage.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) 2011 Adobe Systems Incorporated. All rights reserved. 2 * Copyright (C) 2011 Adobe Systems Incorporated. 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above 8 * 1. Redistributions of source code must retain the above
9 * copyright notice, this list of conditions and the following 9 * copyright notice, this list of conditions and the following
10 * disclaimer. 10 * disclaimer.
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 { 116 {
117 computedValues.m_position = logicalTop; 117 computedValues.m_position = logicalTop;
118 computedValues.m_extent = 0; 118 computedValues.m_extent = 0;
119 119
120 for (LayoutMultiColumnSetList::const_iterator iter = m_multiColumnSetList.be gin(); iter != m_multiColumnSetList.end(); ++iter) { 120 for (LayoutMultiColumnSetList::const_iterator iter = m_multiColumnSetList.be gin(); iter != m_multiColumnSetList.end(); ++iter) {
121 LayoutMultiColumnSet* columnSet = *iter; 121 LayoutMultiColumnSet* columnSet = *iter;
122 computedValues.m_extent += columnSet->logicalHeightInFlowThread(); 122 computedValues.m_extent += columnSet->logicalHeightInFlowThread();
123 } 123 }
124 } 124 }
125 125
126 bool LayoutFlowThread::nodeAtPoint(const HitTestRequest& request, HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumula tedOffset, HitTestAction hitTestAction) 126 bool LayoutFlowThread::nodeAtPoint(HitTestResult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction hitTes tAction)
127 { 127 {
128 if (hitTestAction == HitTestBlockBackground) 128 if (hitTestAction == HitTestBlockBackground)
129 return false; 129 return false;
130 return LayoutBlockFlow::nodeAtPoint(request, result, locationInContainer, ac cumulatedOffset, hitTestAction); 130 return LayoutBlockFlow::nodeAtPoint(result, locationInContainer, accumulated Offset, hitTestAction);
131 } 131 }
132 132
133 LayoutUnit LayoutFlowThread::pageLogicalHeightForOffset(LayoutUnit offset) 133 LayoutUnit LayoutFlowThread::pageLogicalHeightForOffset(LayoutUnit offset)
134 { 134 {
135 LayoutMultiColumnSet* columnSet = columnSetAtBlockOffset(offset); 135 LayoutMultiColumnSet* columnSet = columnSetAtBlockOffset(offset);
136 if (!columnSet) 136 if (!columnSet)
137 return 0; 137 return 0;
138 138
139 return columnSet->pageLogicalHeight(); 139 return columnSet->pageLogicalHeight();
140 } 140 }
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 213
214 void LayoutFlowThread::MultiColumnSetSearchAdapter::collectIfNeeded(const MultiC olumnSetInterval& interval) 214 void LayoutFlowThread::MultiColumnSetSearchAdapter::collectIfNeeded(const MultiC olumnSetInterval& interval)
215 { 215 {
216 if (m_result) 216 if (m_result)
217 return; 217 return;
218 if (interval.low() <= m_offset && interval.high() > m_offset) 218 if (interval.low() <= m_offset && interval.high() > m_offset)
219 m_result = interval.data(); 219 m_result = interval.data();
220 } 220 }
221 221
222 } // namespace blink 222 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/LayoutFlowThread.h ('k') | Source/core/layout/LayoutImage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698