[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.22-985-g3c00f00

[jhoneycutt at apple.com]

The following commit has been merged in the webkit-1.1 branch:
commit d4d3c1d2ce7076036a8cd13ed2453d96af069a7f
Author: jhoneycutt at apple.com <jhoneycutt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 2 00:18:10 2010 +0000

    <rdar://problem/7703368> IWebUIDelegatePrivate::embeddedViewWithArguments
    is passed wrong arguments
    
    Reviewed by Adam Roben.
    
    * Interfaces/IWebUIDelegatePrivate.idl:
    Update copyright strings. Added a new key for the plug-in source URL.
    
    * Interfaces/WebKit.idl:
    Update copyright strings.
    
    * WebCoreSupport/WebFrameLoaderClient.cpp:
    (WebFrameLoaderClient::createPlugin):
    Pass the URL of the plug-in as the source URL. Pass the document's
    base URI for the base URL.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55385 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 76b1450..914f180 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,21 @@
+2010-02-26  Jon Honeycutt  <jhoneycutt at apple.com>
+
+        <rdar://problem/7703368> IWebUIDelegatePrivate::embeddedViewWithArguments
+        is passed wrong arguments
+
+        Reviewed by Adam Roben.
+
+        * Interfaces/IWebUIDelegatePrivate.idl:
+        Update copyright strings. Added a new key for the plug-in source URL.
+
+        * Interfaces/WebKit.idl:
+        Update copyright strings.
+
+        * WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebFrameLoaderClient::createPlugin):
+        Pass the URL of the plug-in as the source URL. Pass the document's
+        base URI for the base URL.
+
 2010-02-23  Brady Eidson  <beidson at apple.com>
 
         Reviewed by Tim Hatcher and Pavel Feldman.
diff --git a/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl b/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl
index ce00430..d9702de 100644
--- a/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl
+++ b/WebKit/win/Interfaces/IWebUIDelegatePrivate.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -33,6 +33,7 @@ import "IWebView.idl";
 
 cpp_quote("#define WebEmbeddedViewAttributesKey TEXT(\"WebEmbeddedViewAttributesKey\")")
 cpp_quote("#define WebEmbeddedViewBaseURLKey TEXT(\"WebEmbeddedViewBaseURLKey\")")
+cpp_quote("#define WebEmbeddedViewSourceURLKey TEXT(\"WebEmbeddedViewSourceURLKey\")")
 cpp_quote("#define WebEmbeddedViewContainingElementKey TEXT(\"WebEmbeddedViewContainingElementKey\")")
 cpp_quote("#define WebEmbeddedViewMIMETypeKey TEXT(\"WebEmbeddedViewMIMETypeKey\")")
 
diff --git a/WebKit/win/Interfaces/WebKit.idl b/WebKit/win/Interfaces/WebKit.idl
index 0de6b0b..c4814a1 100644
--- a/WebKit/win/Interfaces/WebKit.idl
+++ b/WebKit/win/Interfaces/WebKit.idl
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
+ * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -24,7 +24,7 @@
  */
 
 cpp_quote("/*")
-cpp_quote(" * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.")
+cpp_quote(" * Copyright (C) 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.")
 cpp_quote(" *")
 cpp_quote(" * Redistribution and use in source and binary forms, with or without")
 cpp_quote(" * modification, are permitted provided that the following conditions")
diff --git a/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp b/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
index 6ae6c5e..1437f26 100644
--- a/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/WebKit/win/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -841,7 +841,8 @@ PassRefPtr<Widget> WebFrameLoaderClient::createPlugin(const IntSize& pluginSize,
             HashMap<String, COMVariant> arguments;
 
             arguments.set(WebEmbeddedViewAttributesKey, viewArgumentsBag);
-            arguments.set(WebEmbeddedViewBaseURLKey, url.string());
+            arguments.set(WebEmbeddedViewSourceURLKey, url.string());
+            arguments.set(WebEmbeddedViewBaseURLKey, element->document()->baseURI().string());
             arguments.set(WebEmbeddedViewContainingElementKey, containingElement);
             arguments.set(WebEmbeddedViewMIMETypeKey, mimeType);
 

-- 
WebKit Debian packaging