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

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: 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 * 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 1365 matching lines...) Expand 10 before | Expand all | Expand 10 after
1376 } 1376 }
1377 1377
1378 if (continuation()) { 1378 if (continuation()) {
1379 if (continuation()->isInline()) 1379 if (continuation()->isInline())
1380 continuation()->addFocusRingRects(rects, flooredLayoutPoint(addition alOffset + continuation()->containingBlock()->location() - containingBlock()->lo cation()), paintContainer); 1380 continuation()->addFocusRingRects(rects, flooredLayoutPoint(addition alOffset + continuation()->containingBlock()->location() - containingBlock()->lo cation()), paintContainer);
1381 else 1381 else
1382 continuation()->addFocusRingRects(rects, flooredLayoutPoint(addition alOffset + toRenderBox(continuation())->location() - containingBlock()->location ()), paintContainer); 1382 continuation()->addFocusRingRects(rects, flooredLayoutPoint(addition alOffset + toRenderBox(continuation())->location() - containingBlock()->location ()), paintContainer);
1383 } 1383 }
1384 } 1384 }
1385 1385
1386 void RenderInline::computeOwnHitTestRects(Vector<IntRect>& rects, const LayoutPo int& layerOffset) const
1387 {
1388 AbsoluteRectsGeneratorContext context(rects, layerOffset);
1389 generateLineBoxRects(context);
1390 }
1391
1386 void RenderInline::paintOutline(PaintInfo& paintInfo, const LayoutPoint& paintOf fset) 1392 void RenderInline::paintOutline(PaintInfo& paintInfo, const LayoutPoint& paintOf fset)
1387 { 1393 {
1388 if (!hasOutline()) 1394 if (!hasOutline())
1389 return; 1395 return;
1390 1396
1391 RenderStyle* styleToUse = style(); 1397 RenderStyle* styleToUse = style();
1392 if (styleToUse->outlineStyleIsAuto() || hasOutlineAnnotation()) { 1398 if (styleToUse->outlineStyleIsAuto() || hasOutlineAnnotation()) {
1393 if (theme()->shouldDrawDefaultFocusRing(this)) { 1399 if (theme()->shouldDrawDefaultFocusRing(this)) {
1394 // Only paint the focus ring by hand if the theme isn't able to draw the focus ring. 1400 // Only paint the focus ring by hand if the theme isn't able to draw the focus ring.
1395 paintFocusRing(paintInfo, paintOffset, styleToUse); 1401 paintFocusRing(paintInfo, paintOffset, styleToUse);
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
1555 container = this; 1561 container = this;
1556 1562
1557 FloatPoint absPos = container->localToAbsolute(); 1563 FloatPoint absPos = container->localToAbsolute();
1558 region.bounds.setX(absPos.x() + region.bounds.x()); 1564 region.bounds.setX(absPos.x() + region.bounds.x());
1559 region.bounds.setY(absPos.y() + region.bounds.y()); 1565 region.bounds.setY(absPos.y() + region.bounds.y());
1560 1566
1561 regions.append(region); 1567 regions.append(region);
1562 } 1568 }
1563 1569
1564 } // namespace WebCore 1570 } // namespace WebCore
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698