Source/core/css/CSSToLengthConversionData.h - Issue 686723002: Improve RAII of StyleResolverState.

Side by Side Diff: Source/core/css/CSSToLengthConversionData.h

Issue 686723002: Improve RAII of StyleResolverState. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: When baseRenderStyle!=0: 1) don't inherit, and 2) use defaultStyleForElement as fallback parent. Created 6 years, 1 month 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

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2013 Google Inc. All rights reserved.	2 * Copyright (C) 2013 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 38 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
49 const RenderStyle* rootStyle() const { return m_rootStyle; }	49 const RenderStyle* rootStyle() const { return m_rootStyle; }

50 float zoom() const;	50 float zoom() const;

51 bool computingFontSize() const { return m_computingFontSize; }	51 bool computingFontSize() const { return m_computingFontSize; }

52	52

53 // Accessing these marks the style as having viewport units	53 // Accessing these marks the style as having viewport units

54 double viewportWidthPercent() const;	54 double viewportWidthPercent() const;

55 double viewportHeightPercent() const;	55 double viewportHeightPercent() const;

56 double viewportMinPercent() const;	56 double viewportMinPercent() const;

57 double viewportMaxPercent() const;	57 double viewportMaxPercent() const;

58	58

59 void setStyle(const RenderStyle* style) { m_style = style; }

60 void setRootStyle(const RenderStyle* rootStyle) { m_rootStyle = rootStyle; }
rune 2014/10/29 12:15:21 These were used unused? These were used unused? andersr 2014/10/29 13:29:46 setStyle was used in StyleResolverState::setStyle, Show quoted text On 2014/10/29 12:15:21, rune wrote: > These were used unused? setStyle was used in StyleResolverState::setStyle, but no longer, as of this patch. setRootStyle was unused even before this patch.
61

62 CSSToLengthConversionData copyWithAdjustedZoom(float newZoom) const	59 CSSToLengthConversionData copyWithAdjustedZoom(float newZoom) const

63 {	60 {

64 return CSSToLengthConversionData(m_style, m_rootStyle, m_viewportWidth, m_viewportHeight, newZoom, m_computingFontSize);	61 return CSSToLengthConversionData(m_style, m_rootStyle, m_viewportWidth, m_viewportHeight, newZoom, m_computingFontSize);

65 }	62 }

66	63

67 private:	64 private:

68 const RenderStyle* m_style;	65 const RenderStyle* m_style;

69 const RenderStyle* m_rootStyle;	66 const RenderStyle* m_rootStyle;

70 float m_viewportWidth;	67 float m_viewportWidth;

71 float m_viewportHeight;	68 float m_viewportHeight;

72 float m_zoom;	69 float m_zoom;

73 bool m_useEffectiveZoom;	70 bool m_useEffectiveZoom;

74 bool m_computingFontSize;	71 bool m_computingFontSize;

75 };	72 };

76	73

77 } // namespace blink	74 } // namespace blink

78	75

79 #endif	76 #endif

OLD	NEW

« no previous file with comments | « Source/core/css/CSSProperties.in ('k') | Source/core/css/resolver/ElementResolveContext.h » ('j') | Source/core/css/resolver/ElementResolveContext.h » ('J')