summaryrefslogtreecommitdiff
path: root/Source/WebCore/dom/NodeRenderStyle.h
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/dom/NodeRenderStyle.h')
-rw-r--r--Source/WebCore/dom/NodeRenderStyle.h17
1 files changed, 7 insertions, 10 deletions
diff --git a/Source/WebCore/dom/NodeRenderStyle.h b/Source/WebCore/dom/NodeRenderStyle.h
index a84565f42..246e8db9b 100644
--- a/Source/WebCore/dom/NodeRenderStyle.h
+++ b/Source/WebCore/dom/NodeRenderStyle.h
@@ -22,8 +22,7 @@
*
*/
-#ifndef NodeRenderStyle_h
-#define NodeRenderStyle_h
+#pragma once
#include "RenderObject.h"
#include "RenderStyle.h"
@@ -31,14 +30,12 @@
namespace WebCore {
-inline RenderStyle* Node::renderStyle() const
+inline const RenderStyle* Node::renderStyle() const
{
- // Using a ternary here confuses the Solaris Studio 12/12.1/12.2 compilers:
- // Bug is CR 6569194, "Problem with question operator binding in inline function"
- if (RenderObject* renderer = this->renderer())
- return &renderer->style();
- return nonRendererStyle();
+ auto* renderer = this->renderer();
+ if (!renderer)
+ return nullptr;
+ return &renderer->style();
}
-}
-#endif
+} // namespace WebCore