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

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

Issue 914573003: Revert "We need to account for culled inline parents of the hit-tested..." (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 10 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/line/InlineFlowBox.cpp ('k') | no next file » | 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) 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 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved. 4 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 793 matching lines...) Expand 10 before | Expand all | Expand 10 after
804 private: 804 private:
805 bool m_intersected; 805 bool m_intersected;
806 Region& m_region; 806 Region& m_region;
807 const HitTestLocation& m_location; 807 const HitTestLocation& m_location;
808 }; 808 };
809 809
810 } // unnamed namespace 810 } // unnamed namespace
811 811
812 bool RenderInline::hitTestCulledInline(const HitTestRequest& request, HitTestRes ult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accu mulatedOffset) 812 bool RenderInline::hitTestCulledInline(const HitTestRequest& request, HitTestRes ult& result, const HitTestLocation& locationInContainer, const LayoutPoint& accu mulatedOffset)
813 { 813 {
814 ASSERT(!alwaysCreateLineBoxes()); 814 ASSERT(result.isRectBasedTest() && !alwaysCreateLineBoxes());
815 if (!visibleToHitTestRequest(request)) 815 if (!visibleToHitTestRequest(request))
816 return false; 816 return false;
817 817
818 HitTestLocation tmpLocation(locationInContainer, -toLayoutSize(accumulatedOf fset)); 818 HitTestLocation tmpLocation(locationInContainer, -toLayoutSize(accumulatedOf fset));
819 819
820 Region regionResult; 820 Region regionResult;
821 HitTestCulledInlinesGeneratorContext context(regionResult, tmpLocation); 821 HitTestCulledInlinesGeneratorContext context(regionResult, tmpLocation);
822 generateCulledLineBoxRects(context, this); 822 generateCulledLineBoxRects(context, this);
823 823
824 if (context.intersected()) { 824 if (context.intersected()) {
(...skipping 627 matching lines...) Expand 10 before | Expand all | Expand 10 after
1452 } 1452 }
1453 1453
1454 void RenderInline::invalidateDisplayItemClients(DisplayItemList* displayItemList ) const 1454 void RenderInline::invalidateDisplayItemClients(DisplayItemList* displayItemList ) const
1455 { 1455 {
1456 RenderBoxModelObject::invalidateDisplayItemClients(displayItemList); 1456 RenderBoxModelObject::invalidateDisplayItemClients(displayItemList);
1457 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox()) 1457 for (InlineFlowBox* box = firstLineBox(); box; box = box->nextLineBox())
1458 displayItemList->invalidate(box->displayItemClient()); 1458 displayItemList->invalidate(box->displayItemClient());
1459 } 1459 }
1460 1460
1461 } // namespace blink 1461 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/layout/line/InlineFlowBox.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698