| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Google Inc. All rights reserved. | 2 * Copyright (C) 2011 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 #include "wtf/PassOwnPtr.h" | 38 #include "wtf/PassOwnPtr.h" |
| 39 | 39 |
| 40 using namespace WebCore; | 40 using namespace WebCore; |
| 41 | 41 |
| 42 namespace blink { | 42 namespace blink { |
| 43 | 43 |
| 44 WebBlob WebBlob::createFromFile(const WebString& path, long long size) | 44 WebBlob WebBlob::createFromFile(const WebString& path, long long size) |
| 45 { | 45 { |
| 46 OwnPtr<BlobData> blobData = BlobData::create(); | 46 OwnPtr<BlobData> blobData = BlobData::create(); |
| 47 blobData->appendFile(path); | 47 blobData->appendFile(path); |
| 48 RefPtr<Blob> blob = Blob::create(BlobDataHandle::create(blobData.release(),
size)); | 48 RefPtrWillBeRawPtr<Blob> blob = Blob::create(BlobDataHandle::create(blobData
.release(), size)); |
| 49 return WebBlob(blob); | 49 return WebBlob(blob); |
| 50 } | 50 } |
| 51 | 51 |
| 52 WebBlob WebBlob::fromV8Value(v8::Handle<v8::Value> value) | 52 WebBlob WebBlob::fromV8Value(v8::Handle<v8::Value> value) |
| 53 { | 53 { |
| 54 if (V8Blob::hasInstance(value, v8::Isolate::GetCurrent())) { | 54 if (V8Blob::hasInstance(value, v8::Isolate::GetCurrent())) { |
| 55 v8::Handle<v8::Object> object = v8::Handle<v8::Object>::Cast(value); | 55 v8::Handle<v8::Object> object = v8::Handle<v8::Object>::Cast(value); |
| 56 Blob* blob = V8Blob::toNative(object); | 56 Blob* blob = V8Blob::toNative(object); |
| 57 ASSERT(blob); | 57 ASSERT(blob); |
| 58 return WebBlob(blob); | 58 return WebBlob(blob); |
| (...skipping 11 matching lines...) Expand all Loading... |
| 70 m_private = other.m_private; | 70 m_private = other.m_private; |
| 71 } | 71 } |
| 72 | 72 |
| 73 WebString WebBlob::uuid() | 73 WebString WebBlob::uuid() |
| 74 { | 74 { |
| 75 if (!m_private.get()) | 75 if (!m_private.get()) |
| 76 return WebString(); | 76 return WebString(); |
| 77 return m_private->uuid(); | 77 return m_private->uuid(); |
| 78 } | 78 } |
| 79 | 79 |
| 80 v8::Handle<v8::Value> WebBlob::toV8Value() | 80 v8::Handle<v8::Value> WebBlob::toV8Value() |
| 81 { | 81 { |
| 82 if (!m_private.get()) | 82 if (!m_private.get()) |
| 83 return v8::Handle<v8::Value>(); | 83 return v8::Handle<v8::Value>(); |
| 84 return toV8(m_private.get(), v8::Handle<v8::Object>(), v8::Isolate::GetCurre
nt()); | 84 return toV8(m_private.get(), v8::Handle<v8::Object>(), v8::Isolate::GetCurre
nt()); |
| 85 } | 85 } |
| 86 | 86 |
| 87 WebBlob::WebBlob(const WTF::PassRefPtr<WebCore::Blob>& blob) | 87 WebBlob::WebBlob(const PassRefPtrWillBeRawPtr<WebCore::Blob>& blob) |
| 88 : m_private(blob) | 88 : m_private(blob) |
| 89 { | 89 { |
| 90 } | 90 } |
| 91 | 91 |
| 92 WebBlob& WebBlob::operator=(const WTF::PassRefPtr<WebCore::Blob>& blob) | 92 WebBlob& WebBlob::operator=(const PassRefPtrWillBeRawPtr<WebCore::Blob>& blob) |
| 93 { | 93 { |
| 94 m_private = blob; | 94 m_private = blob; |
| 95 return *this; | 95 return *this; |
| 96 } | 96 } |
| 97 | 97 |
| 98 WebBlob::operator WTF::PassRefPtr<WebCore::Blob>() const | |
| 99 { | |
| 100 return m_private.get(); | |
| 101 } | |
| 102 | |
| 103 } // namespace blink | 98 } // namespace blink |
| OLD | NEW |