[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

darin darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:21:48 UTC 2009 

The following commit has been merged in the debian/unstable branch:
commit f95a5738bb902966b28f80f720dca7faf210837d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 24 20:36:23 2003 +0000

    WebCore:
    
            Reviewed by Dave.
    
    	- fixed 3142852 -- frame content repeatedly requested
    
    	The bug was that JavaScript document.referrer was totally wrong.
    
            * khtml/html/html_documentimpl.cpp: (HTMLDocumentImpl::referrer):
    	Use the new incomingReferrer() rather than referrer(), because referrer()
    	is the referrer to use for new loads in the part, not the one that was
    	used to load the document.
    
            * kwq/KWQKHTMLPart.h: Added incomingReferrer(). Also removed referrer()
    	which has been totally redundant since we made KWQKHTMLPart a subclass of KHTMLPart.
            * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::incomingReferrer): Added. Uses the bridge.
    
            * kwq/WebCoreBridge.h: Added incomingReferrer.
    
    WebKit:
    
            Reviewed by Dave.
    
    	- fixed 3142852 -- frame content repeatedly requested
    
            * WebCoreSupport.subproj/WebBridge.m: (-[WebBridge incomingReferrer]):
    	Added a way to get the referrer across the bridge, needed for bug fix.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3447 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 50a6b5a..9c7971b 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,22 @@
+2003-01-24  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed 3142852 -- frame content repeatedly requested
+
+	The bug was that JavaScript document.referrer was totally wrong.
+
+        * khtml/html/html_documentimpl.cpp: (HTMLDocumentImpl::referrer):
+	Use the new incomingReferrer() rather than referrer(), because referrer()
+	is the referrer to use for new loads in the part, not the one that was
+	used to load the document.
+
+        * kwq/KWQKHTMLPart.h: Added incomingReferrer(). Also removed referrer()
+	which has been totally redundant since we made KWQKHTMLPart a subclass of KHTMLPart.
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::incomingReferrer): Added. Uses the bridge.
+
+        * kwq/WebCoreBridge.h: Added incomingReferrer.
+
 2003-01-24  Trey Matteson  <trey at apple.com>
 
 	3155162 - cursor changes to I-beam after dragging image	
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 50a6b5a..9c7971b 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,22 @@
+2003-01-24  Darin Adler  <darin at apple.com>
+
+        Reviewed by Dave.
+
+	- fixed 3142852 -- frame content repeatedly requested
+
+	The bug was that JavaScript document.referrer was totally wrong.
+
+        * khtml/html/html_documentimpl.cpp: (HTMLDocumentImpl::referrer):
+	Use the new incomingReferrer() rather than referrer(), because referrer()
+	is the referrer to use for new loads in the part, not the one that was
+	used to load the document.
+
+        * kwq/KWQKHTMLPart.h: Added incomingReferrer(). Also removed referrer()
+	which has been totally redundant since we made KWQKHTMLPart a subclass of KHTMLPart.
+        * kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::incomingReferrer): Added. Uses the bridge.
+
+        * kwq/WebCoreBridge.h: Added incomingReferrer.
+
 2003-01-24  Trey Matteson  <trey at apple.com>
 
 	3155162 - cursor changes to I-beam after dragging image	
diff --git a/WebCore/khtml/html/html_documentimpl.cpp b/WebCore/khtml/html/html_documentimpl.cpp
index 7126021..09d069d 100644
--- a/WebCore/khtml/html/html_documentimpl.cpp
+++ b/WebCore/khtml/html/html_documentimpl.cpp
@@ -93,7 +93,13 @@ HTMLDocumentImpl::~HTMLDocumentImpl()
 DOMString HTMLDocumentImpl::referrer() const
 {
     if ( view() )
+#if APPLE_CHANGES
+        return KWQ(view()->part())->incomingReferrer();
+#else
+        // This is broken; returns the referrer used for links within this page (basically
+        // the same as the URL), not the referrer used for loading this page itself.
         return view()->part()->referrer();
+#endif
     return DOMString();
 }
 
diff --git a/WebCore/kwq/KWQKHTMLPart.h b/WebCore/kwq/KWQKHTMLPart.h
index dff0c0e..55701ed 100644
--- a/WebCore/kwq/KWQKHTMLPart.h
+++ b/WebCore/kwq/KWQKHTMLPart.h
@@ -138,7 +138,7 @@ public:
     static WebCoreBridge *bridgeForWidget(QWidget *);
     
     QString requestedURLString() const;
-    QString referrer() const;    
+    QString incomingReferrer() const;
     QString userAgent() const;
 
     QString mimeTypeForFileName(const QString &) const;
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 948bb8c..898f914 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -686,6 +686,11 @@ QString KWQKHTMLPart::requestedURLString() const
     return QString::fromNSString([_bridge requestedURL]);
 }
 
+QString KWQKHTMLPart::incomingReferrer() const
+{
+    return QString::fromNSString([_bridge incomingReferrer]);
+}
+
 void KWQKHTMLPart::forceLayout()
 {
     KHTMLView *v = d->m_view;
@@ -700,11 +705,6 @@ void KWQKHTMLPart::forceLayout()
     }
 }
 
-QString KWQKHTMLPart::referrer() const
-{
-    return d->m_referrer;
-}
-
 void KWQKHTMLPart::runJavaScriptAlert(const QString &message)
 {
     [[WebCoreViewFactory sharedFactory] runJavaScriptAlertPanelWithMessage:message.getNSString()];
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 934b5b1..ca2071d 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -249,6 +249,7 @@ enum FrameBorderStyle {
 - (void)setNeedsLayout;
 
 - (NSString *)requestedURL;
+- (NSString *)incomingReferrer;
 
 - (NSView *)viewForPluginWithURL:(NSString *)URL attributes:(NSArray *)attributesArray baseURL:(NSString *)baseURL MIMEType:(NSString *)MIMEType;
 - (NSView *)viewForJavaAppletWithFrame:(NSRect)frame attributes:(NSDictionary *)attributes baseURL:(NSString *)baseURL;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 811a68e..efd8b65 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,18 +1,19 @@
-2003-01-24  Ed Voas  <set EMAIL_ADDRESS environment variable>
+2003-01-24  Darin Adler  <darin at apple.com>
 
-        Reviewed by NOBODY (OOPS!).
+        Reviewed by Dave.
 
-        * ChangeLog:
-        * Plugins.subproj/WebBaseNetscapePluginView.m:
-        (-[WebBaseNetscapePluginView saveAndSetPortStateForUpdate:]):
+	- fixed 3142852 -- frame content repeatedly requested
+
+        * WebCoreSupport.subproj/WebBridge.m: (-[WebBridge incomingReferrer]):
+	Added a way to get the referrer across the bridge, needed for bug fix.
 
 2003-01-24  Ed Voas  <voas at apple.com>
 
         Reviewed by Darin.
 
-		Netscape plugins were being improperly positioned. I noticed this when I
-		put the web view into a window with borders around it (Carbon metal window,
-		but I would imagine Cocoa metal would do it too).
+        Netscape plugins were being improperly positioned. I noticed this when I
+        put the web view into a window with borders around it (Carbon metal window,
+        but I would imagine Cocoa metal would do it too).
 
         * Plugins.subproj/WebBaseNetscapePluginView.m:
         (-[WebBaseNetscapePluginView saveAndSetPortStateForUpdate:]):
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index c2941dd..1a45b62 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -390,6 +390,11 @@
     return [[[[self dataSource] request] URL] absoluteString];
 }
 
+- (NSString *)incomingReferrer
+{
+    return [[[self dataSource] request] referrer];
+}
+
 - (NSView <WebPlugin> *)pluginViewWithPackage:(WebPluginPackage *)pluginPackage
                                    attributes:(NSDictionary *)attributes
                                       baseURL:(NSURL *)baseURL

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list