Unreviewed. Fixed AppleWin and Chromium-win build failure.

Renamed 'exceptions' to 'exceptionNameDescription' to avoid
variable name conflict.

* Modules/indexeddb/IDBDatabaseException.cpp:
(WebCore::IDBDatabaseException::initializeDescription):
* Modules/webdatabase/SQLException.cpp:
(WebCore::SQLException::initializeDescription):
* dom/EventException.cpp:
(WebCore::EventException::initializeDescription):
* dom/RangeException.cpp:
(WebCore::RangeException::initializeDescription):
* fileapi/FileException.cpp:
(WebCore::FileException::initializeDescription):
* fileapi/OperationNotAllowedException.cpp:
(WebCore::OperationNotAllowedException::initializeDescription):
* svg/SVGException.cpp:
(WebCore::SVGException::initializeDescription):
* xml/XPathException.cpp:
(WebCore::XPathException::initializeDescription):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@113693 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 8e010b5..38e02e5 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,27 @@
+2012-04-10  Kentaro Hara  <haraken@chromium.org>
+
+        Unreviewed. Fixed AppleWin and Chromium-win build failure.
+
+        Renamed 'exceptions' to 'exceptionNameDescription' to avoid
+        variable name conflict.
+
+        * Modules/indexeddb/IDBDatabaseException.cpp:
+        (WebCore::IDBDatabaseException::initializeDescription):
+        * Modules/webdatabase/SQLException.cpp:
+        (WebCore::SQLException::initializeDescription):
+        * dom/EventException.cpp:
+        (WebCore::EventException::initializeDescription):
+        * dom/RangeException.cpp:
+        (WebCore::RangeException::initializeDescription):
+        * fileapi/FileException.cpp:
+        (WebCore::FileException::initializeDescription):
+        * fileapi/OperationNotAllowedException.cpp:
+        (WebCore::OperationNotAllowedException::initializeDescription):
+        * svg/SVGException.cpp:
+        (WebCore::SVGException::initializeDescription):
+        * xml/XPathException.cpp:
+        (WebCore::XPathException::initializeDescription):
+
 2012-04-09  Lu Guanqun  <guanqun.lu@intel.com>
 
         combine two arrays in XPathException into one

diff --git a/Source/WebCore/Modules/indexeddb/IDBDatabaseException.cpp b/Source/WebCore/Modules/indexeddb/IDBDatabaseException.cpp
index 641d0ba..bb0e0c5 100644 (file)
--- a/Source/WebCore/Modules/indexeddb/IDBDatabaseException.cpp
+++ b/Source/WebCore/Modules/indexeddb/IDBDatabaseException.cpp
@@ -37,7 +37,7 @@ namespace WebCore {
 static struct IDBDatabaseExceptionNameDescription {
     const char* const name;
     const char* const description;
-} exceptions[] = {
+} exceptionNameDescription[] = {
     { "UNKNOWN_ERR", "An unknown error occurred within Indexed Database." },
     { "NON_TRANSIENT_ERR", "NON_TRANSIENT_ERR" }, // FIXME: Write a better message if it's ever possible this is thrown.
     { "NOT_FOUND_ERR", "The name supplied does not match any existing item." },
@@ -61,11 +61,11 @@ bool IDBDatabaseException::initializeDescription(ExceptionCode ec, ExceptionCode
     description->code = ec - IDBDatabaseExceptionOffset;
     description->type = IDBDatabaseExceptionType;
 
-    size_t tableSize = WTF_ARRAY_LENGTH(exceptions);
+    size_t tableSize = WTF_ARRAY_LENGTH(exceptionNameDescription);
     size_t tableIndex = ec - UNKNOWN_ERR;
 
-    description->name = tableIndex < tableSize ? exceptions[tableIndex].name : 0;
-    description->description = tableIndex < tableSize ? exceptions[tableIndex].description : 0;
+    description->name = tableIndex < tableSize ? exceptionNameDescription[tableIndex].name : 0;
+    description->description = tableIndex < tableSize ? exceptionNameDescription[tableIndex].description : 0;
 
     return true;
 }

diff --git a/Source/WebCore/Modules/webdatabase/SQLException.cpp b/Source/WebCore/Modules/webdatabase/SQLException.cpp
index b9f5982..00e83d3 100644 (file)
--- a/Source/WebCore/Modules/webdatabase/SQLException.cpp
+++ b/Source/WebCore/Modules/webdatabase/SQLException.cpp
@@ -37,7 +37,7 @@ namespace WebCore {
 static struct SQLExceptionNameDescription {
     const char* const name;
     const char* const description;
-} exceptions[] = {
+} exceptionNameDescription[] = {
     { "UNKNOWN_ERR", "The operation failed for reasons unrelated to the database." },
     { "DATABASE_ERR", "The operation failed for some reason related to the database." },
     { "VERSION_ERR", "The actual database version did not match the expected version." },
@@ -57,11 +57,11 @@ bool SQLException::initializeDescription(ExceptionCode ec, ExceptionCodeDescript
     description->code = ec - SQLExceptionOffset;
     description->type = SQLExceptionType;
 
-    size_t tableSize = WTF_ARRAY_LENGTH(exceptions);
+    size_t tableSize = WTF_ARRAY_LENGTH(exceptionNameDescription);
     size_t tableIndex = ec - UNKNOWN_ERR;
 
-    description->name = tableIndex < tableSize ? exceptions[tableIndex].name : 0;
-    description->description = tableIndex < tableSize ? exceptions[tableIndex].description : 0;
+    description->name = tableIndex < tableSize ? exceptionNameDescription[tableIndex].name : 0;
+    description->description = tableIndex < tableSize ? exceptionNameDescription[tableIndex].description : 0;
 
     return true;
 }

diff --git a/Source/WebCore/dom/EventException.cpp b/Source/WebCore/dom/EventException.cpp
index 7247a7e..179c9ba 100644 (file)
--- a/Source/WebCore/dom/EventException.cpp
+++ b/Source/WebCore/dom/EventException.cpp
@@ -34,7 +34,7 @@ namespace WebCore {
 static struct EventExceptionNameDescription {
     const char* const name;
     const char* const description;
-} exceptions[] = {
+} exceptionNameDescription[] = {
     { "UNSPECIFIED_EVENT_TYPE_ERR", "The Event's type was not specified by initializing the event before the method was called." },
     { "DISPATCH_REQUEST_ERR", "The Event object is already being dispatched." }
 };
@@ -48,11 +48,11 @@ bool EventException::initializeDescription(ExceptionCode ec, ExceptionCodeDescri
     description->code = ec - EventExceptionOffset;
     description->type = EventExceptionType;
 
-    size_t tableSize = WTF_ARRAY_LENGTH(exceptions);
+    size_t tableSize = WTF_ARRAY_LENGTH(exceptionNameDescription);
     size_t tableIndex = ec - UNSPECIFIED_EVENT_TYPE_ERR;
 
-    description->name = tableIndex < tableSize ? exceptions[tableIndex].name : 0;
-    description->description = tableIndex < tableSize ? exceptions[tableIndex].description : 0;
+    description->name = tableIndex < tableSize ? exceptionNameDescription[tableIndex].name : 0;
+    description->description = tableIndex < tableSize ? exceptionNameDescription[tableIndex].description : 0;
 
     return true;
 }

diff --git a/Source/WebCore/dom/RangeException.cpp b/Source/WebCore/dom/RangeException.cpp
index 2258c30..ea9b285 100644 (file)
--- a/Source/WebCore/dom/RangeException.cpp
+++ b/Source/WebCore/dom/RangeException.cpp
@@ -34,7 +34,7 @@ namespace WebCore {
 static struct RangeExceptionNameDescription {
     const char* const name;
     const char* const description;
-} exceptions[] = {
+} exceptionNameDescription[] = {
     { "BAD_BOUNDARYPOINTS_ERR", "The boundary-points of a Range did not meet specific requirements." },
     { "INVALID_NODE_TYPE_ERR", "The container of an boundary-point of a Range was being set to either a node of an invalid type or a node with an ancestor of an invalid type." }
 };
@@ -48,11 +48,11 @@ bool RangeException::initializeDescription(ExceptionCode ec, ExceptionCodeDescri
     description->code = ec - RangeExceptionOffset;
     description->type = RangeExceptionType;
 
-    size_t tableSize = WTF_ARRAY_LENGTH(exceptions);
+    size_t tableSize = WTF_ARRAY_LENGTH(exceptionNameDescription);
     size_t tableIndex = ec - BAD_BOUNDARYPOINTS_ERR;
 
-    description->name = tableIndex < tableSize ? exceptions[tableIndex].name : 0;
-    description->description = tableIndex < tableSize ? exceptions[tableIndex].description : 0;
+    description->name = tableIndex < tableSize ? exceptionNameDescription[tableIndex].name : 0;
+    description->description = tableIndex < tableSize ? exceptionNameDescription[tableIndex].description : 0;
 
     return true;
 }

diff --git a/Source/WebCore/fileapi/FileException.cpp b/Source/WebCore/fileapi/FileException.cpp
index 2e45315..c1d8c03 100644 (file)
--- a/Source/WebCore/fileapi/FileException.cpp
+++ b/Source/WebCore/fileapi/FileException.cpp
@@ -37,7 +37,7 @@ namespace WebCore {
 static struct FileExceptionNameDescription {
     const char* const name;
     const char* const description;
-} exceptions[] = {
+} exceptionNameDescription[] = {
     { "NOT_FOUND_ERR", "A requested file or directory could not be found at the time an operation was processed." },
     { "SECURITY_ERR", "It was determined that certain files are unsafe for access within a Web application, or that too many calls are being made on file resources." },
     { "ABORT_ERR", "An ongoing operation was aborted, typically with a call to abort()." },
@@ -61,11 +61,11 @@ bool FileException::initializeDescription(ExceptionCode ec, ExceptionCodeDescrip
     description->code = ec - FileExceptionOffset;
     description->type = FileExceptionType;
 
-    size_t tableSize = WTF_ARRAY_LENGTH(exceptions);
+    size_t tableSize = WTF_ARRAY_LENGTH(exceptionNameDescription);
     size_t tableIndex = ec - NOT_FOUND_ERR;
 
-    description->name = tableIndex < tableSize ? exceptions[tableIndex].name : 0;
-    description->description = tableIndex < tableSize ? exceptions[tableIndex].description : 0;
+    description->name = tableIndex < tableSize ? exceptionNameDescription[tableIndex].name : 0;
+    description->description = tableIndex < tableSize ? exceptionNameDescription[tableIndex].description : 0;
 
     return true;
 }

diff --git a/Source/WebCore/fileapi/OperationNotAllowedException.cpp b/Source/WebCore/fileapi/OperationNotAllowedException.cpp
index e2020dd..0ee7790 100644 (file)
--- a/Source/WebCore/fileapi/OperationNotAllowedException.cpp
+++ b/Source/WebCore/fileapi/OperationNotAllowedException.cpp
@@ -37,7 +37,7 @@ namespace WebCore {
 static struct OperationNotAllowedExceptionNameDescription {
     const char* const name;
     const char* const description;
-} exceptions[] = {
+} exceptionNameDescription[] = {
     { "NOT_ALLOWED_ERR", "A read method was called while the object was in the LOADING state due to a previous read call." }
 };
 
@@ -50,11 +50,11 @@ bool OperationNotAllowedException::initializeDescription(ExceptionCode ec, Excep
     description->code = ec - OperationNotAllowedExceptionOffset;
     description->type = OperationNotAllowedExceptionType;
 
-    size_t tableSize = WTF_ARRAY_LENGTH(exceptions);
+    size_t tableSize = WTF_ARRAY_LENGTH(exceptionNameDescription);
     size_t tableIndex = ec - NOT_ALLOWED_ERR;
 
-    description->name = tableIndex < tableSize ? exceptions[tableIndex].name : 0;
-    description->description = tableIndex < tableSize ? exceptions[tableIndex].description : 0;
+    description->name = tableIndex < tableSize ? exceptionNameDescription[tableIndex].name : 0;
+    description->description = tableIndex < tableSize ? exceptionNameDescription[tableIndex].description : 0;
 
     return true;
 }

diff --git a/Source/WebCore/svg/SVGException.cpp b/Source/WebCore/svg/SVGException.cpp
index 4f4b844..e7dc114 100644 (file)
--- a/Source/WebCore/svg/SVGException.cpp
+++ b/Source/WebCore/svg/SVGException.cpp
@@ -37,7 +37,7 @@ namespace WebCore {
 static struct SVGExceptionNameDescription {
     const char* const name;
     const char* const description;
-} exceptions[] = {
+} exceptionNameDescription[] = {
     { "SVG_WRONG_TYPE_ERR", "An object of the wrong type was passed to an operation." },
     { "SVG_INVALID_VALUE_ERR", "An invalid value was passed to an operation or assigned to an attribute." },
     { "SVG_MATRIX_NOT_INVERTABLE", "An attempt was made to invert a matrix that is not invertible." }
@@ -52,11 +52,11 @@ bool SVGException::initializeDescription(ExceptionCode ec, ExceptionCodeDescript
     description->code = ec - SVGExceptionOffset;
     description->type = SVGExceptionType;
 
-    size_t tableSize = WTF_ARRAY_LENGTH(exceptions);
+    size_t tableSize = WTF_ARRAY_LENGTH(exceptionNameDescription);
     size_t tableIndex = ec - SVG_WRONG_TYPE_ERR;
 
-    description->name = tableIndex < tableSize ? exceptions[tableIndex].name : 0;
-    description->description = tableIndex < tableSize ? exceptions[tableIndex].description : 0;
+    description->name = tableIndex < tableSize ? exceptionNameDescription[tableIndex].name : 0;
+    description->description = tableIndex < tableSize ? exceptionNameDescription[tableIndex].description : 0;
 
     return true;
 }

diff --git a/Source/WebCore/xml/XPathException.cpp b/Source/WebCore/xml/XPathException.cpp
index 1959e36..757abaa 100644 (file)
--- a/Source/WebCore/xml/XPathException.cpp
+++ b/Source/WebCore/xml/XPathException.cpp
@@ -34,7 +34,7 @@ namespace WebCore {
 static struct XPathExceptionNameDescription {
     const char* const name;
     const char* const description;
-} exceptions[] = {
+} exceptionNameDescription[] = {
     { "INVALID_EXPRESSION_ERR", "The expression had a syntax error or otherwise is not a legal expression according to the rules of the specific XPathEvaluator." },
     { "TYPE_ERR", "The expression could not be converted to return the specified type." }
 };
@@ -48,11 +48,11 @@ bool XPathException::initializeDescription(ExceptionCode ec, ExceptionCodeDescri
     description->code = ec - XPathExceptionOffset;
     description->type = XPathExceptionType;
 
-    size_t tableSize = WTF_ARRAY_LENGTH(exceptions);
+    size_t tableSize = WTF_ARRAY_LENGTH(exceptionNameDescription);
     size_t tableIndex = ec - INVALID_EXPRESSION_ERR;
 
-    description->name = tableIndex < tableSize ? exceptions[tableIndex].name : 0;
-    description->description = tableIndex < tableSize ? exceptions[tableIndex].description : 0;
+    description->name = tableIndex < tableSize ? exceptionNameDescription[tableIndex].name : 0;
+    description->description = tableIndex < tableSize ? exceptionNameDescription[tableIndex].description : 0;
 
     return true;
 }