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

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

Issue 17471008: Rework compositor touch hit testing (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Various fixes and test additions Created 7 years, 5 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
3 * (C) 1999 Antti Koivisto (koivisto@kde.org) 3 * (C) 1999 Antti Koivisto (koivisto@kde.org)
4 * (C) 2007 David Smith (catfish.man@gmail.com) 4 * (C) 2007 David Smith (catfish.man@gmail.com)
5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
6 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 6 * Copyright (C) Research In Motion Limited 2010. All rights reserved.
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 7201 matching lines...) Expand 10 before | Expand all | Expand 10 after
7212 pos = FloatPoint(additionalOffset.x() + box->x(), additional Offset.y() + box->y()); 7212 pos = FloatPoint(additionalOffset.x() + box->x(), additional Offset.y() + box->y());
7213 box->addFocusRingRects(rects, flooredLayoutPoint(pos), paintCont ainer); 7213 box->addFocusRingRects(rects, flooredLayoutPoint(pos), paintCont ainer);
7214 } 7214 }
7215 } 7215 }
7216 } 7216 }
7217 7217
7218 if (inlineElementContinuation()) 7218 if (inlineElementContinuation())
7219 inlineElementContinuation()->addFocusRingRects(rects, flooredLayoutPoint (additionalOffset + inlineElementContinuation()->containingBlock()->location() - location()), paintContainer); 7219 inlineElementContinuation()->addFocusRingRects(rects, flooredLayoutPoint (additionalOffset + inlineElementContinuation()->containingBlock()->location() - location()), paintContainer);
7220 } 7220 }
7221 7221
7222 void RenderBlock::computeOwnHitTestRects(Vector<IntRect>& rects, const LayoutPoi nt& layerOffset) const
7223 {
7224 RenderBox::computeOwnHitTestRects(rects, layerOffset);
7225
7226 if (hasHorizontalLayoutOverflow() || hasVerticalLayoutOverflow()) {
7227 for (RootInlineBox* curr = firstRootBox(); curr; curr = curr->nextRootBo x()) {
7228 LayoutUnit top = max<LayoutUnit>(curr->lineTop(), curr->top());
7229 LayoutUnit bottom = min<LayoutUnit>(curr->lineBottom(), curr->top() + curr->height());
7230 IntRect rect(pixelSnappedIntRect(layerOffset.x() + curr->x(), layerO ffset.y() + top, curr->width(), bottom - top));
7231 // It's common for this rect to be entirely contained in our box, so exclude that simple case.
7232 if (!rect.isEmpty() && (rects.isEmpty() || !rects[0].contains(rect)) )
7233 rects.append(rect);
7234 }
7235 }
7236 }
7237
7222 RenderBox* RenderBlock::createAnonymousBoxWithSameTypeAs(const RenderObject* par ent) const 7238 RenderBox* RenderBlock::createAnonymousBoxWithSameTypeAs(const RenderObject* par ent) const
7223 { 7239 {
7224 if (isAnonymousColumnsBlock()) 7240 if (isAnonymousColumnsBlock())
7225 return createAnonymousColumnsWithParentRenderer(parent); 7241 return createAnonymousColumnsWithParentRenderer(parent);
7226 if (isAnonymousColumnSpanBlock()) 7242 if (isAnonymousColumnSpanBlock())
7227 return createAnonymousColumnSpanWithParentRenderer(parent); 7243 return createAnonymousColumnSpanWithParentRenderer(parent);
7228 return createAnonymousWithParentRendererAndDisplay(parent, style()->display( )); 7244 return createAnonymousWithParentRendererAndDisplay(parent, style()->display( ));
7229 } 7245 }
7230 7246
7231 bool RenderBlock::hasNextPage(LayoutUnit logicalOffset, PageBoundaryRule pageBou ndaryRule) const 7247 bool RenderBlock::hasNextPage(LayoutUnit logicalOffset, PageBoundaryRule pageBou ndaryRule) const
(...skipping 916 matching lines...) Expand 10 before | Expand all | Expand 10 after
8148 { 8164 {
8149 memoryInstrumentation->addRootObject(gColumnInfoMap, WebCoreMemoryTypes::Ren deringStructures); 8165 memoryInstrumentation->addRootObject(gColumnInfoMap, WebCoreMemoryTypes::Ren deringStructures);
8150 memoryInstrumentation->addRootObject(gPositionedDescendantsMap, WebCoreMemor yTypes::RenderingStructures); 8166 memoryInstrumentation->addRootObject(gPositionedDescendantsMap, WebCoreMemor yTypes::RenderingStructures);
8151 memoryInstrumentation->addRootObject(gPercentHeightDescendantsMap, WebCoreMe moryTypes::RenderingStructures); 8167 memoryInstrumentation->addRootObject(gPercentHeightDescendantsMap, WebCoreMe moryTypes::RenderingStructures);
8152 memoryInstrumentation->addRootObject(gPositionedContainerMap, WebCoreMemoryT ypes::RenderingStructures); 8168 memoryInstrumentation->addRootObject(gPositionedContainerMap, WebCoreMemoryT ypes::RenderingStructures);
8153 memoryInstrumentation->addRootObject(gPercentHeightContainerMap, WebCoreMemo ryTypes::RenderingStructures); 8169 memoryInstrumentation->addRootObject(gPercentHeightContainerMap, WebCoreMemo ryTypes::RenderingStructures);
8154 memoryInstrumentation->addRootObject(gDelayedUpdateScrollInfoSet, WebCoreMem oryTypes::RenderingStructures); 8170 memoryInstrumentation->addRootObject(gDelayedUpdateScrollInfoSet, WebCoreMem oryTypes::RenderingStructures);
8155 } 8171 }
8156 8172
8157 } // namespace WebCore 8173 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698