summaryrefslogtreecommitdiffstats
path: root/webkit/blob
diff options
context:
space:
mode:
authorerg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-20 21:32:52 +0000
committererg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-20 21:32:52 +0000
commit049eec23e156397cd11dc166b63c7d2dd2bd7a54 (patch)
tree9f2bf1b656c20c450172368c405cd74b4b54e443 /webkit/blob
parent314a0696abc62a1a036faa45f90d9acd43e8525e (diff)
downloadchromium_src-049eec23e156397cd11dc166b63c7d2dd2bd7a54.zip
chromium_src-049eec23e156397cd11dc166b63c7d2dd2bd7a54.tar.gz
chromium_src-049eec23e156397cd11dc166b63c7d2dd2bd7a54.tar.bz2
FBTF: Move BlobData ParamTrait structs from common_param_traits to render_messages.
The linking failures in chrome frame are due to common_param_traits adding a dependency on the webkit/ directory, which is compiled and used by nacl and chrome_frame for a minified chrome-common. render_messages, the only user of the BlobData param traits, is compiled in the full version of chrome/common/ and is where it needs to be placed. Long term something needs to be done, but for now I've added a big warning message to common_param_traits.cc. (The webkit/ includes in the current common_param_traits only refer to values in headers currently, but this still should be resolved.) BUG=none TEST=compiles Review URL: http://codereview.chromium.org/3614005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63263 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/blob')
-rw-r--r--webkit/blob/blob_data.cc12
-rw-r--r--webkit/blob/blob_data.h11
2 files changed, 16 insertions, 7 deletions
diff --git a/webkit/blob/blob_data.cc b/webkit/blob/blob_data.cc
index 838014b..026408e 100644
--- a/webkit/blob/blob_data.cc
+++ b/webkit/blob/blob_data.cc
@@ -17,6 +17,16 @@ using WebKit::WebString;
namespace webkit_blob {
+BlobData::Item::Item()
+ : type_(TYPE_DATA),
+ offset_(0),
+ length_(0) {
+}
+
+BlobData::Item::~Item() {}
+
+BlobData::BlobData() {}
+
BlobData::BlobData(const WebBlobData& data) {
size_t i = 0;
WebBlobData::Item item;
@@ -52,4 +62,6 @@ BlobData::BlobData(const WebBlobData& data) {
content_disposition_ = data.contentDisposition().utf8().data();
}
+BlobData::~BlobData() {}
+
} // namespace webkit_blob
diff --git a/webkit/blob/blob_data.h b/webkit/blob/blob_data.h
index 3be694f..9764ce4 100644
--- a/webkit/blob/blob_data.h
+++ b/webkit/blob/blob_data.h
@@ -30,11 +30,8 @@ class BlobData : public base::RefCounted<BlobData> {
class Item {
public:
- Item()
- : type_(TYPE_DATA),
- offset_(0),
- length_(0) {
- }
+ Item();
+ ~Item();
Type type() const { return type_; }
const std::string& data() const { return data_; }
@@ -91,7 +88,7 @@ class BlobData : public base::RefCounted<BlobData> {
base::Time expected_modification_time_;
};
- BlobData() { }
+ BlobData();
explicit BlobData(const WebKit::WebBlobData& data);
void AppendData(const std::string& data) {
@@ -144,7 +141,7 @@ class BlobData : public base::RefCounted<BlobData> {
private:
friend class base::RefCounted<BlobData>;
- virtual ~BlobData() { }
+ virtual ~BlobData();
std::string content_type_;
std::string content_disposition_;