[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[oliver at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit d83a9a29f66121a5ddcd7b99cbd17a34e19df475
Author: oliver at apple.com <oliver at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 7 02:21:49 2009 +0000

    Build and formatting fix.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49215 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index fe593ee..35d66cd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2009-10-06  Oliver Hunt  <oliver at apple.com>
+
+        Reviewed by NOBODY (Build fix).
+
+        Build and formatting fix.
+
+        * ForwardingHeaders/runtime/ExceptionHelpers.h: Added.
+        * bindings/js/SerializedScriptValue.cpp:
+        * bindings/js/SerializedScriptValue.h:
+        (WebCore::SerializedScriptValueData::operator bool):
+        (WebCore::SerializedScriptValueData::release):
+        (WebCore::SerializedScriptValue::release):
+        (WebCore::SerializedScriptValue::toString):
+        (WebCore::SerializedScriptValue::~SerializedScriptValue):
+        (WebCore::SerializedScriptValue::SerializedScriptValue):
+
 2009-10-05  Oliver Hunt  <oliver at apple.com>
 
         Reviewed by Gavin Barraclough.
diff --git a/WebCore/ForwardingHeaders/runtime/ExceptionHelpers.h b/WebCore/ForwardingHeaders/runtime/ExceptionHelpers.h
new file mode 100644
index 0000000..661c61a
--- /dev/null
+++ b/WebCore/ForwardingHeaders/runtime/ExceptionHelpers.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_ExceptionHelpers_h
+#define WebCore_FWD_ExceptionHelpers_h
+#include <JavaScriptCore/ExceptionHelpers.h>
+#endif
diff --git a/WebCore/bindings/js/SerializedScriptValue.cpp b/WebCore/bindings/js/SerializedScriptValue.cpp
index ab97f2f..d112104 100644
--- a/WebCore/bindings/js/SerializedScriptValue.cpp
+++ b/WebCore/bindings/js/SerializedScriptValue.cpp
@@ -25,7 +25,6 @@
  */
 
 #include "config.h"
-
 #include "SerializedScriptValue.h"
 
 #include <runtime/DateInstance.h>
@@ -36,31 +35,36 @@
 
 using namespace JSC;
 
-namespace WebCore
-{
+namespace WebCore {
 
 class SerializedObject : public SharedSerializedData
 {
 public:
     typedef Vector<RefPtr<StringImpl> > PropertyNameList;
     typedef Vector<SerializedScriptValueData> ValueList;
+
     void set(const Identifier& propertyName, const SerializedScriptValueData& value)
     {
         ASSERT(m_names.size() == m_values.size());
         m_names.append(String(propertyName.ustring()).crossThreadString().impl());
         m_values.append(value);
     }
+
     PropertyNameList& names() { return m_names; }
+
     ValueList& values() { return m_values; }
+
     static PassRefPtr<SerializedObject> create()
     {
         return adoptRef(new SerializedObject);
     }
+
     void clear()
     {
         m_names.clear();
         m_values.clear();
     }
+
 private:
     SerializedObject() { }
     PropertyNameList m_names;
diff --git a/WebCore/bindings/js/SerializedScriptValue.h b/WebCore/bindings/js/SerializedScriptValue.h
index 74c5962..3032120 100644
--- a/WebCore/bindings/js/SerializedScriptValue.h
+++ b/WebCore/bindings/js/SerializedScriptValue.h
@@ -33,8 +33,7 @@ namespace WebCore {
     class SerializedObject;
     class SerializedArray;
 
-    class SharedSerializedData : public RefCounted<SharedSerializedData>
-    {
+    class SharedSerializedData : public RefCounted<SharedSerializedData> {
     public:
         virtual ~SharedSerializedData() { }
         SerializedArray* asArray();
@@ -43,8 +42,7 @@ namespace WebCore {
 
     class SerializedScriptValue;
 
-    class SerializedScriptValueData
-    {
+    class SerializedScriptValueData {
     public:
         enum SerializedType {
             EmptyType,
@@ -125,9 +123,10 @@ namespace WebCore {
             return m_sharedData->asArray();
         }
 
-        operator bool () const { return m_type != EmptyType; }
+        operator bool() const { return m_type != EmptyType; }
 
-        SerializedScriptValueData release() {
+        SerializedScriptValueData release()
+        {
             SerializedScriptValueData result = *this;
             *this = SerializedScriptValueData();
             return result;
@@ -144,8 +143,7 @@ namespace WebCore {
         } m_data;
     };
 
-    class SerializedScriptValue : public RefCounted<SerializedScriptValue>
-    {
+    class SerializedScriptValue : public RefCounted<SerializedScriptValue> {
     public:
         static PassRefPtr<SerializedScriptValue> create(JSC::ExecState* exec, JSC::JSValue value)
         {
@@ -162,14 +160,16 @@ namespace WebCore {
             return adoptRef(new SerializedScriptValue(SerializedScriptValueData()));
         }
 
-        PassRefPtr<SerializedScriptValue> release() {
+        PassRefPtr<SerializedScriptValue> release()
+        {
             PassRefPtr<SerializedScriptValue> result = adoptRef(new SerializedScriptValue(m_value));
             m_value = SerializedScriptValueData();
             result->m_mustCopy = true;
             return result;
         }
 
-        String toString() {
+        String toString()
+        {
             if (m_value.type() != SerializedScriptValueData::StringType)
                 return "";
             return m_value.asString();
@@ -182,18 +182,17 @@ namespace WebCore {
             return m_value.deserialize(exec, m_mustCopy);
         }
 
-        ~SerializedScriptValue()
-        {
-        }
+        ~SerializedScriptValue() {}
+
     private:
         SerializedScriptValue(SerializedScriptValueData value)
             : m_value(value)
             , m_mustCopy(false)
         {
-        }
+
         SerializedScriptValueData m_value;
         bool m_mustCopy;
     };
 }
 
-#endif
+#endif // SerializedScriptValue_h

-- 
WebKit Debian packaging