[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.2.3-2-36-g0136662

[Michael Gilbert]

The following commit has been merged in the debian/unstable branch:
commit ba22ac2b63c82c285a6fe779428a016d27e35fa0
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Mon Sep 6 23:27:45 2010 -0400

    fix another variable rename

diff --git a/debian/patches/cve-2010-2646.patch b/debian/patches/cve-2010-2646.patch
index 7badbde..279cff3 100644
--- a/debian/patches/cve-2010-2646.patch
+++ b/debian/patches/cve-2010-2646.patch
@@ -3,8 +3,8 @@ author: Michael Gilbert <michael.s.gilbert at gmail.com>
 origin: http://trac.webkit.org/changeset/58873
 Index: webkit-1.2.4/WebCore/storage/StorageEventDispatcher.cpp
 ===================================================================
---- webkit-1.2.4.orig/WebCore/storage/StorageEventDispatcher.cpp	2010-09-06 21:44:18.000000000 -0400
-+++ webkit-1.2.4/WebCore/storage/StorageEventDispatcher.cpp	2010-09-06 21:48:13.000000000 -0400
+--- webkit-1.2.4.orig/WebCore/storage/StorageEventDispatcher.cpp	2010-09-06 23:26:09.000000000 -0400
++++ webkit-1.2.4/WebCore/storage/StorageEventDispatcher.cpp	2010-09-06 23:27:09.000000000 -0400
 @@ -54,8 +54,12 @@
                  frames.append(frame);
          }
@@ -15,15 +15,15 @@ Index: webkit-1.2.4/WebCore/storage/StorageEventDispatcher.cpp
 +            ExceptionCode ec = 0;
 +            Storage* storage = frames[i]->domWindow()->sessionStorage(ec);
 +            if (!ec)
-+                frames[i]->document()->enqueueEvent(StorageEvent::create(eventNames().storageEvent, key, oldValue, newValue, sourceFrame->document()->url(), storage));
++                frames[i]->document()->enqueueStorageEvent(StorageEvent::create(eventNames().storageEvent, key, oldValue, newValue, sourceFrame->document()->url(), storage));
 +        }
      } else {
          // Send events to every page.
          const HashSet<Page*>& pages = page->group().pages();
 Index: webkit-1.2.4/WebCore/page/DOMWindow.h
 ===================================================================
---- webkit-1.2.4.orig/WebCore/page/DOMWindow.h	2010-09-06 21:44:18.000000000 -0400
-+++ webkit-1.2.4/WebCore/page/DOMWindow.h	2010-09-06 21:47:06.000000000 -0400
+--- webkit-1.2.4.orig/WebCore/page/DOMWindow.h	2010-09-06 23:26:09.000000000 -0400
++++ webkit-1.2.4/WebCore/page/DOMWindow.h	2010-09-06 23:26:41.000000000 -0400
 @@ -206,7 +206,7 @@
  
  #if ENABLE(DOM_STORAGE)
@@ -35,8 +35,8 @@ Index: webkit-1.2.4/WebCore/page/DOMWindow.h
  
 Index: webkit-1.2.4/WebCore/page/DOMWindow.cpp
 ===================================================================
---- webkit-1.2.4.orig/WebCore/page/DOMWindow.cpp	2010-09-06 21:44:18.000000000 -0400
-+++ webkit-1.2.4/WebCore/page/DOMWindow.cpp	2010-09-06 21:47:06.000000000 -0400
+--- webkit-1.2.4.orig/WebCore/page/DOMWindow.cpp	2010-09-06 23:26:09.000000000 -0400
++++ webkit-1.2.4/WebCore/page/DOMWindow.cpp	2010-09-06 23:26:41.000000000 -0400
 @@ -567,7 +567,7 @@
  }
  
@@ -80,8 +80,8 @@ Index: webkit-1.2.4/WebCore/page/DOMWindow.cpp
          return 0;
 Index: webkit-1.2.4/WebCore/page/SecurityOrigin.h
 ===================================================================
---- webkit-1.2.4.orig/WebCore/page/SecurityOrigin.h	2010-09-06 21:44:18.000000000 -0400
-+++ webkit-1.2.4/WebCore/page/SecurityOrigin.h	2010-09-06 21:47:06.000000000 -0400
+--- webkit-1.2.4.orig/WebCore/page/SecurityOrigin.h	2010-09-06 23:26:09.000000000 -0400
++++ webkit-1.2.4/WebCore/page/SecurityOrigin.h	2010-09-06 23:26:41.000000000 -0400
 @@ -120,6 +120,11 @@
      bool canAccessLocalStorage() const { return !isUnique(); }
      bool canAccessCookies() const { return !isUnique(); }

-- 
WebKit Debian packaging