summaryrefslogtreecommitdiffstats
path: root/webkit/glue/plugins/plugin_stream.cc
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/glue/plugins/plugin_stream.cc')
-rw-r--r--webkit/glue/plugins/plugin_stream.cc14
1 files changed, 1 insertions, 13 deletions
diff --git a/webkit/glue/plugins/plugin_stream.cc b/webkit/glue/plugins/plugin_stream.cc
index 33a40b8..9cdeb3b 100644
--- a/webkit/glue/plugins/plugin_stream.cc
+++ b/webkit/glue/plugins/plugin_stream.cc
@@ -29,17 +29,13 @@ PluginStream::PluginStream(
requested_plugin_mode_(NP_NORMAL),
temp_file_handle_(INVALID_HANDLE_VALUE),
seekable_stream_(false),
- data_offset_(0),
- object_deleted_(NULL) {
+ data_offset_(0) {
memset(&stream_, 0, sizeof(stream_));
stream_.url = _strdup(url);
temp_file_name_[0] = '\0';
}
PluginStream::~PluginStream() {
- if (object_deleted_) {
- *object_deleted_ = true;
- }
// always cleanup our temporary files.
CleanupTempFile();
free(const_cast<char*>(stream_.url));
@@ -82,9 +78,6 @@ bool PluginStream::Open(const std::string &mime_type,
char_mime_type = temp_mime_type.c_str();
}
- bool object_deleted = false;
- object_deleted_ = &object_deleted;
-
// Silverlight expects a valid mime type
DCHECK(strlen(char_mime_type) != 0);
NPError err = instance_->NPP_NewStream((NPMIMEType)char_mime_type,
@@ -93,11 +86,6 @@ bool PluginStream::Open(const std::string &mime_type,
if (err != NPERR_NO_ERROR)
return false;
- if (object_deleted) {
- return true;
- }
-
- object_deleted_ = NULL;
opened_ = true;
if (requested_plugin_mode_ == NP_SEEK) {