Source/WebCore/loader/DocumentThreadableLoader.h - Issue 9956108: Merge 112997 - REGRESSION (r112217): H&R Block tax site won't load

Side by Side Diff: Source/WebCore/loader/DocumentThreadableLoader.h

Issue 9956108: Merge 112997 - REGRESSION (r112217): H&R Block tax site won't load (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/

Patch Set: Created 8 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch

« no previous file with comments | « LayoutTests/http/tests/xmlhttprequest/access-control-and-redirects-async-expected.txt ('k') | Source/WebCore/loader/DocumentThreadableLoader.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved.	2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 71 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
82 virtual void dataReceived(CachedResource, const char data, int dataLen gth);	82 virtual void dataReceived(CachedResource, const char data, int dataLen gth);

83 virtual void redirectReceived(CachedResource*, ResourceRequest&, const R esourceResponse&);	83 virtual void redirectReceived(CachedResource*, ResourceRequest&, const R esourceResponse&);

84 virtual void notifyFinished(CachedResource*);	84 virtual void notifyFinished(CachedResource*);

85 #if PLATFORM(CHROMIUM)	85 #if PLATFORM(CHROMIUM)

86 virtual void dataDownloaded(CachedResource*, int);	86 virtual void dataDownloaded(CachedResource*, int);

87 #endif	87 #endif

88	88

89 void didReceiveResponse(unsigned long identifier, const ResourceResponse &);	89 void didReceiveResponse(unsigned long identifier, const ResourceResponse &);

90 void didFinishLoading(unsigned long identifier, double finishTime);	90 void didFinishLoading(unsigned long identifier, double finishTime);

91 void didFail(const ResourceError&);	91 void didFail(const ResourceError&);

92 void makeRequest(const ResourceRequest&);	92 void makeCrossOriginAccessRequest(const ResourceRequest&);

93 void makeSimpleCrossOriginAccessRequest(const ResourceRequest& request);	93 void makeSimpleCrossOriginAccessRequest(const ResourceRequest& request);

94 void makeCrossOriginAccessRequestWithPreflight(const ResourceRequest& re quest);	94 void makeCrossOriginAccessRequestWithPreflight(const ResourceRequest& re quest);

95 void preflightSuccess();	95 void preflightSuccess();

96 void preflightFailure(const String& url, const String& errorDescription) ;	96 void preflightFailure(const String& url, const String& errorDescription) ;

97	97

98 void loadRequest(const ResourceRequest&, SecurityCheckPolicy);	98 void loadRequest(const ResourceRequest&, SecurityCheckPolicy);

99 bool isAllowedRedirect(const KURL&);	99 bool isAllowedRedirect(const KURL&);

100	100

101 SecurityOrigin* securityOrigin() const;	101 SecurityOrigin* securityOrigin() const;

102	102

103 CachedResourceHandle<CachedRawResource> m_resource;	103 CachedResourceHandle<CachedRawResource> m_resource;

104 ThreadableLoaderClient* m_client;	104 ThreadableLoaderClient* m_client;

105 Document* m_document;	105 Document* m_document;

106 ThreadableLoaderOptions m_options;	106 ThreadableLoaderOptions m_options;

107 bool m_sameOriginRequest;	107 bool m_sameOriginRequest;

108 bool m_simpleRequest;	108 bool m_simpleRequest;

109 bool m_async;	109 bool m_async;

110 OwnPtr<ResourceRequest> m_actualRequest; // non-null during Access Cont rol preflight checks	110 OwnPtr<ResourceRequest> m_actualRequest; // non-null during Access Cont rol preflight checks

111	111

112 #if ENABLE(INSPECTOR)	112 #if ENABLE(INSPECTOR)

113 unsigned long m_preflightRequestIdentifier;	113 unsigned long m_preflightRequestIdentifier;

114 #endif	114 #endif

115 };	115 };

116	116

117 } // namespace WebCore	117 } // namespace WebCore

118	118

119 #endif // DocumentThreadableLoader_h	119 #endif // DocumentThreadableLoader_h

OLD	NEW