--- a/ChangeLog	Tue May 18 04:08:25 2010 +0000
+++ b/ChangeLog	Tue May 18 05:25:43 2010 +0000
@@ -1,3 +1,8 @@
+2010-05-18  Simon Jin <[email protected]>
+
+	* patches/webkit-23-name-union.diff:
+	* patches/webkit-26-copycons-imp.diff:polish patches
+
 2010-05-18  Simon Jin <[email protected]>
 
 	* SFEwebkit-cstd.spec:

--- a/patches/webkit-23-name-union.diff	Tue May 18 04:08:25 2010 +0000
+++ b/patches/webkit-23-name-union.diff	Tue May 18 05:25:43 2010 +0000
@@ -118,3 +118,15 @@
                  }
                  m_fiberCount = 0;
  
+diff -r d2a07bdc6744 JavaScriptCore/runtime/JSString.h
+--- a/JavaScriptCore/runtime/JSString.h	Tue May 18 19:09:56 2010 +0800
++++ b/JavaScriptCore/runtime/JSString.h	Tue May 18 20:11:12 2010 +0800
+@@ -92,7 +92,7 @@
+             {
+                 if (jsString->isRope()) {
+                     for (unsigned i = 0; i < jsString->m_fiberCount; ++i)
+-                        append(jsString->m_other.m_fibers[i]);
++                        append(jsString->m_other.m_union.m_fibers[i]);
+                 } else
+                     append(jsString->string());
+             }

--- a/patches/webkit-26-copycons-imp.diff	Tue May 18 04:08:25 2010 +0000
+++ b/patches/webkit-26-copycons-imp.diff	Tue May 18 05:25:43 2010 +0000
@@ -1,15 +1,21 @@
-diff -r cea4c6b56f01 JavaScriptCore/wtf/OwnPtr.h
---- a/JavaScriptCore/wtf/OwnPtr.h	Thu May 13 18:27:39 2010 +0800
-+++ b/JavaScriptCore/wtf/OwnPtr.h	Fri May 14 18:42:36 2010 +0800
-@@ -47,7 +47,7 @@
+diff -r d4d2f47b7a3e JavaScriptCore/wtf/OwnPtr.h
+--- a/JavaScriptCore/wtf/OwnPtr.h	Fri May 14 22:59:13 2010 +0800
++++ b/JavaScriptCore/wtf/OwnPtr.h	Tue May 18 20:19:08 2010 +0800
+@@ -47,12 +47,12 @@
          // transients for assigning a PassOwnPtr<T> object to a stack-allocated
          // OwnPtr<T> object.  It should never be called explicitly and gcc
          // should optimize away the constructor when generating code.
 -        OwnPtr(const OwnPtr<ValueType>& o);
-+        OwnPtr( OwnPtr<ValueType>& o) : m_ptr(o.release()) { }
++        OwnPtr(const OwnPtr<ValueType>& o) : m_ptr(o.release()) { }
  
          ~OwnPtr() { deleteOwnedPtr(m_ptr); }
  
+         PtrType get() const { return m_ptr; }
+-        PtrType release() { PtrType ptr = m_ptr; m_ptr = 0; return ptr; }
++        PtrType release() const {return m_ptr;}// PtrType ptr = m_ptr; m_ptr = 0; return ptr; }
+ 
+         // FIXME: This should be renamed to adopt. 
+         void set(PtrType ptr) { ASSERT(!ptr || m_ptr != ptr); deleteOwnedPtr(m_ptr); m_ptr = ptr; }
 diff -r cea4c6b56f01 WebCore/workers/WorkerMessagingProxy.cpp
 --- a/WebCore/workers/WorkerMessagingProxy.cpp	Thu May 13 18:27:39 2010 +0800
 +++ b/WebCore/workers/WorkerMessagingProxy.cpp	Fri May 14 18:42:53 2010 +0800