Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(745)

Side by Side Diff: Source/web/WebBlob.cpp

Issue 125043004: Remove world type from hasInstance() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/web/WebBindings.cpp ('k') | Source/web/WebDOMFileSystem.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 RefPtr<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::hasInstanceInAnyWorld(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);
59 } 59 }
60 return WebBlob(); 60 return WebBlob();
61 } 61 }
62 62
63 void WebBlob::reset() 63 void WebBlob::reset()
64 { 64 {
(...skipping 29 matching lines...) Expand all
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 98 WebBlob::operator WTF::PassRefPtr<WebCore::Blob>() const
99 { 99 {
100 return m_private.get(); 100 return m_private.get();
101 } 101 }
102 102
103 } // namespace blink 103 } // namespace blink
OLDNEW
« no previous file with comments | « Source/web/WebBindings.cpp ('k') | Source/web/WebDOMFileSystem.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698