Title: [151692] trunk/Source/WebKit
- Revision
- 151692
- Author
- roger_f...@apple.com
- Date
- 2013-06-18 13:28:26 -0700 (Tue, 18 Jun 2013)
Log Message
Unreviewed. Build fix for Mac and Win
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (151691 => 151692)
--- trunk/Source/WebKit/mac/ChangeLog 2013-06-18 20:14:32 UTC (rev 151691)
+++ trunk/Source/WebKit/mac/ChangeLog 2013-06-18 20:28:26 UTC (rev 151692)
@@ -1,5 +1,13 @@
2013-06-18 Roger Fong <roger_f...@apple.com>
+ Unreviewed. Build fix for Mac.
+
+ * WebCoreSupport/WebFrameNetworkingContext.h:
+ (WebFrameNetworkingContext::create):
+ (WebFrameNetworkingContext::WebFrameNetworkingContext):
+
+2013-06-18 Roger Fong <roger_f...@apple.com>
+
Re-implement WebFrameNetworkingContext.
<rdar://problem/13174821>.
Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.h (151691 => 151692)
--- trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.h 2013-06-18 20:14:32 UTC (rev 151691)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebFrameNetworkingContext.h 2013-06-18 20:28:26 UTC (rev 151692)
@@ -22,6 +22,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*/
+
#ifndef WebFrameNetworkingContext_h
#define WebFrameNetworkingContext_h
@@ -29,30 +30,28 @@
class WebFrameNetworkingContext : public WebCore::FrameNetworkingContext {
public:
- static PassRefPtr<WebFrameNetworkingContext> create(WebCore::Frame* frame, const String& useragent)
+ static PassRefPtr<WebFrameNetworkingContext> create(WebCore::Frame* frame)
{
- return adoptRef(new WebFrameNetworkingContext(frame, useragent));
+ return adoptRef(new WebFrameNetworkingContext(frame));
}
-#if USE(CFNETWORK)
- static void setCookieAcceptPolicyForAllContexts(WebKitCookieStorageAcceptPolicy);
-#endif
- static void setPrivateBrowsingStorageSessionIdentifierBase(const String&);
static void ensurePrivateBrowsingSession();
static void destroyPrivateBrowsingSession();
private:
- WebFrameNetworkingContext(WebCore::Frame* frame, const String& userAgent)
- : WebCore::FrameNetworkingContext(frame), m_userAgent(userAgent)
+
+ WebFrameNetworkingContext(WebCore::Frame* frame)
+ : WebCore::FrameNetworkingContext(frame)
{
}
+ virtual bool needsSiteSpecificQuirks() const OVERRIDE;
+ virtual bool localFileContentSniffingEnabled() const OVERRIDE;
+ virtual SchedulePairHashSet* scheduledRunLoopPairs() const OVERRIDE;
+ virtual RetainPtr<CFDataRef> sourceApplicationAuditData() const OVERRIDE;
virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const OVERRIDE;
virtual WebCore::NetworkStorageSession& storageSession() const OVERRIDE;
- virtual String referrer() const OVERRIDE;
- virtual String userAgent() const { return m_userAgent; }
- String m_userAgent;
};
#endif
Modified: trunk/Source/WebKit/win/ChangeLog (151691 => 151692)
--- trunk/Source/WebKit/win/ChangeLog 2013-06-18 20:14:32 UTC (rev 151691)
+++ trunk/Source/WebKit/win/ChangeLog 2013-06-18 20:28:26 UTC (rev 151692)
@@ -1,5 +1,14 @@
2013-06-18 Roger Fong <roger_f...@apple.com>
+ Unreviewed. Build fix for Apple Windows.
+
+ * WebCoreSupport/WebFrameNetworkingContext.h:
+ (WebFrameNetworkingContext::create):
+ (WebFrameNetworkingContext::WebFrameNetworkingContext):
+ (WebFrameNetworkingContext::userAgent):
+
+2013-06-18 Roger Fong <roger_f...@apple.com>
+
Re-implement WebFrameNetworkingContext.
<rdar://problem/13174821>.
Modified: trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.h (151691 => 151692)
--- trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.h 2013-06-18 20:14:32 UTC (rev 151691)
+++ trunk/Source/WebKit/win/WebCoreSupport/WebFrameNetworkingContext.h 2013-06-18 20:28:26 UTC (rev 151692)
@@ -22,7 +22,6 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-
#ifndef WebFrameNetworkingContext_h
#define WebFrameNetworkingContext_h
@@ -30,28 +29,30 @@
class WebFrameNetworkingContext : public WebCore::FrameNetworkingContext {
public:
- static PassRefPtr<WebFrameNetworkingContext> create(WebCore::Frame* frame)
+ static PassRefPtr<WebFrameNetworkingContext> create(WebCore::Frame* frame, const String& useragent)
{
- return adoptRef(new WebFrameNetworkingContext(frame));
+ return adoptRef(new WebFrameNetworkingContext(frame, useragent));
}
+#if USE(CFNETWORK)
+ static void setCookieAcceptPolicyForAllContexts(WebKitCookieStorageAcceptPolicy);
+#endif
+ static void setPrivateBrowsingStorageSessionIdentifierBase(const String&);
static void ensurePrivateBrowsingSession();
static void destroyPrivateBrowsingSession();
private:
-
- WebFrameNetworkingContext(WebCore::Frame* frame)
- : WebCore::FrameNetworkingContext(frame)
+ WebFrameNetworkingContext(WebCore::Frame* frame, const String& userAgent)
+ : WebCore::FrameNetworkingContext(frame), m_userAgent(userAgent)
{
}
- virtual bool needsSiteSpecificQuirks() const OVERRIDE;
- virtual bool localFileContentSniffingEnabled() const OVERRIDE;
- virtual SchedulePairHashSet* scheduledRunLoopPairs() const OVERRIDE;
- virtual RetainPtr<CFDataRef> sourceApplicationAuditData() const OVERRIDE;
virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&) const OVERRIDE;
virtual WebCore::NetworkStorageSession& storageSession() const OVERRIDE;
+ virtual String referrer() const OVERRIDE;
+ virtual String userAgent() const { return m_userAgent; }
+ String m_userAgent;
};
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
