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

Side by Side Diff: third_party/WebKit/Source/core/layout/svg/line/SVGInlineTextBox.cpp

Issue 2614883007: Change computed style enums to be prefixed with 'k'. (Closed)
Patch Set: Rebase on ToT. Created 3 years, 11 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) 2007 Rob Buis <buis@kde.org> 2 * Copyright (C) 2007 Rob Buis <buis@kde.org>
3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org> 3 * Copyright (C) 2007 Nikolas Zimmermann <zimmermann@kde.org>
4 * Copyright (C) Research In Motion Limited 2010. All rights reserved. 4 * Copyright (C) Research In Motion Limited 2010. 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 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
283 const LayoutPoint& accumulatedOffset, 283 const LayoutPoint& accumulatedOffset,
284 LayoutUnit, 284 LayoutUnit,
285 LayoutUnit) { 285 LayoutUnit) {
286 // FIXME: integrate with InlineTextBox::nodeAtPoint better. 286 // FIXME: integrate with InlineTextBox::nodeAtPoint better.
287 ASSERT(!isLineBreak()); 287 ASSERT(!isLineBreak());
288 288
289 PointerEventsHitRules hitRules(PointerEventsHitRules::SVG_TEXT_HITTESTING, 289 PointerEventsHitRules hitRules(PointerEventsHitRules::SVG_TEXT_HITTESTING,
290 result.hitTestRequest(), 290 result.hitTestRequest(),
291 getLineLayoutItem().style()->pointerEvents()); 291 getLineLayoutItem().style()->pointerEvents());
292 bool isVisible = 292 bool isVisible =
293 getLineLayoutItem().style()->visibility() == EVisibility::Visible; 293 getLineLayoutItem().style()->visibility() == EVisibility::kVisible;
294 if (isVisible || !hitRules.requireVisible) { 294 if (isVisible || !hitRules.requireVisible) {
295 if (hitRules.canHitBoundingBox || 295 if (hitRules.canHitBoundingBox ||
296 (hitRules.canHitStroke && 296 (hitRules.canHitStroke &&
297 (getLineLayoutItem().style()->svgStyle().hasStroke() || 297 (getLineLayoutItem().style()->svgStyle().hasStroke() ||
298 !hitRules.requireStroke)) || 298 !hitRules.requireStroke)) ||
299 (hitRules.canHitFill && 299 (hitRules.canHitFill &&
300 (getLineLayoutItem().style()->svgStyle().hasFill() || 300 (getLineLayoutItem().style()->svgStyle().hasFill() ||
301 !hitRules.requireFill))) { 301 !hitRules.requireFill))) {
302 LayoutRect rect(location(), size()); 302 LayoutRect rect(location(), size());
303 rect.moveBy(accumulatedOffset); 303 rect.moveBy(accumulatedOffset);
(...skipping 22 matching lines...) Expand all
326 return true; 326 return true;
327 } 327 }
328 } 328 }
329 } 329 }
330 } 330 }
331 } 331 }
332 return false; 332 return false;
333 } 333 }
334 334
335 } // namespace blink 335 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/layout/svg/SVGLayoutSupport.cpp ('k') | third_party/WebKit/Source/core/page/ChromeClient.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698