[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[weinig at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 19b5e3cd20ae7c690bdf0d41ee13906b633f258b
Author: weinig at apple.com <weinig at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 8 14:37:42 2010 +0000

    Would like WKBundleFrameRef to turn into WKFrameRef across postMessage boundary, a la PageRef
    <rdar://problem/8402804>
    https://bugs.webkit.org/show_bug.cgi?id=45370
    
    Reviewed by Jon Honeycutt.
    
    * UIProcess/WebContextUserMessageCoders.h:
    (WebKit::WebContextUserMessageEncoder::encode):
    (WebKit::WebContextUserMessageDecoder::decode):
    * WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h:
    (WebKit::InjectedBundleUserMessageEncoder::encode):
    (WebKit::InjectedBundleUserMessageDecoder::decode):
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66981 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 0ff9648..2254bbe 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-08  Sam Weinig  <sam at webkit.org>
+
+        Reviewed by Jon Honeycutt.
+
+        Would like WKBundleFrameRef to turn into WKFrameRef across postMessage boundary, a la PageRef
+        <rdar://problem/8402804>
+        https://bugs.webkit.org/show_bug.cgi?id=45370
+
+        * UIProcess/WebContextUserMessageCoders.h:
+        (WebKit::WebContextUserMessageEncoder::encode):
+        (WebKit::WebContextUserMessageDecoder::decode):
+        * WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h:
+        (WebKit::InjectedBundleUserMessageEncoder::encode):
+        (WebKit::InjectedBundleUserMessageDecoder::decode):
+
 2010-09-07  Kinuko Yasuda  <kinuko at chromium.org>
 
         Unreviewed, another Qt release build fix attempt.
diff --git a/WebKit2/UIProcess/WebContextUserMessageCoders.h b/WebKit2/UIProcess/WebContextUserMessageCoders.h
index 2c26b07..580654d 100644
--- a/WebKit2/UIProcess/WebContextUserMessageCoders.h
+++ b/WebKit2/UIProcess/WebContextUserMessageCoders.h
@@ -25,12 +25,14 @@
 
 #include "UserMessageCoders.h"
 #include "WebContext.h"
+#include "WebFrameProxy.h"
 #include "WebPageProxy.h"
 
 namespace WebKit {
 
 // Adds
 // - Page -> BundlePage
+// - Frame -> BundleFrame
 
 class WebContextUserMessageEncoder : public UserMessageEncoder<WebContextUserMessageEncoder> {
 public:
@@ -53,6 +55,11 @@ public:
             encoder->encode(page->pageID());
             break;
         }
+        case APIObject::TypeFrame: {
+            WebFrameProxy* frame = static_cast<WebFrameProxy*>(m_root);
+            encoder->encode(frame->frameID());
+            break;
+        }
         default:
             ASSERT_NOT_REACHED();
             break;
@@ -62,6 +69,7 @@ public:
 
 // Adds
 //   - Page -> BundlePage
+//   - Frame -> BundleFrame
 
 class WebContextUserMessageDecoder : public UserMessageDecoder<WebContextUserMessageDecoder> {
 public:
@@ -96,6 +104,13 @@ public:
             coder.m_root = coder.m_context->process()->webPage(pageID);
             break;
         }
+        case APIObject::TypeBundleFrame: {
+            uint64_t frameID;
+            if (!decoder->decode(frameID))
+                return false;
+            coder.m_root = coder.m_context->process()->webFrame(frameID);
+            break;
+        }
         default:
             return false;
         }
diff --git a/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h b/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h
index cee2e2e..518f3df 100644
--- a/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h
+++ b/WebKit2/WebProcess/InjectedBundle/InjectedBundleUserMessageCoders.h
@@ -24,6 +24,7 @@
  */
 
 #include "UserMessageCoders.h"
+#include "WebFrame.h"
 #include "WebPage.h"
 #include "WebProcess.h"
 
@@ -31,6 +32,7 @@ namespace WebKit {
 
 // Adds
 // - BundlePage -> Page
+// - BundleFrame -> Frame
 
 class InjectedBundleUserMessageEncoder : public UserMessageEncoder<InjectedBundleUserMessageEncoder> {
 public:
@@ -53,6 +55,11 @@ public:
             encoder->encode(page->pageID());
             break;
         }
+        case APIObject::TypeBundleFrame: {
+            WebFrame* frame = static_cast<WebFrame*>(m_root);
+            encoder->encode(frame->frameID());
+            break;
+        }
         default:
             ASSERT_NOT_REACHED();
             break;
@@ -62,6 +69,7 @@ public:
 
 // Adds
 //   - Page -> BundlePage
+//   - Frame -> BundleFrame
 
 class InjectedBundleUserMessageDecoder : public UserMessageDecoder<InjectedBundleUserMessageDecoder> {
 public:
@@ -94,6 +102,13 @@ public:
             coder.m_root = WebProcess::shared().webPage(pageID);
             break;
         }
+        case APIObject::TypeFrame: {
+            uint64_t frameID;
+            if (!decoder->decode(frameID))
+                return false;
+            coder.m_root = WebProcess::shared().webFrame(frameID);
+            break;
+        }
         default:
             return false;
         }

-- 
WebKit Debian packaging