[webkit-changes] [92623] trunk/Source/WebCore

Mon, 08 Aug 2011 12:54:54 -0700

Title: [92623] trunk/Source/WebCore
Revision
92623
Author
[email protected]
Date
2011-08-08 12:54:46 -0700 (Mon, 08 Aug 2011)

Log Message

Use a raw pointer to the security origin in the ctor of FrameLoadRequest
https://bugs.webkit.org/show_bug.cgi?id=65852

Reviewed by Alexey Proskuryakov.

* loader/FrameLoadRequest.h:
(WebCore::FrameLoadRequest::FrameLoadRequest):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::changeLocation):
* loader/FrameLoader.h:
* loader/NavigationScheduler.cpp:
(WebCore::ScheduledURLNavigation::ScheduledURLNavigation):
(WebCore::ScheduledURLNavigation::fire):
(WebCore::ScheduledRedirect::ScheduledRedirect):
(WebCore::ScheduledLocationChange::ScheduledLocationChange):
(WebCore::ScheduledRefresh::ScheduledRefresh):
(WebCore::NavigationScheduler::scheduleLocationChange):
* loader/NavigationScheduler.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (92622 => 92623)


--- trunk/Source/WebCore/ChangeLog	2011-08-08 19:47:02 UTC (rev 92622)
+++ trunk/Source/WebCore/ChangeLog	2011-08-08 19:54:46 UTC (rev 92623)
@@ -1,3 +1,24 @@
+2011-08-08  Jochen Eisinger  <[email protected]>
+
+        Use a raw pointer to the security origin in the ctor of FrameLoadRequest
+        https://bugs.webkit.org/show_bug.cgi?id=65852
+
+        Reviewed by Alexey Proskuryakov.
+
+        * loader/FrameLoadRequest.h:
+        (WebCore::FrameLoadRequest::FrameLoadRequest):
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::changeLocation):
+        * loader/FrameLoader.h:
+        * loader/NavigationScheduler.cpp:
+        (WebCore::ScheduledURLNavigation::ScheduledURLNavigation):
+        (WebCore::ScheduledURLNavigation::fire):
+        (WebCore::ScheduledRedirect::ScheduledRedirect):
+        (WebCore::ScheduledLocationChange::ScheduledLocationChange):
+        (WebCore::ScheduledRefresh::ScheduledRefresh):
+        (WebCore::NavigationScheduler::scheduleLocationChange):
+        * loader/NavigationScheduler.h:
+
 2011-08-08  Ryosuke Niwa  <[email protected]>
 
         Remove redundant inline styles from the pasted contents more aggressively

Modified: trunk/Source/WebCore/loader/FrameLoadRequest.h (92622 => 92623)


--- trunk/Source/WebCore/loader/FrameLoadRequest.h	2011-08-08 19:47:02 UTC (rev 92622)
+++ trunk/Source/WebCore/loader/FrameLoadRequest.h	2011-08-08 19:54:46 UTC (rev 92623)
@@ -33,18 +33,18 @@
 
 struct FrameLoadRequest {
 public:
-    explicit FrameLoadRequest(PassRefPtr<SecurityOrigin> requester)
+    explicit FrameLoadRequest(SecurityOrigin* requester)
         : m_requester(requester)
     {
     }
 
-    FrameLoadRequest(PassRefPtr<SecurityOrigin> requester, const ResourceRequest& resourceRequest)
+    FrameLoadRequest(SecurityOrigin* requester, const ResourceRequest& resourceRequest)
         : m_requester(requester)
         , m_resourceRequest(resourceRequest)
     {
     }
 
-    FrameLoadRequest(PassRefPtr<SecurityOrigin> requester, const ResourceRequest& resourceRequest, const String& frameName)
+    FrameLoadRequest(SecurityOrigin* requester, const ResourceRequest& resourceRequest, const String& frameName)
         : m_requester(requester)
         , m_resourceRequest(resourceRequest)
         , m_frameName(frameName)

Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (92622 => 92623)


--- trunk/Source/WebCore/loader/FrameLoader.cpp	2011-08-08 19:47:02 UTC (rev 92622)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp	2011-08-08 19:54:46 UTC (rev 92623)
@@ -259,7 +259,7 @@
     }
 }
 
-void FrameLoader::changeLocation(PassRefPtr<SecurityOrigin> securityOrigin, const KURL& url, const String& referrer, bool lockHistory, bool lockBackForwardList, bool refresh)
+void FrameLoader::changeLocation(SecurityOrigin* securityOrigin, const KURL& url, const String& referrer, bool lockHistory, bool lockBackForwardList, bool refresh)
 {
     RefPtr<Frame> protect(m_frame);
     urlSelected(FrameLoadRequest(securityOrigin, ResourceRequest(url, referrer, refresh ? ReloadIgnoringCacheData : UseProtocolCachePolicy), "_self"),

Modified: trunk/Source/WebCore/loader/FrameLoader.h (92622 => 92623)


--- trunk/Source/WebCore/loader/FrameLoader.h	2011-08-08 19:47:02 UTC (rev 92622)
+++ trunk/Source/WebCore/loader/FrameLoader.h	2011-08-08 19:54:46 UTC (rev 92623)
@@ -107,7 +107,7 @@
 #endif
     unsigned long loadResourceSynchronously(const ResourceRequest&, StoredCredentials, ResourceError&, ResourceResponse&, Vector<char>& data);
 
-    void changeLocation(PassRefPtr<SecurityOrigin>, const KURL&, const String& referrer, bool lockHistory = true, bool lockBackForwardList = true, bool refresh = false);
+    void changeLocation(SecurityOrigin*, const KURL&, const String& referrer, bool lockHistory = true, bool lockBackForwardList = true, bool refresh = false);
     void urlSelected(const KURL&, const String& target, PassRefPtr<Event>, bool lockHistory, bool lockBackForwardList, ReferrerPolicy);
     void submitForm(PassRefPtr<FormSubmission>);

Modified: trunk/Source/WebCore/loader/NavigationScheduler.cpp (92622 => 92623)


--- trunk/Source/WebCore/loader/NavigationScheduler.cpp	2011-08-08 19:47:02 UTC (rev 92622)
+++ trunk/Source/WebCore/loader/NavigationScheduler.cpp	2011-08-08 19:54:46 UTC (rev 92623)
@@ -94,7 +94,7 @@
 
 class ScheduledURLNavigation : public ScheduledNavigation {
 protected:
-    ScheduledURLNavigation(double delay, PassRefPtr<SecurityOrigin> securityOrigin, const String& url, const String& referrer, bool lockHistory, bool lockBackForwardList, bool duringLoad, bool isLocationChange)
+    ScheduledURLNavigation(double delay, SecurityOrigin* securityOrigin, const String& url, const String& referrer, bool lockHistory, bool lockBackForwardList, bool duringLoad, bool isLocationChange)
         : ScheduledNavigation(delay, lockHistory, lockBackForwardList, duringLoad, isLocationChange)
         , m_securityOrigin(securityOrigin)
         , m_url(url)
@@ -106,7 +106,7 @@
     virtual void fire(Frame* frame)
     {
         UserGestureIndicator gestureIndicator(wasUserGesture() ? DefinitelyProcessingUserGesture : DefinitelyNotProcessingUserGesture);
-        frame->loader()->changeLocation(m_securityOrigin, KURL(ParsedURLString, m_url), m_referrer, lockHistory(), lockBackForwardList(), false);
+        frame->loader()->changeLocation(m_securityOrigin.get(), KURL(ParsedURLString, m_url), m_referrer, lockHistory(), lockBackForwardList(), false);
     }
 
     virtual void didStartTimer(Frame* frame, Timer<NavigationScheduler>* timer)
@@ -146,7 +146,7 @@
 
 class ScheduledRedirect : public ScheduledURLNavigation {
 public:
-    ScheduledRedirect(double delay, PassRefPtr<SecurityOrigin> securityOrigin, const String& url, bool lockHistory, bool lockBackForwardList)
+    ScheduledRedirect(double delay, SecurityOrigin* securityOrigin, const String& url, bool lockHistory, bool lockBackForwardList)
         : ScheduledURLNavigation(delay, securityOrigin, url, String(), lockHistory, lockBackForwardList, false, false)
     {
         clearUserGesture();
@@ -164,13 +164,13 @@
 
 class ScheduledLocationChange : public ScheduledURLNavigation {
 public:
-    ScheduledLocationChange(PassRefPtr<SecurityOrigin> securityOrigin, const String& url, const String& referrer, bool lockHistory, bool lockBackForwardList, bool duringLoad)
+    ScheduledLocationChange(SecurityOrigin* securityOrigin, const String& url, const String& referrer, bool lockHistory, bool lockBackForwardList, bool duringLoad)
         : ScheduledURLNavigation(0.0, securityOrigin, url, referrer, lockHistory, lockBackForwardList, duringLoad, true) { }
 };
 
 class ScheduledRefresh : public ScheduledURLNavigation {
 public:
-    ScheduledRefresh(PassRefPtr<SecurityOrigin> securityOrigin, const String& url, const String& referrer)
+    ScheduledRefresh(SecurityOrigin* securityOrigin, const String& url, const String& referrer)
         : ScheduledURLNavigation(0.0, securityOrigin, url, referrer, true, true, false, true)
     {
     }
@@ -332,7 +332,7 @@
     return false;
 }
 
-void NavigationScheduler::scheduleLocationChange(PassRefPtr<SecurityOrigin> securityOrigin, const String& url, const String& referrer, bool lockHistory, bool lockBackForwardList)
+void NavigationScheduler::scheduleLocationChange(SecurityOrigin* securityOrigin, const String& url, const String& referrer, bool lockHistory, bool lockBackForwardList)
 {
     if (!shouldScheduleNavigation(url))
         return;

Modified: trunk/Source/WebCore/loader/NavigationScheduler.h (92622 => 92623)


--- trunk/Source/WebCore/loader/NavigationScheduler.h	2011-08-08 19:47:02 UTC (rev 92622)
+++ trunk/Source/WebCore/loader/NavigationScheduler.h	2011-08-08 19:54:46 UTC (rev 92623)
@@ -75,7 +75,7 @@
     bool locationChangePending();
 
     void scheduleRedirect(double delay, const String& url);
-    void scheduleLocationChange(PassRefPtr<SecurityOrigin>, const String& url, const String& referrer, bool lockHistory = true, bool lockBackForwardList = true);
+    void scheduleLocationChange(SecurityOrigin*, const String& url, const String& referrer, bool lockHistory = true, bool lockBackForwardList = true);
     void scheduleFormSubmission(PassRefPtr<FormSubmission>);
     void scheduleRefresh();
     void scheduleHistoryNavigation(int steps);

_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to