diff options
| author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
| commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
| tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebCore/platform/chromium/ChromiumDataObject.cpp | |
| parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
| download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 | |
Merge in WebKit r47029.
Diffstat (limited to 'WebCore/platform/chromium/ChromiumDataObject.cpp')
| -rw-r--r-- | WebCore/platform/chromium/ChromiumDataObject.cpp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/WebCore/platform/chromium/ChromiumDataObject.cpp b/WebCore/platform/chromium/ChromiumDataObject.cpp index dee4568..683c2e6 100644 --- a/WebCore/platform/chromium/ChromiumDataObject.cpp +++ b/WebCore/platform/chromium/ChromiumDataObject.cpp @@ -47,7 +47,7 @@ void ChromiumDataObject::clear() fileContent->clear(); } -bool ChromiumDataObject::hasData() +bool ChromiumDataObject::hasData() const { return !url.isEmpty() || !fileExtension.isEmpty() @@ -57,4 +57,18 @@ bool ChromiumDataObject::hasData() || fileContent; } +ChromiumDataObject::ChromiumDataObject(const ChromiumDataObject& other) + : url(other.url) + , urlTitle(other.urlTitle) + , fileExtension(other.fileExtension) + , filenames(other.filenames) + , plainText(other.plainText) + , textHtml(other.textHtml) + , htmlBaseUrl(other.htmlBaseUrl) + , fileContentFilename(other.fileContentFilename) +{ + if (other.fileContent.get()) + fileContent = other.fileContent->copy(); +} + } // namespace WebCore |