commit e40d1e9c70f1d1d5d0d92f24f8868fcf0b610639
author Zhenyao Mo <zmo@chromium.org> Wed Jul 16 17:40:36 2014 -0700
committer Zhenyao Mo <zmo@chromium.org> Thu Jul 17 20:43:57 2014 +0000
tree a426327262ec081c448e501a73ec05d5bb2979c6
parent b759a748730b4a0b169ebb588046feb63dc164b5

Fix style violations.

BUG=angle:650
TEST=no behavior change

Change-Id: I3096615a181b1ec2c18ce60566c3d6249975b84e
Reviewed-on: https://chromium-review.googlesource.com/208569
Tested-by: Zhenyao Mo <zmo@chromium.org>
Reviewed-by: Jamie Madill <jmadill@chromium.org>

src/compiler/translator/OutputGLSLBase.cpp

diff --git a/src/compiler/translator/OutputGLSLBase.cpp b/src/compiler/translator/OutputGLSLBase.cpp
index d14c70d..7839c04 100644
--- a/src/compiler/translator/OutputGLSLBase.cpp
+++ b/src/compiler/translator/OutputGLSLBase.cpp
@@ -297,8 +297,8 @@
         {
             out << ".";
             TIntermAggregate *rightChild = node->getRight()->getAsAggregate();
-            TIntermSequence &sequence = rightChild->getSequence();
-            for (TIntermSequence::iterator sit = sequence.begin(); sit != sequence.end(); ++sit)
+            TIntermSequence *sequence = rightChild->getSequence();
+            for (TIntermSequence::iterator sit = sequence->begin(); sit != sequence->end(); ++sit)
             {
                 TIntermConstantUnion *element = (*sit)->getAsConstantUnion();
                 ASSERT(element->getBasicType() == EbtInt);
@@ -544,14 +544,14 @@
     {
       case EOpSequence:
         // Scope the sequences except when at the global scope.
-        if (depth > 0)
+        if (mDepth > 0)
         {
             out << "{\n";
         }
 
         incrementDepth(node);
-        for (TIntermSequence::const_iterator iter = node->getSequence().begin();
-             iter != node->getSequence().end(); ++iter)
+        for (TIntermSequence::const_iterator iter = node->getSequence()->begin();
+             iter != node->getSequence()->end(); ++iter)
         {
             TIntermNode *node = *iter;
             ASSERT(node != NULL);
@@ -563,7 +563,7 @@
         decrementDepth();
 
         // Scope the sequences except when at the global scope.
-        if (depth > 0)
+        if (mDepth > 0)
         {
             out << "}\n";
         }
@@ -576,7 +576,7 @@
         out << " " << hashName(node->getName());
 
         out << "(";
-        writeFunctionParameters(node->getSequence());
+        writeFunctionParameters(*(node->getSequence()));
         out << ")";
 
         visitChildren = false;
@@ -591,7 +591,7 @@
         // Function definition node contains one or two children nodes
         // representing function parameters and function body. The latter
         // is not present in case of empty function bodies.
-        const TIntermSequence &sequence = node->getSequence();
+        const TIntermSequence &sequence = *(node->getSequence());
         ASSERT((sequence.size() == 1) || (sequence.size() == 2));
         TIntermSequence::const_iterator seqIter = sequence.begin();
 
@@ -624,7 +624,7 @@
         // Function parameters.
         ASSERT(visit == PreVisit);
         out << "(";
-        writeFunctionParameters(node->getSequence());
+        writeFunctionParameters(*(node->getSequence()));
         out << ")";
         visitChildren = false;
         break;
@@ -632,7 +632,7 @@
         // Variable declaration.
         if (visit == PreVisit)
         {
-            const TIntermSequence &sequence = node->getSequence();
+            const TIntermSequence &sequence = *(node->getSequence());
             const TIntermTyped *variable = sequence.front()->getAsTyped();
             writeVariableType(variable->getType());
             out << " ";
@@ -814,10 +814,10 @@
         else
         {
             // Need to put a one-iteration loop here to handle break.
-            TIntermSequence &declSeq =
+            TIntermSequence *declSeq =
                 node->getInit()->getAsAggregate()->getSequence();
             TIntermSymbol *indexSymbol =
-                declSeq[0]->getAsBinaryNode()->getLeft()->getAsSymbolNode();
+                (*declSeq)[0]->getAsBinaryNode()->getLeft()->getAsSymbolNode();
             TString name = hashVariableName(indexSymbol->getSymbol());
             out << "for (int " << name << " = 0; "
                 << name << " < 1; "