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

Side by Side Diff: Source/core/rendering/style/RenderStyle.cpp

Issue 14296003: Remove TOUCH_EVENTS and TOUCH_EVENT_TRACKING compile-time flags. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: rebase. Created 7 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org)
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved. 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
4 * Copyright (C) 2011 Adobe Systems Incorporated. All rights reserved. 4 * Copyright (C) 2011 Adobe Systems Incorporated. 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 18 matching lines...) Expand all
29 #include "Font.h" 29 #include "Font.h"
30 #include "FontSelector.h" 30 #include "FontSelector.h"
31 #include "QuotesData.h" 31 #include "QuotesData.h"
32 #include "RenderArena.h" 32 #include "RenderArena.h"
33 #include "RenderObject.h" 33 #include "RenderObject.h"
34 #include "ScaleTransformOperation.h" 34 #include "ScaleTransformOperation.h"
35 #include "ShadowData.h" 35 #include "ShadowData.h"
36 #include "StyleImage.h" 36 #include "StyleImage.h"
37 #include "StyleInheritedData.h" 37 #include "StyleInheritedData.h"
38 #include "StyleResolver.h" 38 #include "StyleResolver.h"
39 #if ENABLE(TOUCH_EVENTS)
40 #include "RenderTheme.h" 39 #include "RenderTheme.h"
41 #endif
42 #include "TextAutosizer.h" 40 #include "TextAutosizer.h"
43 #include "WebCoreMemoryInstrumentation.h" 41 #include "WebCoreMemoryInstrumentation.h"
44 #include <wtf/MathExtras.h> 42 #include <wtf/MathExtras.h>
45 #include <wtf/MemoryInstrumentationVector.h> 43 #include <wtf/MemoryInstrumentationVector.h>
46 #include <wtf/MemoryObjectInfo.h> 44 #include <wtf/MemoryObjectInfo.h>
47 #include <wtf/StdLibExtras.h> 45 #include <wtf/StdLibExtras.h>
48 #include <algorithm> 46 #include <algorithm>
49 47
50 using namespace std; 48 using namespace std;
51 49
(...skipping 1470 matching lines...) Expand 10 before | Expand all | Expand 10 after
1522 TextEmphasisMark mark = static_cast<TextEmphasisMark>(rareInheritedData->tex tEmphasisMark); 1520 TextEmphasisMark mark = static_cast<TextEmphasisMark>(rareInheritedData->tex tEmphasisMark);
1523 if (mark != TextEmphasisMarkAuto) 1521 if (mark != TextEmphasisMarkAuto)
1524 return mark; 1522 return mark;
1525 1523
1526 if (isHorizontalWritingMode()) 1524 if (isHorizontalWritingMode())
1527 return TextEmphasisMarkDot; 1525 return TextEmphasisMarkDot;
1528 1526
1529 return TextEmphasisMarkSesame; 1527 return TextEmphasisMarkSesame;
1530 } 1528 }
1531 1529
1532 #if ENABLE(TOUCH_EVENTS)
1533 Color RenderStyle::initialTapHighlightColor() 1530 Color RenderStyle::initialTapHighlightColor()
1534 { 1531 {
1535 return RenderTheme::tapHighlightColor(); 1532 return RenderTheme::tapHighlightColor();
1536 } 1533 }
1537 #endif
1538 1534
1539 LayoutBoxExtent RenderStyle::imageOutsets(const NinePieceImage& image) const 1535 LayoutBoxExtent RenderStyle::imageOutsets(const NinePieceImage& image) const
1540 { 1536 {
1541 return LayoutBoxExtent(NinePieceImage::computeOutset(image.outset().top(), b orderTopWidth()), 1537 return LayoutBoxExtent(NinePieceImage::computeOutset(image.outset().top(), b orderTopWidth()),
1542 NinePieceImage::computeOutset(image.outset().right(), borderRightWidth()), 1538 NinePieceImage::computeOutset(image.outset().right(), borderRightWidth()),
1543 NinePieceImage::computeOutset(image.outset().bottom() , borderBottomWidth()), 1539 NinePieceImage::computeOutset(image.outset().bottom() , borderBottomWidth()),
1544 NinePieceImage::computeOutset(image.outset().left(), borderLeftWidth())); 1540 NinePieceImage::computeOutset(image.outset().left(), borderLeftWidth()));
1545 } 1541 }
1546 1542
1547 void RenderStyle::setBorderImageSource(PassRefPtr<StyleImage> image) 1543 void RenderStyle::setBorderImageSource(PassRefPtr<StyleImage> image)
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
1593 info.addMember(inherited, "inherited"); 1589 info.addMember(inherited, "inherited");
1594 info.addMember(m_cachedPseudoStyles, "cachedPseudoStyles"); 1590 info.addMember(m_cachedPseudoStyles, "cachedPseudoStyles");
1595 #if ENABLE(SVG) 1591 #if ENABLE(SVG)
1596 info.addMember(m_svgStyle, "svgStyle"); 1592 info.addMember(m_svgStyle, "svgStyle");
1597 #endif 1593 #endif
1598 info.addMember(inherited_flags, "inherited_flags"); 1594 info.addMember(inherited_flags, "inherited_flags");
1599 info.addMember(noninherited_flags, "noninherited_flags"); 1595 info.addMember(noninherited_flags, "noninherited_flags");
1600 } 1596 }
1601 1597
1602 } // namespace WebCore 1598 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/rendering/style/RenderStyle.h ('k') | Source/core/rendering/style/StyleRareInheritedData.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698