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

Side by Side Diff: Source/core/rendering/RenderObject.cpp

Issue 220343002: Update touch-action hit-testing to match latest spec changes. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Move visibleForTouchAction() to cpp file Created 6 years, 8 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/rendering/RenderObject.h ('k') | Source/core/rendering/svg/RenderSVGRoot.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) 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) 2000 Dirk Mueller (mueller@kde.org) 4 * (C) 2000 Dirk Mueller (mueller@kde.org)
5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com) 5 * (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed. 6 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2011 Apple Inc. All rights reserv ed.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/) 8 * Copyright (C) 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmo bile.com/)
9 * 9 *
10 * This library is free software; you can redistribute it and/or 10 * This library is free software; you can redistribute it and/or
(...skipping 3137 matching lines...) Expand 10 before | Expand all | Expand 10 after
3148 } 3148 }
3149 3149
3150 bool RenderObject::isInert() const 3150 bool RenderObject::isInert() const
3151 { 3151 {
3152 const RenderObject* renderer = this; 3152 const RenderObject* renderer = this;
3153 while (!renderer->node()) 3153 while (!renderer->node())
3154 renderer = renderer->parent(); 3154 renderer = renderer->parent();
3155 return renderer->node()->isInert(); 3155 return renderer->node()->isInert();
3156 } 3156 }
3157 3157
3158 // touch-action applies to all elements with both width AND height properties.
3159 // According to the CSS Box Model Spec (http://dev.w3.org/csswg/css-box/#the-wid th-and-height-properties)
3160 // width applies to all elements but non-replaced inline elements, table rows, a nd row groups and
3161 // height applies to all elements but non-replaced inline elements, table column s, and column groups.
3162 bool RenderObject::visibleForTouchAction() const
3163 {
3164 if (isInline() && !isReplaced())
3165 return false;
3166 if (isTableRow() || isRenderTableCol())
3167 return false;
3168
3169 return true;
3170 }
3171
3158 void RenderObject::imageChanged(ImageResource* image, const IntRect* rect) 3172 void RenderObject::imageChanged(ImageResource* image, const IntRect* rect)
3159 { 3173 {
3160 imageChanged(static_cast<WrappedImagePtr>(image), rect); 3174 imageChanged(static_cast<WrappedImagePtr>(image), rect);
3161 } 3175 }
3162 3176
3163 Element* RenderObject::offsetParent() const 3177 Element* RenderObject::offsetParent() const
3164 { 3178 {
3165 if (isRoot() || isBody()) 3179 if (isRoot() || isBody())
3166 return 0; 3180 return 0;
3167 3181
(...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after
3367 { 3381 {
3368 if (object1) { 3382 if (object1) {
3369 const WebCore::RenderObject* root = object1; 3383 const WebCore::RenderObject* root = object1;
3370 while (root->parent()) 3384 while (root->parent())
3371 root = root->parent(); 3385 root = root->parent();
3372 root->showRenderTreeAndMark(object1, "*", object2, "-", 0); 3386 root->showRenderTreeAndMark(object1, "*", object2, "-", 0);
3373 } 3387 }
3374 } 3388 }
3375 3389
3376 #endif 3390 #endif
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderObject.h ('k') | Source/core/rendering/svg/RenderSVGRoot.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698