webkitgtk-2.4.11webkitgtk-2.4.11

1 files changed, 7 insertions, 12 deletions

diff --git a/Source/JavaScriptCore/inspector/ScriptBreakpoint.h b/Source/JavaScriptCore/inspector/ScriptBreakpoint.h
index 88a0380ef..e3d52424d 100644
--- a/Source/JavaScriptCore/inspector/ScriptBreakpoint.h
+++ b/Source/JavaScriptCore/inspector/ScriptBreakpoint.h
@@ -11,7 +11,7 @@
  * 2.  Redistributions in binary form must reproduce the above copyright
  *     notice, this list of conditions and the following disclaimer in the
  *     documentation and/or other materials provided with the distribution.
- * 3.  Neither the name of Apple Inc. ("Apple") nor the names of
+ * 3.  Neither the name of Apple Computer, Inc. ("Apple") nor the names of
  *     its contributors may be used to endorse or promote products derived
  *     from this software without specific prior written permission.
  *
@@ -55,38 +55,33 @@ struct ScriptBreakpointAction {
     String data;
 };
 
-typedef Vector<ScriptBreakpointAction> BreakpointActions;
-
 struct ScriptBreakpoint {
     ScriptBreakpoint()
     {
     }
 
-    ScriptBreakpoint(int lineNumber, int columnNumber, const String& condition, bool autoContinue, unsigned ignoreCount)
+    ScriptBreakpoint(int lineNumber, int columnNumber, const String& condition, bool autoContinue)
         : lineNumber(lineNumber)
         , columnNumber(columnNumber)
         , condition(condition)
         , autoContinue(autoContinue)
-        , ignoreCount(ignoreCount)
     {
     }
 
-    ScriptBreakpoint(int lineNumber, int columnNumber, const String& condition, BreakpointActions& actions, bool autoContinue, unsigned ignoreCount)
+    ScriptBreakpoint(int lineNumber, int columnNumber, const String& condition, Vector<ScriptBreakpointAction>& actions, bool autoContinue)
         : lineNumber(lineNumber)
         , columnNumber(columnNumber)
         , condition(condition)
         , actions(actions)
         , autoContinue(autoContinue)
-        , ignoreCount(ignoreCount)
     {
     }
 
-    int lineNumber { 0 };
-    int columnNumber { 0 };
+    int lineNumber;
+    int columnNumber;
     String condition;
-    BreakpointActions actions;
-    bool autoContinue { false };
-    unsigned ignoreCount { 0 };
+    Vector<ScriptBreakpointAction> actions;
+    bool autoContinue;
 };
 
 } // namespace Inspector