| Index: Source/WebCore/loader/SubresourceLoader.h
|
| diff --git a/Source/WebCore/dom/ExceptionBase.h b/Source/WebCore/loader/SubresourceLoader.h
|
| similarity index 60%
|
| copy from Source/WebCore/dom/ExceptionBase.h
|
| copy to Source/WebCore/loader/SubresourceLoader.h
|
| index 01e5f1d9dfed2da663e2b1c9268fa4fcda9f3e5a..7593e5c550dd627505cef088a639455768201d38 100644
|
| --- a/Source/WebCore/dom/ExceptionBase.h
|
| +++ b/Source/WebCore/loader/SubresourceLoader.h
|
| @@ -1,18 +1,18 @@
|
| /*
|
| - * Copyright (C) 2007 Apple Inc. All rights reserved.
|
| + * Copyright (C) 2005, 2006, 2009 Apple Inc. All rights reserved.
|
| *
|
| * Redistribution and use in source and binary forms, with or without
|
| * modification, are permitted provided that the following conditions
|
| * are met:
|
| *
|
| * 1. Redistributions of source code must retain the above copyright
|
| - * notice, this list of conditions and the following disclaimer.
|
| + * notice, this list of conditions and the following disclaimer.
|
| * 2. Redistributions in binary form must reproduce the above copyright
|
| * notice, this list of conditions and the following disclaimer in the
|
| - * documentation and/or other materials provided with the distribution.
|
| + * documentation and/or other materials provided with the distribution.
|
| * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
|
| * its contributors may be used to endorse or promote products derived
|
| - * from this software without specific prior written permission.
|
| + * from this software without specific prior written permission.
|
| *
|
| * THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
|
| * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
| @@ -26,36 +26,36 @@
|
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef ExceptionBase_h
|
| -#define ExceptionBase_h
|
| +#ifndef SubresourceLoader_h
|
| +#define SubresourceLoader_h
|
|
|
| -#include "ExceptionCode.h"
|
| -#include <wtf/RefCounted.h>
|
| -#include <wtf/text/WTFString.h>
|
| +#include "FrameLoaderTypes.h"
|
| +#include "ResourceLoader.h"
|
|
|
| +#include <wtf/text/WTFString.h>
|
| +
|
| namespace WebCore {
|
|
|
| -struct ExceptionCodeDescription;
|
| -
|
| -class ExceptionBase : public RefCounted<ExceptionBase> {
|
| +class SubresourceLoader : public ResourceLoader {
|
| public:
|
| - unsigned short code() const { return m_code; }
|
| - String name() const { return m_name; }
|
| - String message() const { return m_message; }
|
| - String description() const { return m_description; }
|
| + static PassRefPtr<SubresourceLoader> create(Frame*, CachedResource*, const ResourceRequest&, const ResourceLoaderOptions&);
|
|
|
| - String toString() const;
|
| +private:
|
| + SubresourceLoader(Frame*, CachedResource*, const ResourceLoaderOptions&);
|
| + virtual ~SubresourceLoader();
|
|
|
| -protected:
|
| - explicit ExceptionBase(const ExceptionCodeDescription&);
|
| + virtual bool init(const ResourceRequest&) OVERRIDE;
|
|
|
| -private:
|
| - unsigned short m_code;
|
| - String m_name;
|
| - String m_message;
|
| - String m_description;
|
| + virtual void willSendRequest(ResourceRequest&, const ResourceResponse& redirectResponse) OVERRIDE;
|
| + virtual void didReceiveResponse(const ResourceResponse&) OVERRIDE;
|
| + virtual void didReceiveCachedMetadata(const char*, int) OVERRIDE;
|
| + virtual void didFinishLoading(double finishTime) OVERRIDE;
|
| + virtual void didFail(const ResourceError&) OVERRIDE;
|
| + virtual void releaseResources() OVERRIDE;
|
| +
|
| + bool checkForHTTPStatusCodeError();
|
| };
|
|
|
| -} // namespace WebCore
|
| +}
|
|
|
| -#endif // ExceptionBase_h
|
| +#endif // SubresourceLoader_h
|
|
|