diff options
author | Steve Block <steveblock@google.com> | 2011-05-18 13:36:51 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-05-24 15:38:28 +0100 |
commit | 2fc2651226baac27029e38c9d6ef883fa32084db (patch) | |
tree | e396d4bf89dcce6ed02071be66212495b1df1dec /Source/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm | |
parent | b3725cedeb43722b3b175aaeff70552e562d2c94 (diff) | |
download | external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.zip external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.gz external_webkit-2fc2651226baac27029e38c9d6ef883fa32084db.tar.bz2 |
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Diffstat (limited to 'Source/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm')
-rw-r--r-- | Source/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/Source/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm b/Source/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm index 6839020..0abd744 100644 --- a/Source/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm +++ b/Source/WebKit2/WebProcess/Downloads/mac/DownloadMac.mm @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Apple Inc. All rights reserved. + * Copyright (C) 2010, 2011 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -23,16 +23,17 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include "Download.h" +#import "config.h" +#import "Download.h" -#include <WebCore/BackForwardController.h> -#include <WebCore/HistoryItem.h> -#include <WebCore/Page.h> -#include <WebCore/ResourceHandle.h> -#include <WebCore/ResourceResponse.h> -#include "DataReference.h" -#include "NotImplemented.h" -#include "WebPage.h" +#import <WebCore/BackForwardController.h> +#import <WebCore/HistoryItem.h> +#import <WebCore/Page.h> +#import <WebCore/ResourceHandle.h> +#import <WebCore/ResourceResponse.h> +#import "DataReference.h" +#import "NotImplemented.h" +#import "WebPage.h" @interface NSURLDownload (WebNSURLDownloadDetails) +(id)_downloadWithLoadingConnection:(NSURLConnection *)connection @@ -168,6 +169,14 @@ void Download::platformInvalidate() m_nsURLDownload = nullptr; } +void Download::didDecideDestination(const String& destination, bool allowOverwrite) +{ +} + +void Download::platformDidFinish() +{ +} + } // namespace WebKit @implementation WKDownloadAsDelegate |