Not reviewed.

        - fixed build from last change.

        * bridge/mac/FrameMac.h:
        * bridge/mac/FrameMac.mm:
        (WebCore::FrameMac::loadRequest):
        (WebCore::FrameMac::openURL):

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

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 8d86f8c23b02bca78060e11d5680b885122e992a..e4c520b8cb2a935e3f819a4e43a266fc190ffed9 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2006-10-23  Maciej Stachowiak  <mjs@apple.com>
+
+        Not reviewed.
+
+        - fixed build from last change.
+
+        * bridge/mac/FrameMac.h:
+        * bridge/mac/FrameMac.mm:
+        (WebCore::FrameMac::loadRequest):
+        (WebCore::FrameMac::openURL):
+
 2006-10-23  Adam Roben  <aroben@apple.com>
 
         Reviewed by Adele.

diff --git a/WebCore/bridge/mac/FrameMac.h b/WebCore/bridge/mac/FrameMac.h
index 29ac1cd0317ea037e32e77c5fca582e656f924d2..1fc3118b36d964af288b7846078f8ddb86605223 100644 (file)
--- a/WebCore/bridge/mac/FrameMac.h
+++ b/WebCore/bridge/mac/FrameMac.h
@@ -130,7 +130,7 @@ public:
     virtual void setTitle(const String&);
     virtual void setStatusBarText(const String&);
 
-    bool loadRequest(const FrameLoadRequest& request, bool userGesture, NSEvent* triggeringEvent = 0, ObjCDOMElement* submitForm = 0, NSMutableDictionary* formValues = 0);
+    void loadRequest(const FrameLoadRequest& request, bool userGesture, NSEvent* triggeringEvent = 0, ObjCDOMElement* submitForm = 0, NSMutableDictionary* formValues = 0);
 
     virtual bool openURL(const KURL&);
     virtual void submitForm(const FrameLoadRequest&);

diff --git a/WebCore/bridge/mac/FrameMac.mm b/WebCore/bridge/mac/FrameMac.mm
index 91932ff76201f1b009eceebee7ee0a215058875a..3bf146ed55cfaf394c9ac8f70a15f6bdda1bfe7d 100644 (file)
--- a/WebCore/bridge/mac/FrameMac.mm
+++ b/WebCore/bridge/mac/FrameMac.mm
@@ -379,7 +379,7 @@ void FrameMac::frameDetached()
     END_BLOCK_OBJC_EXCEPTIONS;
 }
 
-bool FrameMac::loadRequest(const FrameLoadRequest& request, bool userGesture, NSEvent* triggeringEvent, ObjCDOMElement* submitForm, NSMutableDictionary* formValues)
+void FrameMac::loadRequest(const FrameLoadRequest& request, bool userGesture, NSEvent* triggeringEvent, ObjCDOMElement* submitForm, NSMutableDictionary* formValues)
 {
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
     
@@ -452,7 +452,7 @@ void FrameMac::submitForm(const FrameLoadRequest& request)
     END_BLOCK_OBJC_EXCEPTIONS;
 }
 
-void FrameMac::openURL(const KURL &url)
+bool FrameMac::openURL(const KURL &url)
 {
     // FIXME: The lack of args here to get the reload flag from
     // indicates a problem in how we use Frame::processObjectRequest,
@@ -460,10 +460,11 @@ void FrameMac::openURL(const KURL &url)
 
     FrameLoadRequest request;
     request.m_request.setURL(url);
-    request.m_request.setReferrer(referrer());
+    request.m_request.setHTTPReferrer(referrer());
 
     loadRequest(request, userGestureHint());
 
+    return true;
 }
 
 void FrameMac::openURLRequest(const FrameLoadRequest& request)