Changeset 17267 in webkit

Timestamp:

Oct 24, 2006 3:24:18 PM (18 years ago)

Author:

ggaren

Message:

Rolling back in, now fixed:

Nixed a few more redundant loading functions in Frame. Did my best to update
the non-Mac builds.

• bridge/mac/FrameMac.h:
• bridge/mac/FrameMac.mm: (WebCore::FrameMac::urlSelected): Kept always 'true' argument for userGesture always 'true', because changing it broke the world, and testing seems to indicate that the one caller that might have passed 'false' didn't need to.
• page/Frame.cpp: (WebCore::Frame::requestFrame): (WebCore::Frame::frameLoader): (WebCore::Frame::redirectionTimerFired):
• page/Frame.h:
• platform/gdk/FrameGdk.cpp:
• platform/gdk/FrameGdk.h:
• platform/gdk/TemporaryLinkStubs.cpp: (FrameGdk::issueCopyCommand):
• platform/qt/FrameQt.cpp:
• platform/qt/FrameQt.h:
• platform/win/TemporaryLinkStubs.cpp: (WebCore::FrameWin::shouldInterruptJavaScript): (WebCore::FrameWin::issueCopyCommand):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/mac/FrameMac.h (modified) (1 diff)
• bridge/mac/FrameMac.mm (modified) (2 diffs)
• page/Frame.cpp (modified) (5 diffs)
• page/Frame.h (modified) (1 diff)
• platform/gdk/FrameGdk.cpp (modified) (1 diff)
• platform/gdk/FrameGdk.h (modified) (1 diff)
• platform/gdk/TemporaryLinkStubs.cpp (modified) (1 diff)
• platform/qt/FrameQt.cpp (modified) (2 diffs)
• platform/qt/FrameQt.h (modified) (1 diff)
• platform/win/TemporaryLinkStubs.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-10-24  Geoffrey Garen  <ggaren@apple.com>
+
+        Rolling back in, now fixed:
+        
+        Nixed a few more redundant loading functions in Frame. Did my best to update
+        the non-Mac builds.
+
+        * bridge/mac/FrameMac.h:
+        * bridge/mac/FrameMac.mm:
+        (WebCore::FrameMac::urlSelected): Kept always 'true' argument for userGesture
+        always 'true', because changing it broke the world, and testing seems to
+        indicate that the one caller that might have passed 'false' didn't need to.
+        * page/Frame.cpp:
+        (WebCore::Frame::requestFrame):
+        (WebCore::Frame::frameLoader):
+        (WebCore::Frame::redirectionTimerFired):
+        * page/Frame.h:
+        * platform/gdk/FrameGdk.cpp:
+        * platform/gdk/FrameGdk.h:
+        * platform/gdk/TemporaryLinkStubs.cpp:
+        (FrameGdk::issueCopyCommand):
+        * platform/qt/FrameQt.cpp:
+        * platform/qt/FrameQt.h:
+        * platform/win/TemporaryLinkStubs.cpp:
+        (WebCore::FrameWin::shouldInterruptJavaScript):
+        (WebCore::FrameWin::issueCopyCommand):
+
 2006-10-24  Anders Carlsson  <acarlsson@apple.com>
 

trunk/WebCore/bridge/mac/FrameMac.h

@@ -120 +120 @@
 
     // FIXME: Merge these and move them into WebFrameLoader.
-    virtual bool openURL(const KURL&);
-    virtual void openURLRequest(const FrameLoadRequest&);
     void loadRequest(const FrameLoadRequest&, bool userGesture, NSEvent* triggeringEvent = 0, ObjCDOMElement* submitForm = 0, NSMutableDictionary* formValues = 0);
     virtual void urlSelected(const FrameLoadRequest&, const Event* triggeringEvent);

trunk/WebCore/bridge/mac/FrameMac.mm

@@ -264 +264 @@
 }
 
-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,
-    // where we are opening the URL before the args are set up.
-
-    FrameLoadRequest request;
-    request.m_request.setURL(url);
-    request.m_request.setHTTPReferrer(referrer());
-
-    loadRequest(request, userGestureHint());
-
-    return true;
-}
-
-void FrameMac::openURLRequest(const FrameLoadRequest& request)
-{
-    loadRequest(request, userGestureHint());
-}
-
 void FrameMac::urlSelected(const FrameLoadRequest& request, const Event* /*triggeringEvent*/)
 {
@@ -290 +270 @@
         copy.m_request.setHTTPReferrer(referrer());
 
+    // FIXME: How do we know that userGesture is always true?
     loadRequest(copy, true, _currentEvent);
 }

trunk/WebCore/page/Frame.cpp

@@ -239 +239 @@
 }
 
-#pragma mark END LOADING FUNCTIONS
-
-bool Frame::openURL(const KURL& URL)
-{
-    ASSERT_NOT_REACHED();
-    return true;
-}
+#pragma mark BEGIN LOADING FUNCTIONS
 
 void Frame::changeLocation(const DeprecatedString& URL, const String& referrer, bool lockHistory, bool userGesture)
@@ -297 +291 @@
 }
 
-FrameLoader* Frame::frameLoader()
-{
-    return d->m_frameLoader;
-}
-
 bool Frame::requestFrame(Element* ownerElement, const String& urlParam, const AtomicString& frameName)
 {
@@ -320 +309 @@
         FrameLoadRequest frameRequest;
         frameRequest.m_request = request;
-        frame->openURLRequest(frameRequest);
+        frame->urlSelected(frameRequest, 0);
     } else
         frame = loadSubframe(ownerElement, url, frameName, d->m_referrer);
@@ -541 +530 @@
 
 #pragma mark END LOADING FUNCTIONS
+
+FrameLoader* Frame::frameLoader()
+{
+    return d->m_frameLoader;
+}
 
 KURL Frame::iconURL()
@@ -1323 +1317 @@
         // in both IE and NS (but not in Mozilla).... we can't easily do that
         // in Konqueror...
-        if (d->m_scheduledHistoryNavigationSteps == 0) // add && parent() to get only frames, but doesn't matter
-            openURL(url()); /// ## need args.reload=true?
+        if (d->m_scheduledHistoryNavigationSteps == 0)
+            urlSelected(url(), "", 0);
         else {
             if (d->m_extension) {

trunk/WebCore/page/Frame.h

@@ -110 +110 @@
 
   // FIXME: Merge these methods and move them into FrameLoader.
-  virtual bool openURL(const KURL&);
-  virtual void openURLRequest(const FrameLoadRequest&) = 0;
   void changeLocation(const DeprecatedString& URL, const String& referrer, bool lockHistory = true, bool userGesture = false);
   virtual void urlSelected(const ResourceRequest&, const String& target, const Event* triggeringEvent, bool lockHistory = false);

trunk/WebCore/platform/gdk/FrameGdk.cpp

@@ -201 +201 @@
 }
 
-bool FrameGdk::openURL(const KURL& url)
-{
-    if (!m_client)
-        return false;
-
-    m_client->openURL(url);
-    return true;
-}
-
 void FrameGdk::submitForm(const FrameLoadRequest& frameLoadRequest)
 {

trunk/WebCore/platform/gdk/FrameGdk.h

@@ -79 +79 @@
 
     void handleGdkEvent(GdkEvent*);
-    virtual bool openURL(const KURL&);
-    virtual void openURLRequest(const FrameLoadRequest&);
     virtual void submitForm(const FrameLoadRequest&);
     virtual void urlSelected(const FrameLoadRequest&);

trunk/WebCore/platform/gdk/TemporaryLinkStubs.cpp

@@ -163 +163 @@
 void FrameGdk::issueCutCommand() { notImplemented(); }
 void FrameGdk::issueCopyCommand() { notImplemented(); }
-void FrameGdk::openURLRequest(struct WebCore::FrameLoadRequest const&) { notImplemented(); }
 void FrameGdk::issueUndoCommand() { notImplemented(); }
 String FrameGdk::mimeTypeForFileName(String const&) const { notImplemented(); return String(); }

trunk/WebCore/platform/qt/FrameQt.cpp

@@ -127 +127 @@
 }
 
-bool FrameQt::openURL(const KURL& url)
-{
-    if (!m_client)
-        return false;
-
-    m_client->openURL(url);
-    return true;
-}
-
 void FrameQt::submitForm(const FrameLoadRequest& frameLoadRequest)
 {
@@ -305 +296 @@
 {
     // FIXME: Implement this as soon a KPart is created...
-}
-
-void FrameQt::openURLRequest(const FrameLoadRequest& request)
-{
-    urlSelected(request, 0);
 }
 

trunk/WebCore/platform/qt/FrameQt.h

@@ -49 +49 @@
     virtual ~FrameQt();
 
-    virtual bool openURL(const KURL&);
-    virtual void openURLRequest(const FrameLoadRequest&);
     virtual void submitForm(const FrameLoadRequest&);
     virtual void urlSelected(const FrameLoadRequest&, const Event*);

trunk/WebCore/platform/win/TemporaryLinkStubs.cpp

@@ -167 +167 @@
 bool FrameWin::runJavaScriptPrompt(String const&, String const&, String &) { notImplemented(); return 0; }
 bool FrameWin::shouldInterruptJavaScript() { notImplemented(); return false; }
-bool FrameWin::openURL(KURL const&) { notImplemented(); return 0; }
 void FrameWin::print() { notImplemented(); }
 KJS::Bindings::Instance* FrameWin::getAppletInstanceForWidget(Widget*) { notImplemented(); return 0; }
@@ -173 +172 @@
 void FrameWin::issueCutCommand() { notImplemented(); }
 void FrameWin::issueCopyCommand() { notImplemented(); }
-void FrameWin::openURLRequest(const FrameLoadRequest&) { notImplemented(); }
 bool FrameWin::passWheelEventToChildWidget(Node*) { notImplemented(); return 0; }
 void FrameWin::issueUndoCommand() { notImplemented(); }