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

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

Issue 1502153005: Revert of Release Oilpan heap singletons prior to LSan leak detection. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 r ights reserved. 5 * Copyright (C) 2003, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All r ights reserved.
6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com) 6 * Copyright (C) 2006 Graham Dennis (graham.dennis@gmail.com)
7 * 7 *
8 * This library is free software; you can redistribute it and/or 8 * This library is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU Library General Public 9 * modify it under the terms of the GNU Library General Public
10 * License as published by the Free Software Foundation; either 10 * License as published by the Free Software Foundation; either
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 #include "platform/geometry/FloatRoundedRect.h" 71 #include "platform/geometry/FloatRoundedRect.h"
72 #include "platform/geometry/LayoutRectOutsets.h" 72 #include "platform/geometry/LayoutRectOutsets.h"
73 #include "platform/graphics/Color.h" 73 #include "platform/graphics/Color.h"
74 #include "platform/graphics/GraphicsTypes.h" 74 #include "platform/graphics/GraphicsTypes.h"
75 #include "platform/scroll/ScrollableArea.h" 75 #include "platform/scroll/ScrollableArea.h"
76 #include "platform/text/TextDirection.h" 76 #include "platform/text/TextDirection.h"
77 #include "platform/text/TextRun.h" 77 #include "platform/text/TextRun.h"
78 #include "platform/text/UnicodeBidi.h" 78 #include "platform/text/UnicodeBidi.h"
79 #include "platform/transforms/TransformOperations.h" 79 #include "platform/transforms/TransformOperations.h"
80 #include "wtf/Forward.h" 80 #include "wtf/Forward.h"
81 #include "wtf/LeakAnnotations.h"
82 #include "wtf/OwnPtr.h" 81 #include "wtf/OwnPtr.h"
83 #include "wtf/RefCounted.h" 82 #include "wtf/RefCounted.h"
84 #include "wtf/StdLibExtras.h" 83 #include "wtf/StdLibExtras.h"
85 #include "wtf/Vector.h" 84 #include "wtf/Vector.h"
86 85
87 template<typename T, typename U> inline bool compareEqual(const T& t, const U& u ) { return t == static_cast<T>(u); } 86 template<typename T, typename U> inline bool compareEqual(const T& t, const U& u ) { return t == static_cast<T>(u); }
88 87
89 #define SET_VAR(group, variable, value) \ 88 #define SET_VAR(group, variable, value) \
90 if (!compareEqual(group->variable, value)) \ 89 if (!compareEqual(group->variable, value)) \
91 group.access()->variable = value 90 group.access()->variable = value
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 344
346 enum InitialStyleTag { 345 enum InitialStyleTag {
347 InitialStyle 346 InitialStyle
348 }; 347 };
349 ALWAYS_INLINE explicit ComputedStyle(InitialStyleTag); 348 ALWAYS_INLINE explicit ComputedStyle(InitialStyleTag);
350 ALWAYS_INLINE ComputedStyle(const ComputedStyle&); 349 ALWAYS_INLINE ComputedStyle(const ComputedStyle&);
351 350
352 static PassRefPtr<ComputedStyle> createInitialStyle(); 351 static PassRefPtr<ComputedStyle> createInitialStyle();
353 static inline ComputedStyle* initialStyle() 352 static inline ComputedStyle* initialStyle()
354 { 353 {
355 LEAK_SANITIZER_DISABLED_SCOPE;
356 DEFINE_STATIC_REF(ComputedStyle, s_initialStyle, (ComputedStyle::createI nitialStyle())); 354 DEFINE_STATIC_REF(ComputedStyle, s_initialStyle, (ComputedStyle::createI nitialStyle()));
357 return s_initialStyle; 355 return s_initialStyle;
358 } 356 }
359 357
360 public: 358 public:
361 static PassRefPtr<ComputedStyle> create(); 359 static PassRefPtr<ComputedStyle> create();
362 static PassRefPtr<ComputedStyle> createAnonymousStyleWithDisplay(const Compu tedStyle& parentStyle, EDisplay); 360 static PassRefPtr<ComputedStyle> createAnonymousStyleWithDisplay(const Compu tedStyle& parentStyle, EDisplay);
363 static PassRefPtr<ComputedStyle> clone(const ComputedStyle&); 361 static PassRefPtr<ComputedStyle> clone(const ComputedStyle&);
364 362
365 // Computes how the style change should be propagated down the tree. 363 // Computes how the style change should be propagated down the tree.
(...skipping 1639 matching lines...) Expand 10 before | Expand all | Expand 10 after
2005 } 2003 }
2006 2004
2007 inline bool ComputedStyle::hasPseudoElementStyle() const 2005 inline bool ComputedStyle::hasPseudoElementStyle() const
2008 { 2006 {
2009 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 2007 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
2010 } 2008 }
2011 2009
2012 } // namespace blink 2010 } // namespace blink
2013 2011
2014 #endif // ComputedStyle_h 2012 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698