webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 27 insertions, 10 deletions

diff --git a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Input.h b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Input.h
index 14b7597cb..ecbb04962 100644
--- a/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Input.h
+++ b/Source/ThirdParty/ANGLE/src/compiler/preprocessor/Input.h
@@ -7,7 +7,7 @@
 #ifndef COMPILER_PREPROCESSOR_INPUT_H_
 #define COMPILER_PREPROCESSOR_INPUT_H_
 
-#include <stddef.h>
+#include <cstddef>
 #include <vector>
 
 namespace pp
@@ -18,32 +18,49 @@ class Input
 {
   public:
     Input();
-    Input(size_t count, const char* const string[], const int length[]);
+    Input(size_t count, const char *const string[], const int length[]);
 
-    size_t count() const { return mCount; }
-    const char* string(size_t index) const { return mString[index]; }
-    size_t length(size_t index) const { return mLength[index]; }
+    size_t count() const
+    {
+        return mCount;
+    }
+    const char *string(size_t index) const
+    {
+        return mString[index];
+    }
+    size_t length(size_t index) const
+    {
+        return mLength[index];
+    }
 
-    size_t read(char* buf, size_t maxSize);
+    size_t read(char *buf, size_t maxSize, int *lineNo);
 
     struct Location
     {
         size_t sIndex;  // String index;
         size_t cIndex;  // Char index.
 
-        Location() : sIndex(0), cIndex(0) { }
+        Location()
+            : sIndex(0),
+              cIndex(0)
+        {
+        }
     };
-    const Location& readLoc() const { return mReadLoc; }
+    const Location &readLoc() const { return mReadLoc; }
 
   private:
+    // Skip a character and return the next character after the one that was skipped.
+    // Return nullptr if data runs out.
+    const char *skipChar();
+
     // Input.
     size_t mCount;
-    const char* const* mString;
+    const char * const *mString;
     std::vector<size_t> mLength;
 
     Location mReadLoc;
 };
 
 }  // namespace pp
-#endif  // COMPILER_PREPROCESSOR_INPUT_H_
 
+#endif  // COMPILER_PREPROCESSOR_INPUT_H_