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

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

Issue 17471008: Rework compositor touch hit testing (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Fix lifetime issue with Internals::m_currentTouchEventRects 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 Apple Inc. All r ights reserved. 5 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All r ights reserved.
6 * 6 *
7 * This library is free software; you can redistribute it and/or 7 * This library is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Library General Public 8 * modify it under the terms of the GNU Library General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2 of the License, or (at your option) any later version. 10 * version 2 of the License, or (at your option) any later version.
(...skipping 550 matching lines...) Expand 10 before | Expand all | Expand 10 after
561 protected: 561 protected:
562 virtual void addOverflowFromChildren(); 562 virtual void addOverflowFromChildren();
563 void addOverflowFromFloats(); 563 void addOverflowFromFloats();
564 void addOverflowFromPositionedObjects(); 564 void addOverflowFromPositionedObjects();
565 void addOverflowFromBlockChildren(); 565 void addOverflowFromBlockChildren();
566 void addOverflowFromInlineChildren(); 566 void addOverflowFromInlineChildren();
567 void addVisualOverflowFromTheme(); 567 void addVisualOverflowFromTheme();
568 568
569 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& addition alOffset, const RenderLayerModelObject* paintContainer = 0) OVERRIDE; 569 virtual void addFocusRingRects(Vector<IntRect>&, const LayoutPoint& addition alOffset, const RenderLayerModelObject* paintContainer = 0) OVERRIDE;
570 570
571 virtual void computeOwnHitTestRects(Vector<IntRect>&, const LayoutPoint& lay erOffset) const OVERRIDE;
leviw_travelin_and_unemployed 2013/07/18 18:08:39 "Own" seems redundant to me.
Rick Byers 2013/07/18 19:58:52 I wanted to clearly differentiate it from the publ
leviw_travelin_and_unemployed 2013/07/18 20:21:48 I like computeSelfHitTestRects
Rick Byers 2013/07/18 22:20:32 Done.
572
571 // Only used by RenderSVGText, which explicitly overrides RenderBlock::layou tBlock(), do NOT use for anything else. 573 // Only used by RenderSVGText, which explicitly overrides RenderBlock::layou tBlock(), do NOT use for anything else.
572 void forceLayoutInlineChildren() 574 void forceLayoutInlineChildren()
573 { 575 {
574 LayoutUnit repaintLogicalTop = 0; 576 LayoutUnit repaintLogicalTop = 0;
575 LayoutUnit repaintLogicalBottom = 0; 577 LayoutUnit repaintLogicalBottom = 0;
576 clearFloats(); 578 clearFloats();
577 layoutInlineChildren(true, repaintLogicalTop, repaintLogicalBottom); 579 layoutInlineChildren(true, repaintLogicalTop, repaintLogicalBottom);
578 } 580 }
579 581
580 bool updateRegionsAndShapesLogicalSize(RenderFlowThread*); 582 bool updateRegionsAndShapesLogicalSize(RenderFlowThread*);
(...skipping 762 matching lines...) Expand 10 before | Expand all | Expand 10 after
1343 static String string(const int value); 1345 static String string(const int value);
1344 }; 1346 };
1345 template<> struct ValueToString<RenderBlock::FloatingObject*> { 1347 template<> struct ValueToString<RenderBlock::FloatingObject*> {
1346 static String string(const RenderBlock::FloatingObject*); 1348 static String string(const RenderBlock::FloatingObject*);
1347 }; 1349 };
1348 #endif 1350 #endif
1349 1351
1350 } // namespace WebCore 1352 } // namespace WebCore
1351 1353
1352 #endif // RenderBlock_h 1354 #endif // RenderBlock_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698