Changeset 113686 in webkit

Timestamp:

Apr 9, 2012 10:51:40 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

combine two arrays in EventException.cpp into one
​https://bugs.webkit.org/show_bug.cgi?id=83451

Patch by Lu Guanqun <​guanqun.lu@intel.com> on 2012-04-09
Reviewed by Kentaro Hara.

No new tests required.

• dom/EventException.cpp:

(EventExceptionNameDescription):
(WebCore):
(WebCore::EventException::initializeDescription):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/EventException.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-04-09  Lu Guanqun  <guanqun.lu@intel.com>
+
+        combine two arrays in EventException.cpp into one
+        https://bugs.webkit.org/show_bug.cgi?id=83451
+
+        Reviewed by Kentaro Hara.
+
+        No new tests required.
+
+        * dom/EventException.cpp:
+        (EventExceptionNameDescription):
+        (WebCore):
+        (WebCore::EventException::initializeDescription):
+
 2012-04-09  Lu Guanqun  <guanqun.lu@intel.com>
 

trunk/Source/WebCore/dom/EventException.cpp

@@ -32 +32 @@
 namespace WebCore {
 
-// FIXME: This should be an array of structs to pair the names and descriptions.
-static const char* const eventExceptionNames[] = {
-    "UNSPECIFIED_EVENT_TYPE_ERR",
-    "DISPATCH_REQUEST_ERR"
+static struct EventExceptionNameDescription {
+    const char* const name;
+    const char* const description;
+} exceptions[] = {
+    { "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." }
 };
-
-static const char* const eventExceptionDescriptions[] = {
-    "The Event's type was not specified by initializing the event before the method was called.",
-    "The Event object is already being dispatched."
-};
-
-COMPILE_ASSERT(WTF_ARRAY_LENGTH(eventExceptionNames) == WTF_ARRAY_LENGTH(eventExceptionDescriptions), EventExceptionTablesMustMatch);
 
 bool EventException::initializeDescription(ExceptionCode ec, ExceptionCodeDescription* description)
@@ -54 +49 @@
     description->type = EventExceptionType;
 
-    size_t tableSize = WTF_ARRAY_LENGTH(eventExceptionNames);
+    size_t tableSize = WTF_ARRAY_LENGTH(exceptions);
     size_t tableIndex = ec - UNSPECIFIED_EVENT_TYPE_ERR;
 
-    description->name = tableIndex < tableSize ? eventExceptionNames[tableIndex] : 0;
-    description->description = tableIndex < tableSize ? eventExceptionDescriptions[tableIndex] : 0;
+    description->name = tableIndex < tableSize ? exceptions[tableIndex].name : 0;
+    description->description = tableIndex < tableSize ? exceptions[tableIndex].description : 0;
 
     return true;