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

Side by Side Diff: Source/core/rendering/RenderInline.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 * 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 1366 matching lines...) Expand 10 before | Expand all | Expand 10 after
1377 } 1377 }
1378 1378
1379 if (continuation()) { 1379 if (continuation()) {
1380 if (continuation()->isInline()) 1380 if (continuation()->isInline())
1381 continuation()->addFocusRingRects(rects, flooredLayoutPoint(addition alOffset + continuation()->containingBlock()->location() - containingBlock()->lo cation()), paintContainer); 1381 continuation()->addFocusRingRects(rects, flooredLayoutPoint(addition alOffset + continuation()->containingBlock()->location() - containingBlock()->lo cation()), paintContainer);
1382 else 1382 else
1383 continuation()->addFocusRingRects(rects, flooredLayoutPoint(addition alOffset + toRenderBox(continuation())->location() - containingBlock()->location ()), paintContainer); 1383 continuation()->addFocusRingRects(rects, flooredLayoutPoint(addition alOffset + toRenderBox(continuation())->location() - containingBlock()->location ()), paintContainer);
1384 } 1384 }
1385 } 1385 }
1386 1386
1387 void RenderInline::computeOwnHitTestRects(Vector<IntRect>& rects, const LayoutPo int& layerOffset) const
1388 {
1389 AbsoluteRectsGeneratorContext context(rects, layerOffset);
1390 generateLineBoxRects(context);
1391 }
1392
1387 void RenderInline::paintOutline(PaintInfo& paintInfo, const LayoutPoint& paintOf fset) 1393 void RenderInline::paintOutline(PaintInfo& paintInfo, const LayoutPoint& paintOf fset)
1388 { 1394 {
1389 if (!hasOutline()) 1395 if (!hasOutline())
1390 return; 1396 return;
1391 1397
1392 RenderStyle* styleToUse = style(); 1398 RenderStyle* styleToUse = style();
1393 if (styleToUse->outlineStyleIsAuto() || hasOutlineAnnotation()) { 1399 if (styleToUse->outlineStyleIsAuto() || hasOutlineAnnotation()) {
1394 if (theme()->shouldDrawDefaultFocusRing(this)) { 1400 if (theme()->shouldDrawDefaultFocusRing(this)) {
1395 // Only paint the focus ring by hand if the theme isn't able to draw the focus ring. 1401 // Only paint the focus ring by hand if the theme isn't able to draw the focus ring.
1396 paintFocusRing(paintInfo, paintOffset, styleToUse); 1402 paintFocusRing(paintInfo, paintOffset, styleToUse);
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
1564 1570
1565 void RenderInline::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const 1571 void RenderInline::reportMemoryUsage(MemoryObjectInfo* memoryObjectInfo) const
1566 { 1572 {
1567 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ; 1573 MemoryClassInfo info(memoryObjectInfo, this, PlatformMemoryTypes::Rendering) ;
1568 RenderBoxModelObject::reportMemoryUsage(memoryObjectInfo); 1574 RenderBoxModelObject::reportMemoryUsage(memoryObjectInfo);
1569 info.addMember(m_children, "children"); 1575 info.addMember(m_children, "children");
1570 info.addMember(m_lineBoxes, "lineBoxes"); 1576 info.addMember(m_lineBoxes, "lineBoxes");
1571 } 1577 }
1572 1578
1573 } // namespace WebCore 1579 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698