| Index: Source/WebKit/chromium/src/WebDOMProgressEvent.cpp
|
| diff --git a/public/platform/WebExternalTextureMailbox.h b/Source/WebKit/chromium/src/WebDOMProgressEvent.cpp
|
| similarity index 79%
|
| copy from public/platform/WebExternalTextureMailbox.h
|
| copy to Source/WebKit/chromium/src/WebDOMProgressEvent.cpp
|
| index 785e9181ae0c05a2448245a4d39e45452a63bd24..60289fdc40c4fc4e13051ec25b93fc9035c17f70 100644
|
| --- a/public/platform/WebExternalTextureMailbox.h
|
| +++ b/Source/WebKit/chromium/src/WebDOMProgressEvent.cpp
|
| @@ -28,22 +28,21 @@
|
| * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef WebExternalTextureMailbox_h
|
| -#define WebExternalTextureMailbox_h
|
| +#include "config.h"
|
| +#include "WebDOMProgressEvent.h"
|
|
|
| -namespace WebKit {
|
| +#include "core/dom/ProgressEvent.h"
|
| +#include <public/WebString.h>
|
| +
|
| +using namespace WebCore;
|
|
|
| -struct WebExternalTextureMailbox {
|
| - signed char name[64];
|
| - unsigned syncPoint;
|
| +namespace WebKit {
|
|
|
| - WebExternalTextureMailbox()
|
| - : syncPoint(0)
|
| - {
|
| - memset(name, 0, sizeof(name));
|
| - }
|
| -};
|
| +WebDOMProgressEvent::WebDOMProgressEvent(const WebString& type, bool lengthIsComputable, unsigned long long loaded, unsigned long long total)
|
| + : WebDOMEvent(ProgressEvent::create(type, lengthIsComputable, loaded, total))
|
| +{
|
| + ASSERT(m_private);
|
| + ASSERT(isProgressEvent());
|
| +}
|
|
|
| } // namespace WebKit
|
| -
|
| -#endif // WebExternalTextureMailbox_h
|
|
|