summaryrefslogtreecommitdiff
path: root/Source/WebCore/html/HTMLAudioElement.cpp
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@digia.com>2013-09-13 12:51:20 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-19 20:50:05 +0200
commitd441d6f39bb846989d95bcf5caf387b42414718d (patch)
treee367e64a75991c554930278175d403c072de6bb8 /Source/WebCore/html/HTMLAudioElement.cpp
parent0060b2994c07842f4c59de64b5e3e430525c4b90 (diff)
downloadqtwebkit-d441d6f39bb846989d95bcf5caf387b42414718d.tar.gz
Import Qt5x2 branch of QtWebkit for Qt 5.2
Importing a new snapshot of webkit. Change-Id: I2d01ad12cdc8af8cb015387641120a9d7ea5f10c Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Diffstat (limited to 'Source/WebCore/html/HTMLAudioElement.cpp')
-rw-r--r--Source/WebCore/html/HTMLAudioElement.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/WebCore/html/HTMLAudioElement.cpp b/Source/WebCore/html/HTMLAudioElement.cpp
index 98decc152..4af6132b5 100644
--- a/Source/WebCore/html/HTMLAudioElement.cpp
+++ b/Source/WebCore/html/HTMLAudioElement.cpp
@@ -1,6 +1,5 @@
/*
- * Copyright (C) 2007, 2010 Apple Inc. All rights reserved.
- * Copyright (C) 2010 Apple Inc. All rights reserved.
+ * Copyright (C) 2007, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -25,7 +24,6 @@
*/
#include "config.h"
-
#if ENABLE(VIDEO)
#include "HTMLAudioElement.h"
@@ -54,7 +52,7 @@ PassRefPtr<HTMLAudioElement> HTMLAudioElement::createForJSConstructor(Document*
audio->setPreload("auto");
if (!src.isNull()) {
audio->setSrc(src);
- audio->scheduleLoad(HTMLMediaElement::MediaResource);
+ audio->scheduleDelayedAction(HTMLMediaElement::LoadMediaResource);
}
audio->suspendIfNeeded();
return audio.release();