Attachment #34184 for bug #28003

View Details Raw Unified Return to Bug 28003



2009-08-05  Michael Nordman  <michaeln@google.com>

        Reviewed by NOBODY (OOPS!).

        https://bugs.webkit.org/show_bug.cgi?id=28003

        House cleaning. Define ResourceRequest as a 'class' instead of a 'struct'.

        No new tests.

        * history/HistoryItem.h:
        * inspector/InspectorController.h:
        * inspector/InspectorResource.h:
        * loader/DocumentThreadableLoader.h:
        * loader/FrameLoaderClient.h:
        * loader/MainResourceLoader.h:
        * loader/SubresourceLoader.h:
        * loader/SubresourceLoaderClient.h:
        * loader/ThreadableLoader.h:
        * loader/WorkerThreadableLoader.h:
        * loader/appcache/ApplicationCache.h:
        * loader/appcache/ApplicationCacheHost.h:
        * platform/CrossThreadCopier.h:
        * platform/network/ResourceHandle.h:
        * platform/network/ResourceHandleClient.h:
        * platform/network/ResourceRequestBase.h:
        * platform/network/cf/ResourceRequest.h:
        * platform/network/cf/ResourceRequestCFNet.h:
        * platform/network/chromium/ResourceRequest.h:
        * platform/network/curl/ResourceRequest.h:
        * platform/network/qt/ResourceRequest.h:
        * platform/network/soup/ResourceRequest.h:
        * xml/XMLHttpRequest.h:

2009-08-05  Dimitri Glazkov  <dglazkov@chromium.org>

        Unreviewed, build fix.

Lines 50-56 class FormData; WebCore/history/HistoryItem.h_sec1
- WebCore/history/HistoryItem.h -1 / +1 lines
50	class HistoryItem;	50	class HistoryItem;
51	class Image;	51	class Image;
52	class KURL;	52	class KURL;
53	struct ResourceRequest;	53	class ResourceRequest;
54		54
55	typedef Vector<RefPtr<HistoryItem> > HistoryItemVector;	55	typedef Vector<RefPtr<HistoryItem> > HistoryItemVector;
56		56

Lines 66-72 class StorageArea; WebCore/inspector/InspectorController.h_sec1
- WebCore/inspector/InspectorController.h -1 / +1 lines
66	class KURL;	66	class KURL;
67	class Node;	67	class Node;
68	class Page;	68	class Page;
69	struct ResourceRequest;	69	class ResourceRequest;
70	class ResourceResponse;	70	class ResourceResponse;
71	class ResourceError;	71	class ResourceError;
72	class ScriptCallStack;	72	class ScriptCallStack;



    class InspectorFrontend;
    class Frame;
    class ResourceResponse;
    class ResourceRequest;
    struct ResourceRequest;

    class InspectorResource : public RefCounted<InspectorResource> {
    public:

Lines 39-45 WebCore/loader/DocumentThreadableLoader.h_sec1
- WebCore/loader/DocumentThreadableLoader.h -1 / +1 lines
39		39
40	namespace WebCore {	40	namespace WebCore {
41	class Document;	41	class Document;
42	struct ResourceRequest;	42	class ResourceRequest;
43	class ThreadableLoaderClient;	43	class ThreadableLoaderClient;
44		44
45	class DocumentThreadableLoader : public RefCounted<DocumentThreadableLoader>, public ThreadableLoader, private SubresourceLoaderClient {	45	class DocumentThreadableLoader : public RefCounted<DocumentThreadableLoader>, public ThreadableLoader, private SubresourceLoaderClient {

Lines 63-69 namespace WebCore { WebCore/loader/FrameLoaderClient.h_sec1
- WebCore/loader/FrameLoaderClient.h -1 / +1 lines
63	class ResourceError;	63	class ResourceError;
64	class ResourceHandle;	64	class ResourceHandle;
65	class ResourceLoader;	65	class ResourceLoader;
66	struct ResourceRequest;	66	class ResourceRequest;
67	class ResourceResponse;	67	class ResourceResponse;
68	class ScriptString;	68	class ScriptString;
69	class SharedBuffer;	69	class SharedBuffer;

Lines 40-46 WebCore/loader/MainResourceLoader.h_sec1
- WebCore/loader/MainResourceLoader.h -1 / +1 lines
40	namespace WebCore {	40	namespace WebCore {
41		41
42	class FormState;	42	class FormState;
43	struct ResourceRequest;	43	class ResourceRequest;
44		44
45	class MainResourceLoader : public ResourceLoader {	45	class MainResourceLoader : public ResourceLoader {
46	public:	46	public:

Lines 33-39 WebCore/loader/SubresourceLoader.h_sec1
- WebCore/loader/SubresourceLoader.h -1 / +1 lines
33		33
34	namespace WebCore {	34	namespace WebCore {
35		35
36	struct ResourceRequest;	36	class ResourceRequest;
37	class SubresourceLoaderClient;	37	class SubresourceLoaderClient;
38		38
39	class SubresourceLoader : public ResourceLoader {	39	class SubresourceLoader : public ResourceLoader {

Lines 33-39 namespace WebCore { WebCore/loader/SubresourceLoaderClient.h_sec1
- WebCore/loader/SubresourceLoaderClient.h -1 / +1 lines
33		33
34	class AuthenticationChallenge;	34	class AuthenticationChallenge;
35	class ResourceError;	35	class ResourceError;
36	struct ResourceRequest;	36	class ResourceRequest;
37	class ResourceResponse;	37	class ResourceResponse;
38	class SubresourceLoader;	38	class SubresourceLoader;
39		39

Lines 38-44 WebCore/loader/ThreadableLoader.h_sec1
- WebCore/loader/ThreadableLoader.h -1 / +1 lines
38	namespace WebCore {	38	namespace WebCore {
39		39
40	class ResourceError;	40	class ResourceError;
41	struct ResourceRequest;	41	class ResourceRequest;
42	class ResourceResponse;	42	class ResourceResponse;
43	class ScriptExecutionContext;	43	class ScriptExecutionContext;
44	class ThreadableLoaderClient;	44	class ThreadableLoaderClient;

Lines 47-53 WebCore/loader/WorkerThreadableLoader.h_sec1
- WebCore/loader/WorkerThreadableLoader.h -1 / +1 lines
47	namespace WebCore {	47	namespace WebCore {
48		48
49	class ResourceError;	49	class ResourceError;
50	struct ResourceRequest;	50	class ResourceRequest;
51	class WorkerContext;	51	class WorkerContext;
52	class WorkerLoaderProxy;	52	class WorkerLoaderProxy;
53	struct CrossThreadResourceResponseData;	53	struct CrossThreadResourceResponseData;



class ApplicationCacheResource;
class DocumentLoader;
class KURL;
class ResourceRequest;
struct ResourceRequest;

typedef Vector<std::pair<KURL, KURL> > FallbackURLVector;


Lines 48-54 namespace WebCore { WebCore/loader/appcache/ApplicationCacheHost.h_sec1
- WebCore/loader/appcache/ApplicationCacheHost.h -1 / +1 lines
48	class KURL;	48	class KURL;
49	class ResourceLoader;	49	class ResourceLoader;
50	class ResourceError;	50	class ResourceError;
51	struct ResourceRequest;	51	class ResourceRequest;
52	class ResourceResponse;	52	class ResourceResponse;
53	class SubstituteData;	53	class SubstituteData;
54		54

Lines 41-47 WebCore/platform/CrossThreadCopier.h_sec1
- WebCore/platform/CrossThreadCopier.h -1 / +1 lines
41	namespace WebCore {	41	namespace WebCore {
42		42
43	class ResourceError;	43	class ResourceError;
44	struct ResourceRequest;	44	class ResourceRequest;
45	class ResourceResponse;	45	class ResourceResponse;
46	class String;	46	class String;
47	struct CrossThreadResourceResponseData;	47	struct CrossThreadResourceResponseData;

Lines 84-90 class KURL; WebCore/platform/network/ResourceHandle.h_sec1
- WebCore/platform/network/ResourceHandle.h -1 / +1 lines
84	class ResourceError;	84	class ResourceError;
85	class ResourceHandleClient;	85	class ResourceHandleClient;
86	class ResourceHandleInternal;	86	class ResourceHandleInternal;
87	struct ResourceRequest;	87	class ResourceRequest;
88	class ResourceResponse;	88	class ResourceResponse;
89	class SchedulePair;	89	class SchedulePair;
90	class SharedBuffer;	90	class SharedBuffer;

Lines 50-56 namespace WebCore { WebCore/platform/network/ResourceHandleClient.h_sec1
- WebCore/platform/network/ResourceHandleClient.h -1 / +1 lines
50	class KURL;	50	class KURL;
51	class ResourceHandle;	51	class ResourceHandle;
52	class ResourceError;	52	class ResourceError;
53	struct ResourceRequest;	53	class ResourceRequest;
54	class ResourceResponse;	54	class ResourceResponse;
55		55
56	enum CacheStoragePolicy {	56	enum CacheStoragePolicy {

Lines 46-52 namespace WebCore { WebCore/platform/network/ResourceRequestBase.h_sec1
- WebCore/platform/network/ResourceRequestBase.h -1 / +1 lines
46		46
47	const int unspecifiedTimeoutInterval = INT_MAX;	47	const int unspecifiedTimeoutInterval = INT_MAX;
48		48
49	struct ResourceRequest;	49	class ResourceRequest;
50	struct CrossThreadResourceRequestData;	50	struct CrossThreadResourceRequestData;
51		51
52	// Do not use this type directly. Use ResourceRequest instead.	52	// Do not use this type directly. Use ResourceRequest instead.




namespace WebCore {

    class ResourceRequest : public ResourceRequestBase {

        ResourceRequest(const String& url) 
            : ResourceRequestBase(KURL(url), UseProtocolCachePolicy)

        CFURLRequestRef cfURLRequest() const;       

    private:
        friend class ResourceRequestBase;

        void doUpdatePlatformRequest();
        void doUpdateResourceRequest();

Lines 30-36 typedef const struct _CFURLRequest* CFUR WebCore/platform/network/cf/ResourceRequestCFNet.h_sec1
- WebCore/platform/network/cf/ResourceRequestCFNet.h -1 / +1 lines
30		30
31	namespace WebCore {	31	namespace WebCore {
32		32
33	struct ResourceRequest;	33	class ResourceRequest;
34		34
35	void getResourceRequest(ResourceRequest&, CFURLRequestRef);	35	void getResourceRequest(ResourceRequest&, CFURLRequestRef);
36	CFURLRequestRef cfURLRequest(const ResourceRequest&);	36	CFURLRequestRef cfURLRequest(const ResourceRequest&);

Lines 35-41 namespace WebCore { WebCore/platform/network/chromium/ResourceRequest.h_sec1
- WebCore/platform/network/chromium/ResourceRequest.h -1 / +1 lines
35		35
36	class Frame;	36	class Frame;
37		37
38	struct ResourceRequest : public ResourceRequestBase {	38	class ResourceRequest : public ResourceRequestBase {
39	public:	39	public:
40	enum TargetType {	40	enum TargetType {
41	TargetIsMainFrame,	41	TargetIsMainFrame,

Lines 33-39 typedef const struct _CFURLRequest* CFUR WebCore/platform/network/curl/ResourceRequest.h_sec1
- WebCore/platform/network/curl/ResourceRequest.h -1 / +1 lines
33		33
34	namespace WebCore {	34	namespace WebCore {
35		35
36	struct ResourceRequest : ResourceRequestBase {	36	class ResourceRequest : public ResourceRequestBase {
37		37
38	ResourceRequest(const String& url)	38	ResourceRequest(const String& url)
39	: ResourceRequestBase(KURL(url), UseProtocolCachePolicy)	39	: ResourceRequestBase(KURL(url), UseProtocolCachePolicy)

Lines 35-41 QT_END_NAMESPACE WebCore/platform/network/qt/ResourceRequest.h_sec1
- WebCore/platform/network/qt/ResourceRequest.h -1 / +1 lines
35		35
36	namespace WebCore {	36	namespace WebCore {
37		37
38	struct ResourceRequest : ResourceRequestBase {	38	class ResourceRequest : public ResourceRequestBase {
39		39
40	ResourceRequest(const String& url)	40	ResourceRequest(const String& url)
41	: ResourceRequestBase(KURL(url), UseProtocolCachePolicy)	41	: ResourceRequestBase(KURL(url), UseProtocolCachePolicy)




namespace WebCore {

    class ResourceRequest : public ResourceRequestBase {

        ResourceRequest(const String& url)
            : ResourceRequestBase(KURL(url), UseProtocolCachePolicy)

        void updateFromSoupMessage(SoupMessage* soupMessage);

    private:
        friend class ResourceRequestBase;

        void doUpdatePlatformRequest() {};
        void doUpdateResourceRequest() {};

Lines 34-40 namespace WebCore { WebCore/xml/XMLHttpRequest.h_sec1
- WebCore/xml/XMLHttpRequest.h -1 / +1 lines
34		34
35	class Document;	35	class Document;
36	class File;	36	class File;
37	struct ResourceRequest;	37	class ResourceRequest;
38	class TextResourceDecoder;	38	class TextResourceDecoder;
39	class ThreadableLoader;	39	class ThreadableLoader;
40		40

Return to Bug 28003

Lines 1-3 WebCore/ChangeLog_sec1
- WebCore/ChangeLog +34 lines
		1	2009-08-05 Michael Nordman <michaeln@google.com>
		2
		3	Reviewed by NOBODY (OOPS!).
		4
		5	https://bugs.webkit.org/show_bug.cgi?id=28003
		6
		7	House cleaning. Define ResourceRequest as a 'class' instead of a 'struct'.
		8
		9	No new tests.
		10
		11	* history/HistoryItem.h:
		12	* inspector/InspectorController.h:
		13	* inspector/InspectorResource.h:
		14	* loader/DocumentThreadableLoader.h:
		15	* loader/FrameLoaderClient.h:
		16	* loader/MainResourceLoader.h:
		17	* loader/SubresourceLoader.h:
		18	* loader/SubresourceLoaderClient.h:
		19	* loader/ThreadableLoader.h:
		20	* loader/WorkerThreadableLoader.h:
		21	* loader/appcache/ApplicationCache.h:
		22	* loader/appcache/ApplicationCacheHost.h:
		23	* platform/CrossThreadCopier.h:
		24	* platform/network/ResourceHandle.h:
		25	* platform/network/ResourceHandleClient.h:
		26	* platform/network/ResourceRequestBase.h:
		27	* platform/network/cf/ResourceRequest.h:
		28	* platform/network/cf/ResourceRequestCFNet.h:
		29	* platform/network/chromium/ResourceRequest.h:
		30	* platform/network/curl/ResourceRequest.h:
		31	* platform/network/qt/ResourceRequest.h:
		32	* platform/network/soup/ResourceRequest.h:
		33	* xml/XMLHttpRequest.h:
		34
1	2009-08-05 Dimitri Glazkov <dglazkov@chromium.org>	35	2009-08-05 Dimitri Glazkov <dglazkov@chromium.org>
2		36
3	Unreviewed, build fix.	37	Unreviewed, build fix.

Lines 50-57 namespace WebCore { WebCore/inspector/InspectorResource.h_sec1
- WebCore/inspector/InspectorResource.h -2 / +1 lines
50	class InspectorFrontend;	50	class InspectorFrontend;
51	class Frame;	51	class Frame;
52	class ResourceResponse;	52	class ResourceResponse;
53		53	class ResourceRequest;
54	struct ResourceRequest;
55		54
56	class InspectorResource : public RefCounted<InspectorResource> {	55	class InspectorResource : public RefCounted<InspectorResource> {
57	public:	56	public:

Lines 41-48 class ApplicationCacheGroup; WebCore/loader/appcache/ApplicationCache.h_sec1
- WebCore/loader/appcache/ApplicationCache.h -2 / +1 lines
41	class ApplicationCacheResource;	41	class ApplicationCacheResource;
42	class DocumentLoader;	42	class DocumentLoader;
43	class KURL;	43	class KURL;
44		44	class ResourceRequest;
45	struct ResourceRequest;
46		45
47	typedef Vector<std::pair<KURL, KURL> > FallbackURLVector;	46	typedef Vector<std::pair<KURL, KURL> > FallbackURLVector;
48		47

Lines 33-39 WebCore/platform/network/soup/ResourceRequest.h_sec1
- WebCore/platform/network/soup/ResourceRequest.h -2 / +2 lines
33		33
34	namespace WebCore {	34	namespace WebCore {
35		35
36	struct ResourceRequest : ResourceRequestBase {	36	class ResourceRequest : public ResourceRequestBase {
37		37
38	ResourceRequest(const String& url)	38	ResourceRequest(const String& url)
39	: ResourceRequestBase(KURL(url), UseProtocolCachePolicy)	39	: ResourceRequestBase(KURL(url), UseProtocolCachePolicy)
Lines 66-72 namespace WebCore { WebCore/platform/network/soup/ResourceRequest.h_sec2
66	void updateFromSoupMessage(SoupMessage* soupMessage);	66	void updateFromSoupMessage(SoupMessage* soupMessage);
67		67
68	private:	68	private:
69	friend struct ResourceRequestBase;	69	friend class ResourceRequestBase;
70		70
71	void doUpdatePlatformRequest() {};	71	void doUpdatePlatformRequest() {};
72	void doUpdateResourceRequest() {};	72	void doUpdateResourceRequest() {};