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

Side by Side Diff: third_party/WebKit/Source/core/style/ComputedStyle.h

Issue 2916563003: Compute effective touch action in StyleAdjuster. (Closed)
Patch Set: fix layout test failures Created 3 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
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 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
6 * rights reserved. 6 * rights reserved.
7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 7 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
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 1494 matching lines...) Expand 10 before | Expand all | Expand 10 after
1505 SET_VAR(rare_non_inherited_data_, text_overflow_, overflow); 1505 SET_VAR(rare_non_inherited_data_, text_overflow_, overflow);
1506 } 1506 }
1507 1507
1508 // touch-action 1508 // touch-action
1509 static TouchAction InitialTouchAction() { 1509 static TouchAction InitialTouchAction() {
1510 return TouchAction::kTouchActionAuto; 1510 return TouchAction::kTouchActionAuto;
1511 } 1511 }
1512 TouchAction GetTouchAction() const { 1512 TouchAction GetTouchAction() const {
1513 return static_cast<TouchAction>(rare_non_inherited_data_->touch_action_); 1513 return static_cast<TouchAction>(rare_non_inherited_data_->touch_action_);
1514 } 1514 }
1515 TouchAction GetEffectiveTouchAction() const {
1516 return static_cast<TouchAction>(
1517 rare_inherited_data_->effective_touch_action_);
1518 }
1515 void SetTouchAction(TouchAction t) { 1519 void SetTouchAction(TouchAction t) {
1516 SET_VAR(rare_non_inherited_data_, touch_action_, t); 1520 SET_VAR(rare_non_inherited_data_, touch_action_, t);
1517 } 1521 }
1522 void SetEffectiveTouchAction(TouchAction t) {
1523 SET_VAR(rare_inherited_data_, effective_touch_action_, t);
1524 }
1518 1525
1519 // vertical-align 1526 // vertical-align
1520 static EVerticalAlign InitialVerticalAlign() { 1527 static EVerticalAlign InitialVerticalAlign() {
1521 return EVerticalAlign::kBaseline; 1528 return EVerticalAlign::kBaseline;
1522 } 1529 }
1523 EVerticalAlign VerticalAlign() const { return VerticalAlignInternal(); } 1530 EVerticalAlign VerticalAlign() const { return VerticalAlignInternal(); }
1524 const Length& GetVerticalAlignLength() const { 1531 const Length& GetVerticalAlignLength() const {
1525 return VerticalAlignLengthInternal(); 1532 return VerticalAlignLengthInternal();
1526 } 1533 }
1527 void SetVerticalAlign(EVerticalAlign v) { SetVerticalAlignInternal(v); } 1534 void SetVerticalAlign(EVerticalAlign v) { SetVerticalAlignInternal(v); }
(...skipping 2096 matching lines...) Expand 10 before | Expand all | Expand 10 after
3624 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId))); 3631 PseudoBitsInternal() | 1 << (pseudo - kFirstPublicPseudoId)));
3625 } 3632 }
3626 3633
3627 inline bool ComputedStyle::HasPseudoElementStyle() const { 3634 inline bool ComputedStyle::HasPseudoElementStyle() const {
3628 return PseudoBitsInternal() & kElementPseudoIdMask; 3635 return PseudoBitsInternal() & kElementPseudoIdMask;
3629 } 3636 }
3630 3637
3631 } // namespace blink 3638 } // namespace blink
3632 3639
3633 #endif // ComputedStyle_h 3640 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698