WebCore:

	Fixed: <rdar://problem/3991974> REGRESSION: www.jabra.com world location screen does not work

        Reviewed by hyatt.

        * kwq/KWQKJavaAppletWidget.mm:
        (KJavaAppletWidget::KJavaAppletWidget): fallback to the document's base URL if there is no baseURL attribute
        * kwq/WebCoreBridge.h:
        * kwq/WebCoreBridge.mm:
        (-[WebCoreBridge baseURL]): new

WebKit:

	Fixed: <rdar://problem/3991974> REGRESSION: www.jabra.com world location screen does not work

        Reviewed by hyatt.

        * WebCoreSupport.subproj/WebBridge.m:
        (-[WebBridge viewForPluginWithURL:attributeNames:attributeValues:MIMEType:]): use the baseURL from the bridge rather than from the response

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8528 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 340147cb8aeddb284cf8d6ea073c393bf4bf9e60..33947761501820a550279f818eb54a93ed8ee19b 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2005-02-05  Chris Blumenberg  <cblu@apple.com>
+
+       Fixed: <rdar://problem/3991974> REGRESSION: www.jabra.com world location screen does not work
+
+        Reviewed by hyatt.
+
+        * kwq/KWQKJavaAppletWidget.mm:
+        (KJavaAppletWidget::KJavaAppletWidget): fallback to the document's base URL if there is no baseURL attribute
+        * kwq/WebCoreBridge.h:
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge baseURL]): new
+
 2005-02-04  David Harrison  <harrison@apple.com>
 
         Reviewed by Darin.

diff --git a/WebCore/kwq/KWQKJavaAppletWidget.mm b/WebCore/kwq/KWQKJavaAppletWidget.mm
index 0073a84ba0dd4540fefe09d41c6ec6d293f87a11..96d7f2af71881bdc9b1bcaed44692d6ccb40ffbd 100644 (file)
--- a/WebCore/kwq/KWQKJavaAppletWidget.mm
+++ b/WebCore/kwq/KWQKJavaAppletWidget.mm
@@ -25,6 +25,7 @@
 
 #import "KWQKJavaAppletWidget.h"
 
+#import "dom_docimpl.h"
 #import "KHTMLView.h"
 #import "KWQExceptions.h"
 #import "KWQKJavaAppletContext.h"
@@ -48,7 +49,10 @@ KJavaAppletWidget::KJavaAppletWidget(const QSize &size, KJavaAppletContext *c, c
         ++it;
     }
     
-    KWQKHTMLPart *part = KWQ(c->part());    
+    KWQKHTMLPart *part = KWQ(c->part());
+    if (baseURLString.isEmpty()) {
+        baseURLString = part->xmlDocImpl()->baseURL();
+    }
     setView([part->bridge() viewForJavaAppletWithFrame:NSMakeRect(0, 0, size.width(), size.height())
                                         attributeNames:attributeNames
                                        attributeValues:attributeValues

diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index ac18536cc5a87600e4639ff9a9b234b52b7e022f..6f8ff047fecc48c58e2674ad1fdbbc3821097d63 100644 (file)
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -216,6 +216,7 @@ typedef enum {
 - (void)stop;
 
 - (NSURL *)URL;
+- (NSURL *)baseURL;
 - (NSString *)referrer;
 - (NSString *)domain;
 - (WebCoreBridge *)opener;

diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index 81a5de80b8f56e3c5ec20a3c524cb64d8d305e75..8cca6b55ce04d2f8936b4e80fb0264e0862ecb25 100644 (file)
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -1287,6 +1287,11 @@ static HTMLFormElementImpl *formElementFromDOMElement(DOMElement *element)
     return _part->url().getNSURL();
 }
 
+- (NSURL *)baseURL
+{
+    return _part->completeURL(_part->xmlDocImpl()->baseURL()).getNSURL();
+}
+
 - (NSString *)referrer
 {
     return _part->referrer().getNSString();

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 37e2af8a4f639bfb378997d29fdd89a0ec30b41c..1a798426ef560cff71c62f531d1ea6083de42320 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2005-02-05  Chris Blumenberg  <cblu@apple.com>
+
+       Fixed: <rdar://problem/3991974> REGRESSION: www.jabra.com world location screen does not work
+
+        Reviewed by hyatt.
+
+        * WebCoreSupport.subproj/WebBridge.m:
+        (-[WebBridge viewForPluginWithURL:attributeNames:attributeValues:MIMEType:]): use the baseURL from the bridge rather than from the response
+
 2005-02-04  Chris Blumenberg  <cblu@apple.com>
 
        Fixed: <rdar://problem/3802781> rtf->html pasteboard conversion using xhtml

diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 29ae33915a8cc88a3fd01d9df390bc8116496dc1..9135db1cd4aeba88bd366c1c9052729062d68b83 100644 (file)
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -866,7 +866,7 @@ NSString *WebPluginContainerKey =   @"WebPluginContainer";
         }
     }
 
-    NSURL *baseURL = [[[_frame dataSource] response] URL];
+    NSURL *baseURL = [self baseURL];
     if (pluginPackage) {
         if ([pluginPackage isKindOfClass:[WebPluginPackage class]]) {
             view = [self pluginViewWithPackage:(WebPluginPackage *)pluginPackage