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

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

Issue 1156143002: *** NOT FOR LANDING *** Text nodes should only inherit inheritable properties. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Some tests need to be rebaselined. Text nodes can no longer have z-index. Created 5 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 | Annotate | Revision Log
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 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
340 static inline ComputedStyle* initialStyle() 340 static inline ComputedStyle* initialStyle()
341 { 341 {
342 DEFINE_STATIC_REF(ComputedStyle, s_initialStyle, (ComputedStyle::createI nitialStyle())); 342 DEFINE_STATIC_REF(ComputedStyle, s_initialStyle, (ComputedStyle::createI nitialStyle()));
343 return s_initialStyle; 343 return s_initialStyle;
344 } 344 }
345 345
346 public: 346 public:
347 static PassRefPtr<ComputedStyle> create(); 347 static PassRefPtr<ComputedStyle> create();
348 static PassRefPtr<ComputedStyle> createAnonymousStyleWithDisplay(const Compu tedStyle& parentStyle, EDisplay); 348 static PassRefPtr<ComputedStyle> createAnonymousStyleWithDisplay(const Compu tedStyle& parentStyle, EDisplay);
349 static PassRefPtr<ComputedStyle> clone(const ComputedStyle&); 349 static PassRefPtr<ComputedStyle> clone(const ComputedStyle&);
350 static PassRefPtr<ComputedStyle> createWithInheritableProperties(const Compu tedStyle& parentStyle);
350 351
351 // Computes how the style change should be propagated down the tree. 352 // Computes how the style change should be propagated down the tree.
352 static StyleRecalcChange stylePropagationDiff(const ComputedStyle* oldStyle, const ComputedStyle* newStyle); 353 static StyleRecalcChange stylePropagationDiff(const ComputedStyle* oldStyle, const ComputedStyle* newStyle);
353 354
354 static ItemPosition resolveAlignment(const ComputedStyle& parentStyle, const ComputedStyle& childStyle, ItemPosition resolvedAutoPositionForLayoutObject); 355 static ItemPosition resolveAlignment(const ComputedStyle& parentStyle, const ComputedStyle& childStyle, ItemPosition resolvedAutoPositionForLayoutObject);
355 static ItemPosition resolveJustification(const ComputedStyle& parentStyle, c onst ComputedStyle& childStyle, ItemPosition resolvedAutoPositionForLayoutObject ); 356 static ItemPosition resolveJustification(const ComputedStyle& parentStyle, c onst ComputedStyle& childStyle, ItemPosition resolvedAutoPositionForLayoutObject );
356 357
357 StyleDifference visualInvalidationDiff(const ComputedStyle&) const; 358 StyleDifference visualInvalidationDiff(const ComputedStyle&) const;
358 359
359 enum IsAtShadowBoundary { 360 enum IsAtShadowBoundary {
(...skipping 1521 matching lines...) Expand 10 before | Expand all | Expand 10 after
1881 } 1882 }
1882 1883
1883 inline bool ComputedStyle::hasPseudoElementStyle() const 1884 inline bool ComputedStyle::hasPseudoElementStyle() const
1884 { 1885 {
1885 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK; 1886 return noninherited_flags.pseudoBits & PSEUDO_ELEMENT_MASK;
1886 } 1887 }
1887 1888
1888 } // namespace blink 1889 } // namespace blink
1889 1890
1890 #endif // ComputedStyle_h 1891 #endif // ComputedStyle_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698