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

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

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/RenderBlock.h ('k') | Source/core/rendering/RenderObject.cpp » ('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) 2000 Lars Knoll (knoll@kde.org) 2 * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
3 * (C) 2000 Antti Koivisto (koivisto@kde.org) 3 * (C) 2000 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) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved. 6 * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All r ights reserved.
7 * Copyright (C) 2009 Google Inc. All rights reserved. 7 * Copyright (C) 2009 Google Inc. All rights reserved.
8 * 8 *
9 * This library is free software; you can redistribute it and/or 9 * This library is free software; you can redistribute it and/or
10 * modify it under the terms of the GNU Library General Public 10 * modify it under the terms of the GNU Library General Public
(...skipping 929 matching lines...) Expand 10 before | Expand all | Expand 10 after
940 940
941 virtual void imageChanged(ImageResource*, const IntRect* = 0) OVERRIDE FINAL ; 941 virtual void imageChanged(ImageResource*, const IntRect* = 0) OVERRIDE FINAL ;
942 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) { } 942 virtual void imageChanged(WrappedImagePtr, const IntRect* = 0) { }
943 virtual bool willRenderImage(ImageResource*) OVERRIDE FINAL; 943 virtual bool willRenderImage(ImageResource*) OVERRIDE FINAL;
944 944
945 void selectionStartEnd(int& spos, int& epos) const; 945 void selectionStartEnd(int& spos, int& epos) const;
946 946
947 void remove() { if (parent()) parent()->removeChild(this); } 947 void remove() { if (parent()) parent()->removeChild(this); }
948 948
949 bool isInert() const; 949 bool isInert() const;
950 virtual bool visibleForTouchAction() const { return false; } 950
951 bool visibleForTouchAction() const;
952
951 bool visibleToHitTestRequest(const HitTestRequest& request) const 953 bool visibleToHitTestRequest(const HitTestRequest& request) const
952 { 954 {
953 if (request.touchAction() && !visibleForTouchAction()) 955 if (request.touchAction() && !visibleForTouchAction())
954 return false; 956 return false;
955 return style()->visibility() == VISIBLE && (request.ignorePointerEventsN one() || style()->pointerEvents() != PE_NONE) && !isInert(); 957 return style()->visibility() == VISIBLE && (request.ignorePointerEventsN one() || style()->pointerEvents() != PE_NONE) && !isInert();
956 } 958 }
957 959
958 bool visibleToHitTesting() const { return style()->visibility() == VISIBLE & & style()->pointerEvents() != PE_NONE && !isInert(); } 960 bool visibleToHitTesting() const { return style()->visibility() == VISIBLE & & style()->pointerEvents() != PE_NONE && !isInert(); }
959 961
960 // Map points and quads through elements, potentially via 3d transforms. You should never need to call these directly; use 962 // Map points and quads through elements, potentially via 3d transforms. You should never need to call these directly; use
(...skipping 483 matching lines...) Expand 10 before | Expand all | Expand 10 after
1444 void showTree(const WebCore::RenderObject*); 1446 void showTree(const WebCore::RenderObject*);
1445 void showLineTree(const WebCore::RenderObject*); 1447 void showLineTree(const WebCore::RenderObject*);
1446 void showRenderTree(const WebCore::RenderObject* object1); 1448 void showRenderTree(const WebCore::RenderObject* object1);
1447 // We don't make object2 an optional parameter so that showRenderTree 1449 // We don't make object2 an optional parameter so that showRenderTree
1448 // can be called from gdb easily. 1450 // can be called from gdb easily.
1449 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2); 1451 void showRenderTree(const WebCore::RenderObject* object1, const WebCore::RenderO bject* object2);
1450 1452
1451 #endif 1453 #endif
1452 1454
1453 #endif // RenderObject_h 1455 #endif // RenderObject_h
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderBlock.h ('k') | Source/core/rendering/RenderObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698