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

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

Issue 329773002: Remove special touch-action hit test mode (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: incorporated review comments Created 6 years, 6 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/rendering/HitTestRequest.h ('k') | Source/core/rendering/RenderObject.h » ('j') | 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) 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All r ights reserved. 2 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011 Apple Inc. All r ights reserved.
3 * 3 *
4 * This library is free software; you can redistribute it and/or 4 * This library is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU Library General Public 5 * modify it under the terms of the GNU Library General Public
6 * License as published by the Free Software Foundation; either 6 * License as published by the Free Software Foundation; either
7 * version 2 of the License, or (at your option) any later version. 7 * version 2 of the License, or (at your option) any later version.
8 * 8 *
9 * This library is distributed in the hope that it will be useful, 9 * This library is distributed in the hope that it will be useful,
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of 10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
266 virtual bool canAccommodateEllipsis(bool ltr, int blockEdge, int ellipsisWid th) const; 266 virtual bool canAccommodateEllipsis(bool ltr, int blockEdge, int ellipsisWid th) const;
267 // visibleLeftEdge, visibleRightEdge are in the parent's coordinate system. 267 // visibleLeftEdge, visibleRightEdge are in the parent's coordinate system.
268 virtual float placeEllipsisBox(bool ltr, float visibleLeftEdge, float visibl eRightEdge, float ellipsisWidth, float &truncatedWidth, bool&); 268 virtual float placeEllipsisBox(bool ltr, float visibleLeftEdge, float visibl eRightEdge, float ellipsisWidth, float &truncatedWidth, bool&);
269 269
270 #ifndef NDEBUG 270 #ifndef NDEBUG
271 void setHasBadParent(); 271 void setHasBadParent();
272 #endif 272 #endif
273 273
274 int expansion() const { return m_bitfields.expansion(); } 274 int expansion() const { return m_bitfields.expansion(); }
275 275
276 bool visibleForTouchAction() const { return false; } 276 bool visibleToHitTestRequest(const HitTestRequest& request) const { return r enderer().visibleToHitTestRequest(request); }
277 bool visibleToHitTestRequest(const HitTestRequest& request) const
278 {
279 if (request.touchAction() && !visibleForTouchAction())
280 return false;
281 return renderer().visibleToHitTestRequest(request);
282 }
283 277
284 EVerticalAlign verticalAlign() const { return renderer().style(m_bitfields.f irstLine())->verticalAlign(); } 278 EVerticalAlign verticalAlign() const { return renderer().style(m_bitfields.f irstLine())->verticalAlign(); }
285 279
286 // Use with caution! The type is not checked! 280 // Use with caution! The type is not checked!
287 RenderBoxModelObject* boxModelObject() const 281 RenderBoxModelObject* boxModelObject() const
288 { 282 {
289 if (!renderer().isText()) 283 if (!renderer().isText())
290 return toRenderBoxModelObject(&renderer()); 284 return toRenderBoxModelObject(&renderer());
291 return 0; 285 return 0;
292 } 286 }
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 439
446 } // namespace WebCore 440 } // namespace WebCore
447 441
448 #ifndef NDEBUG 442 #ifndef NDEBUG
449 // Outside the WebCore namespace for ease of invocation from gdb. 443 // Outside the WebCore namespace for ease of invocation from gdb.
450 void showTree(const WebCore::InlineBox*); 444 void showTree(const WebCore::InlineBox*);
451 void showLineTree(const WebCore::InlineBox*); 445 void showLineTree(const WebCore::InlineBox*);
452 #endif 446 #endif
453 447
454 #endif // InlineBox_h 448 #endif // InlineBox_h
OLDNEW
« no previous file with comments | « Source/core/rendering/HitTestRequest.h ('k') | Source/core/rendering/RenderObject.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698