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

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

Issue 170283003: Attempt to fix issue 344300 by guarding against rootStyle being null. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: more information test body Created 6 years, 10 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
« no previous file with comments | « Source/core/css/CSSPrimitiveValue.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 28 matching lines...) Expand all
39 class RenderStyle; 39 class RenderStyle;
40 class RenderView; 40 class RenderView;
41 41
42 class CSSToLengthConversionData { 42 class CSSToLengthConversionData {
43 public: 43 public:
44 CSSToLengthConversionData(const RenderStyle* currStyle, const RenderStyle* r ootStyle, const RenderView*, float zoom, bool computingFontSize = false); 44 CSSToLengthConversionData(const RenderStyle* currStyle, const RenderStyle* r ootStyle, const RenderView*, float zoom, bool computingFontSize = false);
45 CSSToLengthConversionData(const RenderStyle* currStyle, const RenderStyle* r ootStyle, const RenderView*, bool computingFontSize = false); 45 CSSToLengthConversionData(const RenderStyle* currStyle, const RenderStyle* r ootStyle, const RenderView*, bool computingFontSize = false);
46 CSSToLengthConversionData(const RenderStyle* currStyle, const RenderStyle* r ootStyle, float viewportWidth, float viewportHeight, float zoom, bool computingF ontSize = false); 46 CSSToLengthConversionData(const RenderStyle* currStyle, const RenderStyle* r ootStyle, float viewportWidth, float viewportHeight, float zoom, bool computingF ontSize = false);
47 47
48 const RenderStyle& style() const { return *m_style; } 48 const RenderStyle& style() const { return *m_style; }
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; } 59 void setStyle(const RenderStyle* style) { m_style = style; }
(...skipping 10 matching lines...) Expand all
70 float m_viewportWidth; 70 float m_viewportWidth;
71 float m_viewportHeight; 71 float m_viewportHeight;
72 float m_zoom; 72 float m_zoom;
73 bool m_useEffectiveZoom; 73 bool m_useEffectiveZoom;
74 bool m_computingFontSize; 74 bool m_computingFontSize;
75 }; 75 };
76 76
77 } // namespace WebCore 77 } // namespace WebCore
78 78
79 #endif 79 #endif
OLDNEW
« no previous file with comments | « Source/core/css/CSSPrimitiveValue.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698