Changeset 83736 in webkit

Timestamp:

Apr 13, 2011 7:58:55 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-13 Ben Taylor <​bentaylor.solx86@gmail.com>

Reviewed by Eric Seidel.

​https://bugs.webkit.org/show_bug.cgi?id=57337

Work around a bug in ternary opertions in the Solaris Studio
12/12.1/12.2 compilers, using an if clause.

• dom/NodeRenderStyle.h: (WebCore::Node::renderStyle):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/NodeRenderStyle.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-13  Ben Taylor  <bentaylor.solx86@gmail.com>
+
+        Reviewed by Eric Seidel.
+
+        https://bugs.webkit.org/show_bug.cgi?id=57337
+
+        Work around a bug in ternary opertions in the Solaris Studio
+        12/12.1/12.2 compilers, using an if clause.
+
+        * dom/NodeRenderStyle.h:
+        (WebCore::Node::renderStyle):
+
 2011-04-13  Brian Salomon  <bsalomon@google.com>
 

trunk/Source/WebCore/dom/NodeRenderStyle.h

@@ -34 +34 @@
 inline RenderStyle* Node::renderStyle() const
 {
-    return m_renderer ? m_renderer->style() : nonRendererRenderStyle();
+    // 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 (m_renderer) 
+        return m_renderer->style();
+    return nonRendererRenderStyle();
 }