[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
commit-queue at webkit.org
commit-queue at webkit.org
Wed Dec 22 14:25:19 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit c96fc757892b2877a6a3ee88be2078a4d0a017e2
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Oct 8 06:36:31 2010 +0000
2010-10-07 Daniel Cheng <dcheng at chromium.org>
Reviewed by Kent Tamura.
[chromium] Fix indentation in ChromiumDataObject.h
https://bugs.webkit.org/show_bug.cgi?id=47396
Just a cleanup patch to make followup diffs smaller.
* platform/chromium/ChromiumDataObject.h:
(WebCore::ChromiumDataObject::create):
(WebCore::ChromiumDataObject::copy):
(WebCore::ChromiumDataObject::urlTitle):
(WebCore::ChromiumDataObject::setUrlTitle):
(WebCore::ChromiumDataObject::htmlBaseUrl):
(WebCore::ChromiumDataObject::setHtmlBaseUrl):
(WebCore::ChromiumDataObject::containsFilenames):
(WebCore::ChromiumDataObject::filenames):
(WebCore::ChromiumDataObject::setFilenames):
(WebCore::ChromiumDataObject::fileExtension):
(WebCore::ChromiumDataObject::setFileExtension):
(WebCore::ChromiumDataObject::fileContentFilename):
(WebCore::ChromiumDataObject::setFileContentFilename):
(WebCore::ChromiumDataObject::fileContent):
(WebCore::ChromiumDataObject::setFileContent):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69380 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 42bfcf4..b92ad52 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,29 @@
+2010-10-07 Daniel Cheng <dcheng at chromium.org>
+
+ Reviewed by Kent Tamura.
+
+ [chromium] Fix indentation in ChromiumDataObject.h
+ https://bugs.webkit.org/show_bug.cgi?id=47396
+
+ Just a cleanup patch to make followup diffs smaller.
+
+ * platform/chromium/ChromiumDataObject.h:
+ (WebCore::ChromiumDataObject::create):
+ (WebCore::ChromiumDataObject::copy):
+ (WebCore::ChromiumDataObject::urlTitle):
+ (WebCore::ChromiumDataObject::setUrlTitle):
+ (WebCore::ChromiumDataObject::htmlBaseUrl):
+ (WebCore::ChromiumDataObject::setHtmlBaseUrl):
+ (WebCore::ChromiumDataObject::containsFilenames):
+ (WebCore::ChromiumDataObject::filenames):
+ (WebCore::ChromiumDataObject::setFilenames):
+ (WebCore::ChromiumDataObject::fileExtension):
+ (WebCore::ChromiumDataObject::setFileExtension):
+ (WebCore::ChromiumDataObject::fileContentFilename):
+ (WebCore::ChromiumDataObject::setFileContentFilename):
+ (WebCore::ChromiumDataObject::fileContent):
+ (WebCore::ChromiumDataObject::setFileContent):
+
2010-10-07 Kent Tamura <tkent at chromium.org>
Reviewed by Dimitri Glazkov.
diff --git a/WebCore/platform/chromium/ChromiumDataObject.h b/WebCore/platform/chromium/ChromiumDataObject.h
index cd58ecb..d86423a 100644
--- a/WebCore/platform/chromium/ChromiumDataObject.h
+++ b/WebCore/platform/chromium/ChromiumDataObject.h
@@ -42,77 +42,77 @@
namespace WebCore {
- // A data object for holding data that would be in a clipboard or moved
- // during a drag-n-drop operation. This is the data that WebCore is aware
- // of and is not specific to a platform.
- class ChromiumDataObject : public RefCounted<ChromiumDataObject> {
- public:
- static PassRefPtr<ChromiumDataObject> create(Clipboard::ClipboardType clipboardType)
- {
- return adoptRef(new ChromiumDataObject(clipboardType));
- }
-
- PassRefPtr<ChromiumDataObject> copy() const
- {
- return adoptRef(new ChromiumDataObject(*this));
- }
-
- void clearData(const String& type);
- void clearAll();
- void clearAllExceptFiles();
-
- bool hasData() const;
-
- HashSet<String> types() const;
- String getData(const String& type, bool& success);
- bool setData(const String& type, const String& data);
-
- // Special handlers for URL/HTML metadata.
- String urlTitle() const { return m_urlTitle; }
- void setUrlTitle(const String& urlTitle) { m_urlTitle = urlTitle; }
- KURL htmlBaseUrl() const { return m_htmlBaseUrl; }
- void setHtmlBaseUrl(const KURL& url) { m_htmlBaseUrl = url; }
-
- // Used to handle files being dragged in.
- bool containsFilenames() const { return !m_filenames.isEmpty(); }
- Vector<String> filenames() const { return m_filenames; }
- void setFilenames(const Vector<String>& filenames) { m_filenames = filenames; }
-
- // Used to handle files (images) being dragged out.
- String fileExtension() const { return m_fileExtension; }
- void setFileExtension(const String& fileExtension) { m_fileExtension = fileExtension; }
- String fileContentFilename() const { return m_fileContentFilename; }
- void setFileContentFilename(const String& fileContentFilename) { m_fileContentFilename = fileContentFilename; }
- PassRefPtr<SharedBuffer> fileContent() const { return m_fileContent; }
- void setFileContent(PassRefPtr<SharedBuffer> fileContent) { m_fileContent = fileContent; }
-
- private:
- ChromiumDataObject(Clipboard::ClipboardType);
- ChromiumDataObject(const ChromiumDataObject&);
-
- Clipboard::ClipboardType m_clipboardType;
-
- String m_urlTitle;
-
- String m_downloadMetadata;
-
- String m_fileExtension;
- Vector<String> m_filenames;
-
- String m_plainText;
-
- String m_textHtml;
- KURL m_htmlBaseUrl;
-
- String m_fileContentFilename;
- RefPtr<SharedBuffer> m_fileContent;
-
- // These two are linked. Setting m_url will set m_uriList to the same
- // string value; setting m_uriList will cause its contents to be parsed
- // according to RFC 2483 and the first URL found will be set in m_url.
- KURL m_url;
- String m_uriList;
- };
+// A data object for holding data that would be in a clipboard or moved
+// during a drag-n-drop operation. This is the data that WebCore is aware
+// of and is not specific to a platform.
+class ChromiumDataObject : public RefCounted<ChromiumDataObject> {
+public:
+ static PassRefPtr<ChromiumDataObject> create(Clipboard::ClipboardType clipboardType)
+ {
+ return adoptRef(new ChromiumDataObject(clipboardType));
+ }
+
+ PassRefPtr<ChromiumDataObject> copy() const
+ {
+ return adoptRef(new ChromiumDataObject(*this));
+ }
+
+ void clearData(const String& type);
+ void clearAll();
+ void clearAllExceptFiles();
+
+ bool hasData() const;
+
+ HashSet<String> types() const;
+ String getData(const String& type, bool& success);
+ bool setData(const String& type, const String& data);
+
+ // Special handlers for URL/HTML metadata.
+ String urlTitle() const { return m_urlTitle; }
+ void setUrlTitle(const String& urlTitle) { m_urlTitle = urlTitle; }
+ KURL htmlBaseUrl() const { return m_htmlBaseUrl; }
+ void setHtmlBaseUrl(const KURL& url) { m_htmlBaseUrl = url; }
+
+ // Used to handle files being dragged in.
+ bool containsFilenames() const { return !m_filenames.isEmpty(); }
+ Vector<String> filenames() const { return m_filenames; }
+ void setFilenames(const Vector<String>& filenames) { m_filenames = filenames; }
+
+ // Used to handle files (images) being dragged out.
+ String fileExtension() const { return m_fileExtension; }
+ void setFileExtension(const String& fileExtension) { m_fileExtension = fileExtension; }
+ String fileContentFilename() const { return m_fileContentFilename; }
+ void setFileContentFilename(const String& fileContentFilename) { m_fileContentFilename = fileContentFilename; }
+ PassRefPtr<SharedBuffer> fileContent() const { return m_fileContent; }
+ void setFileContent(PassRefPtr<SharedBuffer> fileContent) { m_fileContent = fileContent; }
+
+private:
+ ChromiumDataObject(Clipboard::ClipboardType);
+ ChromiumDataObject(const ChromiumDataObject&);
+
+ Clipboard::ClipboardType m_clipboardType;
+
+ String m_urlTitle;
+
+ String m_downloadMetadata;
+
+ String m_fileExtension;
+ Vector<String> m_filenames;
+
+ String m_plainText;
+
+ String m_textHtml;
+ KURL m_htmlBaseUrl;
+
+ String m_fileContentFilename;
+ RefPtr<SharedBuffer> m_fileContent;
+
+ // These two are linked. Setting m_url will set m_uriList to the same
+ // string value; setting m_uriList will cause its contents to be parsed
+ // according to RFC 2483 and the first URL found will be set in m_url.
+ KURL m_url;
+ String m_uriList;
+};
} // namespace WebCore
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list