Index: plugin/cross/async_loading.cc |
=================================================================== |
--- plugin/cross/async_loading.cc (revision 17294) |
+++ plugin/cross/async_loading.cc (working copy) |
@@ -1,35 +1,9 @@ |
-/* |
- * Copyright 2009, Google Inc. |
- * All rights reserved. |
- * |
- * Redistribution and use in source and binary forms, with or without |
- * modification, are permitted provided that the following conditions are |
- * met: |
- * |
- * * Redistributions of source code must retain the above copyright |
- * notice, this list of conditions and the following disclaimer. |
- * * Redistributions in binary form must reproduce the above |
- * copyright notice, this list of conditions and the following disclaimer |
- * in the documentation and/or other materials provided with the |
- * distribution. |
- * * Neither the name of Google Inc. nor the names of its |
- * contributors may be used to endorse or promote products derived from |
- * this software without specific prior written permission. |
- * |
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS |
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT |
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR |
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT |
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
- */ |
+// @@REWRITE(insert c-copyright) |
+// @@REWRITE(delete-start) |
+// Copyright 2008 Google Inc. All Rights Reserved. |
+// Author: piman@google.com (Antoine Labour) |
+// @@REWRITE(delete-end) |
- |
// This file implements the asynchronous file-loading glue. |
#include <algorithm> |
@@ -107,8 +81,7 @@ |
} else { |
// No error is passed in from the stream but we MUST have an error |
// for the request to work on the javascript side. |
- request_->set_error("Could not download texture. It could be a " |
- "permission-related issue."); |
+ request_->set_error("Could not download texture: " + request_->uri()); |
} |
request_->set_success(success); |
// Since the standard codes only go far enough to tell us that the download |