[PATCH] redefine MediaPlayer::None to MediaPlayer::PreloadNone or
Zhao Halley
halley.zhao at intel.com
Thu Nov 8 17:50:27 PST 2012
---
Source/WebCore/html/HTMLMediaElement.cpp | 4 ++--
Source/WebCore/platform/graphics/MediaPlayer.cpp | 2 +-
Source/WebCore/platform/graphics/MediaPlayer.h | 4 ++--
.../gstreamer/MediaPlayerPrivateGStreamer.cpp | 8 ++++----
.../graphics/mac/MediaPlayerPrivateQTKit.mm | 4 ++--
.../platform/graphics/qt/MediaPlayerPrivateQt.cpp | 4 ++--
.../MediaPlayerPrivateQuickTimeVisualContext.cpp | 4 ++--
Source/WebKit/chromium/src/AssertMatchingEnums.cpp | 2 +-
.../chromium/src/WebMediaPlayerClientImpl.cpp | 4 ++--
9 files changed, 18 insertions(+), 18 deletions(-)
mode change 100644 =3D> 100755 Source/WebCore/platform/graphics/MediaPlayer=
.cpp
mode change 100644 =3D> 100755 Source/WebCore/platform/graphics/MediaPlayer=
.h
mode change 100644 =3D> 100755 Source/WebCore/platform/graphics/gstreamer/M=
ediaPlayerPrivateGStreamer.cpp
mode change 100644 =3D> 100755 Source/WebCore/platform/graphics/qt/MediaPla=
yerPrivateQt.cpp
mode change 100644 =3D> 100755 Source/WebCore/platform/graphics/win/MediaPl=
ayerPrivateQuickTimeVisualContext.cpp
diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html=
/HTMLMediaElement.cpp
index ebeee1b..d9f1691 100644
--- a/Source/WebCore/html/HTMLMediaElement.cpp
+++ b/Source/WebCore/html/HTMLMediaElement.cpp
@@ -364,7 +364,7 @@ void HTMLMediaElement::parseAttribute(const Attribute& =
attribute)
#endif
else if (attribute.name() =3D=3D preloadAttr) {
if (equalIgnoringCase(attribute.value(), "none"))
- m_preload =3D MediaPlayer::None;
+ m_preload =3D MediaPlayer::PreloadNone;
else if (equalIgnoringCase(attribute.value(), "metadata"))
m_preload =3D MediaPlayer::MetaData;
else {
@@ -2263,7 +2263,7 @@ void HTMLMediaElement::setAutoplay(bool b)
String HTMLMediaElement::preload() const
{
switch (m_preload) {
- case MediaPlayer::None:
+ case MediaPlayer::PreloadNone:
return "none";
break;
case MediaPlayer::MetaData:
diff --git a/Source/WebCore/platform/graphics/MediaPlayer.cpp b/Source/WebC=
ore/platform/graphics/MediaPlayer.cpp
old mode 100644
new mode 100755
index 377e8dc..1977c8a
--- a/Source/WebCore/platform/graphics/MediaPlayer.cpp
+++ b/Source/WebCore/platform/graphics/MediaPlayer.cpp
@@ -79,7 +79,7 @@
namespace WebCore {
-const PlatformMedia NoPlatformMedia =3D { PlatformMedia::None, {0} };
+const PlatformMedia NoPlatformMedia =3D { PlatformMedia::PlayerTypeNone, {=
0} };
// a null player to make MediaPlayer logic simpler
diff --git a/Source/WebCore/platform/graphics/MediaPlayer.h b/Source/WebCor=
e/platform/graphics/MediaPlayer.h
old mode 100644
new mode 100755
index 993e9981..422032f
--- a/Source/WebCore/platform/graphics/MediaPlayer.h
+++ b/Source/WebCore/platform/graphics/MediaPlayer.h
@@ -68,7 +68,7 @@ class MediaSource;
// backend can live at runtime.
struct PlatformMedia {
enum {
- None,
+ PlayerTypeNone,
QTMovieType,
QTMovieGWorldType,
QTMovieVisualContextType,
@@ -332,7 +332,7 @@ public:
enum MovieLoadType { Unknown, Download, StoredStream, LiveStream };
MovieLoadType movieLoadType() const;
- enum Preload { None, MetaData, Auto };
+ enum Preload { PreloadNone, MetaData, Auto };
Preload preload() const;
void setPreload(Preload);
diff --git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateG=
Streamer.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivat=
eGStreamer.cpp
old mode 100644
new mode 100755
index a4d4745..20a50a4
--- a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreame=
r.cpp
+++ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreame=
r.cpp
@@ -305,7 +305,7 @@ void MediaPlayerPrivateGStreamer::load(const String& ur=
l)
LOG_MEDIA_MESSAGE("Load %s", cleanUrl.utf8().data());
- if (m_preload =3D=3D MediaPlayer::None) {
+ if (m_preload =3D=3D MediaPlayer::PreloadNone) {
LOG_MEDIA_MESSAGE("Delaying load.");
m_delayingLoad =3D true;
}
@@ -1236,7 +1236,7 @@ void MediaPlayerPrivateGStreamer::updateStates()
// can't work so disable on-disk buffering and reset the
// pipeline.
if (state =3D=3D GST_STATE_READY && isLiveStream() && m_preload =
=3D=3D MediaPlayer::Auto) {
- setPreload(MediaPlayer::None);
+ setPreload(MediaPlayer::PreloadNone);
gst_element_set_state(m_playBin, GST_STATE_NULL);
gst_element_set_state(m_playBin, GST_STATE_PAUSED);
}
@@ -1483,7 +1483,7 @@ void MediaPlayerPrivateGStreamer::durationChanged()
if (previousDuration && m_mediaDuration !=3D previousDuration)
m_player->durationChanged();
- if (m_preload =3D=3D MediaPlayer::None && m_originalPreloadWasAutoAndW=
asOverridden) {
+ if (m_preload =3D=3D MediaPlayer::PreloadNone && m_originalPreloadWasA=
utoAndWasOverridden) {
m_totalBytes =3D -1;
if (totalBytes() && !isLiveStream()) {
setPreload(MediaPlayer::Auto);
@@ -1749,7 +1749,7 @@ void MediaPlayerPrivateGStreamer::setPreload(MediaPla=
yer::Preload preload)
g_object_set(m_playBin, "flags", flags & ~GST_PLAY_FLAG_DOWNLOAD, =
NULL);
}
- if (m_delayingLoad && m_preload !=3D MediaPlayer::None) {
+ if (m_delayingLoad && m_preload !=3D MediaPlayer::PreloadNone) {
m_delayingLoad =3D false;
commitLoad();
}
diff --git a/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.m=
m b/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
index f774040..b813671 100644
--- a/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
+++ b/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm
@@ -655,7 +655,7 @@ void MediaPlayerPrivateQTKit::load(const String& url)
m_movieURL =3D url;
// If the element is not supposed to load any data return immediately.
- if (m_preload =3D=3D MediaPlayer::None)
+ if (m_preload =3D=3D MediaPlayer::PreloadNone)
return;
loadInternal(url);
@@ -1696,7 +1696,7 @@ MediaPlayer::MovieLoadType MediaPlayerPrivateQTKit::m=
ovieLoadType() const
void MediaPlayerPrivateQTKit::setPreload(MediaPlayer::Preload preload)
{
m_preload =3D preload;
- if (m_preload =3D=3D MediaPlayer::None)
+ if (m_preload =3D=3D MediaPlayer::PreloadNone)
return;
if (!m_qtMovie)
diff --git a/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp b=
/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
old mode 100644
new mode 100755
index 9ec765c..5288f74
--- a/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
+++ b/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
@@ -166,7 +166,7 @@ void MediaPlayerPrivateQt::load(const String& url)
// QtMultimedia does not have an API to throttle loading
// so we handle this ourselves by delaying the load
- if (m_preload =3D=3D MediaPlayer::None) {
+ if (m_preload =3D=3D MediaPlayer::PreloadNone) {
m_delayingLoad =3D true;
return;
}
@@ -375,7 +375,7 @@ unsigned MediaPlayerPrivateQt::totalBytes() const
void MediaPlayerPrivateQt::setPreload(MediaPlayer::Preload preload)
{
m_preload =3D preload;
- if (m_delayingLoad && m_preload !=3D MediaPlayer::None)
+ if (m_delayingLoad && m_preload !=3D MediaPlayer::PreloadNone)
resumeLoad();
}
diff --git a/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTi=
meVisualContext.cpp b/Source/WebCore/platform/graphics/win/MediaPlayerPriva=
teQuickTimeVisualContext.cpp
old mode 100644
new mode 100755
index 35c3d77..30d749d
--- a/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisua=
lContext.cpp
+++ b/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisua=
lContext.cpp
@@ -340,7 +340,7 @@ void MediaPlayerPrivateQuickTimeVisualContext::load(con=
st String& url)
{
m_movieURL =3D url;
- if (m_preload =3D=3D MediaPlayer::None) {
+ if (m_preload =3D=3D MediaPlayer::PreloadNone) {
m_delayingLoad =3D true;
return;
}
@@ -1058,7 +1058,7 @@ bool MediaPlayerPrivateQuickTimeVisualContext::hasSin=
gleSecurityOrigin() const
void MediaPlayerPrivateQuickTimeVisualContext::setPreload(MediaPlayer::Prel=
oad preload)
{
m_preload =3D preload;
- if (m_delayingLoad && m_preload !=3D MediaPlayer::None)
+ if (m_delayingLoad && m_preload !=3D MediaPlayer::PreloadNone)
resumeLoad();
}
diff --git a/Source/WebKit/chromium/src/AssertMatchingEnums.cpp b/Source/We=
bKit/chromium/src/AssertMatchingEnums.cpp
index d2461a9..d345a60 100644
--- a/Source/WebKit/chromium/src/AssertMatchingEnums.cpp
+++ b/Source/WebKit/chromium/src/AssertMatchingEnums.cpp
@@ -393,7 +393,7 @@ COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::MovieLoadT=
ypeDownload, MediaPlayer:
COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::MovieLoadTypeStoredStream, Med=
iaPlayer::StoredStream);
COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::MovieLoadTypeLiveStream, Media=
Player::LiveStream);
-COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadNone, MediaPlayer::Non=
e);
+COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadNone, MediaPlayer::Pre=
loadNone);
COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadMetaData, MediaPlayer::=
MetaData);
COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadAuto, MediaPlayer::Auto=
);
diff --git a/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp b/Sour=
ce/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
index e75c739..217f87d 100644
--- a/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
+++ b/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp
@@ -315,7 +315,7 @@ void WebMediaPlayerClientImpl::load(const String& url)
m_url =3D url;
MutexLocker locker(m_webMediaPlayerMutex);
- if (m_preload =3D=3D MediaPlayer::None) {
+ if (m_preload =3D=3D MediaPlayer::PreloadNone) {
#if ENABLE(WEB_AUDIO)
m_audioSourceProvider.wrap(0); // Clear weak reference to m_webMed=
iaPlayer's WebAudioSourceProvider.
#endif
@@ -686,7 +686,7 @@ void WebMediaPlayerClientImpl::setPreload(MediaPlayer::=
Preload preload)
if (m_webMediaPlayer)
m_webMediaPlayer->setPreload(static_cast<WebMediaPlayer::Preload>(=
preload));
- if (m_delayingLoad && m_preload !=3D MediaPlayer::None)
+ if (m_delayingLoad && m_preload !=3D MediaPlayer::PreloadNone)
startDelayedLoad();
}
--
1.7.9.5
From: webkit-dev-bounces at lists.webkit.org [mailto:webkit-dev-bounces at lists.=
webkit.org] On Behalf Of Zhao, Halley
Sent: Thursday, November 08, 2012 6:00 PM
To: webkit-dev at lists.webkit.org
Subject: [webkit-dev] compile failure when I try to introduce GLContextEGL =
to MediaPlayerPrivateGStreamer
Hi experts:
I want to introduce EGL context to GStreamer Media player (MediaPlayerPriva=
teGStreamer),
However, a simple '#include "GLContextEGL.h"' in MediaPlayerPrivateGStreame=
r.cpp fail to compile.
"MediaPlayerPrivateGStreamer.cpp:321:35: error: expected unqualified-id bef=
ore numeric constant"
It seems to be namespace issue, but I can't know where break.
Could you kindly educate me how to do it?
Thanks.
More backgrounds see here:
https://bugs.webkit.org/show_bug.cgi?id=3D86410
--_000_81DD1C3FC6BE1E4EAA454D486F820044283D4BSHSMSX101ccrcorpi_
Content-Type: text/html; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
<html xmlns:v=3D"urn:schemas-microsoft-com:vml" xmlns:o=3D"urn:schemas-micr=
osoft-com:office:office" xmlns:w=3D"urn:schemas-microsoft-com:office:word" =
xmlns:m=3D"http://schemas.microsoft.com/office/2004/12/omml" xmlns=3D"http:=
//www.w3.org/TR/REC-html40">
<head>
<meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dus-ascii"=
>
<meta name=3D"Generator" content=3D"Microsoft Word 14 (filtered medium)">
<style><!--
/* Font Definitions */
@font-face
{font-family:SimSun;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:SimSun;
panose-1:2 1 6 0 3 1 1 1 1 1;}
@font-face
{font-family:Calibri;
panose-1:2 15 5 2 2 2 4 3 2 4;}
@font-face
{font-family:Tahoma;
panose-1:2 11 6 4 3 5 4 4 2 4;}
@font-face
{font-family:SimSun;
panose-1:2 1 6 0 3 1 1 1 1 1;}
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
text-align:justify;
text-justify:inter-ideograph;
font-size:10.5pt;
font-family:"Calibri","sans-serif";}
a:link, span.MsoHyperlink
{mso-style-priority:99;
color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{mso-style-priority:99;
color:purple;
text-decoration:underline;}
span.EmailStyle17
{mso-style-type:personal;
font-family:"Calibri","sans-serif";
color:windowtext;}
span.EmailStyle18
{mso-style-type:personal-reply;
font-family:"Calibri","sans-serif";
color:#1F497D;}
.MsoChpDefault
{mso-style-type:export-only;
font-size:10.0pt;}
@page WordSection1
{size:612.0pt 792.0pt;
margin:72.0pt 90.0pt 72.0pt 90.0pt;}
div.WordSection1
{page:WordSection1;}
--></style><!--[if gte mso 9]><xml>
<o:shapedefaults v:ext=3D"edit" spidmax=3D"1026" />
</xml><![endif]--><!--[if gte mso 9]><xml>
<o:shapelayout v:ext=3D"edit">
<o:idmap v:ext=3D"edit" data=3D"1" />
</o:shapelayout></xml><![endif]-->
</head>
<body lang=3D"ZH-CN" link=3D"blue" vlink=3D"purple" style=3D"text-justify-t=
rim:punctuation">
<div class=3D"WordSection1">
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">when us=
ing “g++ -E”, I found the issue after pre-processing: (=
thanks suggestion from Philippe)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">After i=
nclude GLContextEGL.h, MediaPlayer::None changes to MediaPlayer::0L after p=
re-processing.<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p>&n=
bsp;</o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">Though =
I don’t find the definition of None from new code introduced by GLCon=
textEGL.h,
<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">I do th=
ink it is not good habit to use ‘None’ in such as big project; =
so I try to replace ‘None’ to PlatformMedia::PlayerTypeNone and=
MediaPlayer::PreloadLoadNone.<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">It fixe=
d my issue:<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p>&n=
bsp;</o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">Here is=
the patch for your reference:<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p>&n=
bsp;</o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">From d6=
84bbbc34ea241f123544711bbad4ff58a06ebf Mon Sep 17 00:00:00 2001<o:p></o:p><=
/span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">From: Z=
hao Halley <halley.zhao at intel.com><o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">Date: F=
ri, 9 Nov 2012 09:50:27 +0800<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">Subject=
: [PATCH] redefine MediaPlayer::None to MediaPlayer::PreloadNone or<o:p></o=
:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">MediaPl=
ayer::PlayerTypeNone<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p>&n=
bsp;</o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">---<o:p=
></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">Source/=
WebCore/html/HTMLMediaElement.cpp =
| 4 ++--<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">Source/=
WebCore/platform/graphics/MediaPlayer.cpp | 2=
+-<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">Source/=
WebCore/platform/graphics/MediaPlayer.h | &nbs=
p; 4 ++--<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">.../gst=
reamer/MediaPlayerPrivateGStreamer.cpp | =
; 8 ++++----<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">.../gra=
phics/mac/MediaPlayerPrivateQTKit.mm &nb=
sp; | 4 ++--<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">.../pla=
tform/graphics/qt/MediaPlayerPrivateQt.cpp | 4 +=
;+--<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">.../Med=
iaPlayerPrivateQuickTimeVisualContext.cpp | 4=
++--<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">Source/=
WebKit/chromium/src/AssertMatchingEnums.cpp | 2 +-<o:=
p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">.../chr=
omium/src/WebMediaPlayerClientImpl.cpp | =
; 4 ++--<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">9 files=
changed, 18 insertions(+), 18 deletions(-)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">mode ch=
ange 100644 =3D> 100755 Source/WebCore/platform/graphics/MediaPlayer.cpp=
<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">mode ch=
ange 100644 =3D> 100755 Source/WebCore/platform/graphics/MediaPlayer.h<o=
:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">mode ch=
ange 100644 =3D> 100755 Source/WebCore/platform/graphics/gstreamer/Media=
PlayerPrivateGStreamer.cpp<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">mode ch=
ange 100644 =3D> 100755 Source/WebCore/platform/graphics/qt/MediaPlayerP=
rivateQt.cpp<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">mode ch=
ange 100644 =3D> 100755 Source/WebCore/platform/graphics/win/MediaPlayer=
PrivateQuickTimeVisualContext.cpp<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p>&n=
bsp;</o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">diff --=
git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMe=
diaElement.cpp<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">index e=
beee1b..d9f1691 100644<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">--- a/S=
ource/WebCore/html/HTMLMediaElement.cpp<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&#=
43;+ b/Source/WebCore/html/HTMLMediaElement.cpp<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">@@ -364=
,7 +364,7 @@ void HTMLMediaElement::parseAttribute(const Attribute&=
attribute)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">#endif<=
o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; else if (attribute.name() =3D=3D preloadAttr) {<o:p></o:p=
></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; if (equalIgnoringCase(attribute.v=
alue(), "none"))<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">- =
m_preload =3D =
MediaPlayer::None;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&n=
bsp; m_preload =
=3D MediaPlayer::PreloadNone;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; else if (equalIgnoringCase(attrib=
ute.value(), "metadata"))<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; m_preload=
=3D MediaPlayer::MetaData;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; else {<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">@@ -226=
3,7 +2263,7 @@ void HTMLMediaElement::setAutoplay(bool b)<o:p></o:p></s=
pan></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">String =
HTMLMediaElement::preload() const<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">{<o:p><=
/o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; switch (m_preload) {<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">- =
case MediaPlayer::None:<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&n=
bsp; case MediaPlayer::PreloadNone:<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; return "none";<o:p></o:=
p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; break;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; case MediaPlayer::MetaData:<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">diff --=
git a/Source/WebCore/platform/graphics/MediaPlayer.cpp b/Source/WebCore/pla=
tform/graphics/MediaPlayer.cpp<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">old mod=
e 100644<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">new mod=
e 100755<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">index 3=
77e8dc..1977c8a<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">--- a/S=
ource/WebCore/platform/graphics/MediaPlayer.cpp<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&#=
43;+ b/Source/WebCore/platform/graphics/MediaPlayer.cpp<o:p></o:p></spa=
n></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">@@ -79,=
7 +79,7 @@<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> n=
amespace WebCore {<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">-const =
PlatformMedia NoPlatformMedia =3D { PlatformMedia::None, {0} };<o:p></o:p><=
/span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+co=
nst PlatformMedia NoPlatformMedia =3D { PlatformMedia::PlayerTypeNone, {0} =
};<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> /=
/ a null player to make MediaPlayer logic simpler<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">diff --=
git a/Source/WebCore/platform/graphics/MediaPlayer.h b/Source/WebCore/platf=
orm/graphics/MediaPlayer.h<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">old mod=
e 100644<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">new mod=
e 100755<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">index 9=
93e9981..422032f<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">--- a/S=
ource/WebCore/platform/graphics/MediaPlayer.h<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&#=
43;+ b/Source/WebCore/platform/graphics/MediaPlayer.h<o:p></o:p></span>=
</p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">@@ -68,=
7 +68,7 @@ class MediaSource;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">// back=
end can live at runtime.<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">struct =
PlatformMedia {<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; enum {<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">- =
None,<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&n=
bsp; PlayerTypeNone,<o:p></o:p></span><=
/p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; QTMovieType,<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; QTMovieGWorldType,<o:p></o:p></sp=
an></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; QTMovieVisualContextType,<o:p></o=
:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">@@ -332=
,7 +332,7 @@ public:<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; enum MovieLoadType { Unknown, Download, StoredStream, Liv=
eStream };<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; MovieLoadType movieLoadType() const;<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">- =
enum Preload { None, MetaData, Auto };<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&n=
bsp; enum Preload { PreloadNone, MetaData, Auto };<o:p></o:p></=
span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; Preload preload() const;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; void setPreload(Preload);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">diff --=
git a/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreame=
r.cpp b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStrea=
mer.cpp<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">old mod=
e 100644<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">new mod=
e 100755<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">index a=
4d4745..20a50a4<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">--- a/S=
ource/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp<o=
:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&#=
43;+ b/Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGSt=
reamer.cpp<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">@@ -305=
,7 +305,7 @@ void MediaPlayerPrivateGStreamer::load(const String& u=
rl)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; LOG_MEDIA_MESSAGE("Load %s", cleanUrl.utf8=
().data());<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">- =
if (m_preload =3D=3D MediaPlayer::None) {<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&n=
bsp; if (m_preload =3D=3D MediaPlayer::PreloadNone) {<o:p></o:p=
></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; LOG_MEDIA_MESSAGE("Delaying =
load.");<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; m_delayingLoad =3D true;<o:p></o:=
p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; }<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">@@ -123=
6,7 +1236,7 @@ void MediaPlayerPrivateGStreamer::updateStates()<o:p></o=
:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; // can't work so disable on-disk =
buffering and reset the<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; // pipeline.<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; if (state =3D=3D GST_STATE_READY =
&& isLiveStream() && m_preload =3D=3D MediaPlayer::Auto) {<=
o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">- =
setPreload(Med=
iaPlayer::None);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&n=
bsp; setPreload=
(MediaPlayer::PreloadNone);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; gst_eleme=
nt_set_state(m_playBin, GST_STATE_NULL);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; gst_eleme=
nt_set_state(m_playBin, GST_STATE_PAUSED);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; }<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">@@ -148=
3,7 +1483,7 @@ void MediaPlayerPrivateGStreamer::durationChanged()<o:p>=
</o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; if (previousDuration && m_mediaDuration !=3D prev=
iousDuration)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; m_player->durationChanged();<o=
:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">- =
if (m_preload =3D=3D MediaPlayer::None && m_originalPr=
eloadWasAutoAndWasOverridden) {<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&n=
bsp; if (m_preload =3D=3D MediaPlayer::PreloadNone && m=
_originalPreloadWasAutoAndWasOverridden) {<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; m_totalBytes =3D -1;<o:p></o:p></=
span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; if (totalBytes() && !isLi=
veStream()) {<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; setPreloa=
d(MediaPlayer::Auto);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">@@ -174=
9,7 +1749,7 @@ void MediaPlayerPrivateGStreamer::setPreload(MediaPlayer=
::Preload preload)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; g_object_set(m_playBin, "fla=
gs", flags & ~GST_PLAY_FLAG_DOWNLOAD, NULL);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; }<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">- =
if (m_delayingLoad && m_preload !=3D MediaPlayer::None=
) {<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&n=
bsp; if (m_delayingLoad && m_preload !=3D MediaPlayer::=
PreloadNone) {<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; m_delayingLoad =3D false;<o:p></o=
:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; commitLoad();<o:p></o:p></span></=
p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; }<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">diff --=
git a/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm b/Sou=
rce/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm<o:p></o:p></sp=
an></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">index f=
774040..b813671 100644<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">--- a/S=
ource/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm<o:p></o:p></=
span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&#=
43;+ b/Source/WebCore/platform/graphics/mac/MediaPlayerPrivateQTKit.mm<=
o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">@@ -655=
,7 +655,7 @@ void MediaPlayerPrivateQTKit::load(const String& url)<=
o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; m_movieURL =3D url;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; // If the element is not supposed to load any data r=
eturn immediately.<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">- =
if (m_preload =3D=3D MediaPlayer::None)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&n=
bsp; if (m_preload =3D=3D MediaPlayer::PreloadNone)<o:p></o:p><=
/span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; return;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; loadInternal(url);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">@@ -169=
6,7 +1696,7 @@ MediaPlayer::MovieLoadType MediaPlayerPrivateQTKit::movi=
eLoadType() const<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">void Me=
diaPlayerPrivateQTKit::setPreload(MediaPlayer::Preload preload)<o:p></o:p><=
/span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">{<o:p><=
/o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; m_preload =3D preload;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">- =
if (m_preload =3D=3D MediaPlayer::None)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&n=
bsp; if (m_preload =3D=3D MediaPlayer::PreloadNone)<o:p></o:p><=
/span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; return;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; if (!m_qtMovie)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">diff --=
git a/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp b/Source=
/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">old mod=
e 100644<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">new mod=
e 100755<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">index 9=
ec765c..5288f74<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">--- a/S=
ource/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp<o:p></o:p></spa=
n></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&#=
43;+ b/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp<o:p=
></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">@@ -166=
,7 +166,7 @@ void MediaPlayerPrivateQt::load(const String& url)<o:p=
></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; // QtMultimedia does not have an API to throttle loa=
ding<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; // so we handle this ourselves by delaying the load<o:p><=
/o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">- =
if (m_preload =3D=3D MediaPlayer::None) {<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&n=
bsp; if (m_preload =3D=3D MediaPlayer::PreloadNone) {<o:p></o:p=
></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; m_delayingLoad =3D true;<o:p></o:=
p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; return;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; }<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">@@ -375=
,7 +375,7 @@ unsigned MediaPlayerPrivateQt::totalBytes() const<o:p></o:=
p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">void Me=
diaPlayerPrivateQt::setPreload(MediaPlayer::Preload preload)<o:p></o:p></sp=
an></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">{<o:p><=
/o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; m_preload =3D preload;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">- =
if (m_delayingLoad && m_preload !=3D MediaPlayer::None=
)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&n=
bsp; if (m_delayingLoad && m_preload !=3D MediaPlayer::=
PreloadNone)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; resumeLoad();<o:p></o:p></span></=
p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">}<o:p><=
/o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">diff --=
git a/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisua=
lContext.cpp b/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuick=
TimeVisualContext.cpp<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">old mod=
e 100644<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">new mod=
e 100755<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">index 3=
5c3d77..30d749d<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">--- a/S=
ource/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTimeVisualContex=
t.cpp<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&#=
43;+ b/Source/WebCore/platform/graphics/win/MediaPlayerPrivateQuickTime=
VisualContext.cpp<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">@@ -340=
,7 +340,7 @@ void MediaPlayerPrivateQuickTimeVisualContext::load(const =
String& url)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">{<o:p><=
/o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; m_movieURL =3D url;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">- =
if (m_preload =3D=3D MediaPlayer::None) {<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&n=
bsp; if (m_preload =3D=3D MediaPlayer::PreloadNone) {<o:p></o:p=
></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; m_delayingLoad =3D true;<o:p></o:=
p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; return;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; }<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">@@ -105=
8,7 +1058,7 @@ bool MediaPlayerPrivateQuickTimeVisualContext::hasSingle=
SecurityOrigin() const<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">void Me=
diaPlayerPrivateQuickTimeVisualContext::setPreload(MediaPlayer::Preload pre=
load)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">{<o:p><=
/o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; m_preload =3D preload;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">- =
if (m_delayingLoad && m_preload !=3D MediaPlayer::None=
)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&n=
bsp; if (m_delayingLoad && m_preload !=3D MediaPlayer::=
PreloadNone)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; resumeLoad();<o:p></o:p></span></=
p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">}<o:p><=
/o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">diff --=
git a/Source/WebKit/chromium/src/AssertMatchingEnums.cpp b/Source/WebKit/ch=
romium/src/AssertMatchingEnums.cpp<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">index d=
2461a9..d345a60 100644<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">--- a/S=
ource/WebKit/chromium/src/AssertMatchingEnums.cpp<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&#=
43;+ b/Source/WebKit/chromium/src/AssertMatchingEnums.cpp<o:p></o:p></s=
pan></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">@@ -393=
,7 +393,7 @@ COMPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::MovieLoadType=
Download, MediaPlayer:<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">COMPILE=
_ASSERT_MATCHING_ENUM(WebMediaPlayer::MovieLoadTypeStoredStream, MediaPlaye=
r::StoredStream);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">COMPILE=
_ASSERT_MATCHING_ENUM(WebMediaPlayer::MovieLoadTypeLiveStream, MediaPlayer:=
:LiveStream);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">-COMPIL=
E_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadNone, MediaPlayer::None);<o:p=
></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+CO=
MPILE_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadNone, MediaPlayer::Preloa=
dNone);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">COMPILE=
_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadMetaData, MediaPlayer::MetaDat=
a);<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">COMPILE=
_ASSERT_MATCHING_ENUM(WebMediaPlayer::PreloadAuto, MediaPlayer::Auto);<o:p>=
</o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">diff --=
git a/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp b/Source/WebK=
it/chromium/src/WebMediaPlayerClientImpl.cpp<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">index e=
75c739..217f87d 100644<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">--- a/S=
ource/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&#=
43;+ b/Source/WebKit/chromium/src/WebMediaPlayerClientImpl.cpp<o:p></o:=
p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">@@ -315=
,7 +315,7 @@ void WebMediaPlayerClientImpl::load(const String& url)=
<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; m_url =3D url;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; MutexLocker locker(m_webMediaPlayerMutex);<o:p></o:p=
></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">- =
if (m_preload =3D=3D MediaPlayer::None) {<o:p></o:p></span></p=
>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&n=
bsp; if (m_preload =3D=3D MediaPlayer::PreloadNone) {<o:p></o:p=
></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">#if ENA=
BLE(WEB_AUDIO)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; m_audioSourceProvider.wrap(0); //=
Clear weak reference to m_webMediaPlayer's WebAudioSourceProvider.<o:p></o=
:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">#endif<=
o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">@@ -686=
,7 +686,7 @@ void WebMediaPlayerClientImpl::setPreload(MediaPlayer::Pre=
load preload)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; if (m_webMediaPlayer)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; m_webMediaPlayer->setPreload(s=
tatic_cast<WebMediaPlayer::Preload>(preload));<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">- =
if (m_delayingLoad && m_preload !=3D MediaPlayer::None=
)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">+&n=
bsp; if (m_delayingLoad && m_preload !=3D MediaPlayer::=
PreloadNone)<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"> &=
nbsp; startDelayedLoad();<o:p></o:p></s=
pan></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">}<o:p><=
/o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p></=
o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">-- <o:p=
></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D">1.7.9.5=
<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p>&n=
bsp;</o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US" style=3D"color:#1F497D"><o:p>&n=
bsp;</o:p></span></p>
<div>
<div style=3D"border:none;border-top:solid #B5C4DF 1.0pt;padding:3.0pt 0cm =
0cm 0cm">
<p class=3D"MsoNormal" align=3D"left" style=3D"text-align:left"><b><span la=
ng=3D"EN-US" style=3D"font-size:10.0pt;font-family:"Tahoma","=
;sans-serif"">From:</span></b><span lang=3D"EN-US" style=3D"font-size:=
10.0pt;font-family:"Tahoma","sans-serif""> webkit-dev-b=
ounces at lists.webkit.org
[mailto:webkit-dev-bounces at lists.webkit.org] <b>On Behalf Of </b>Zhao, Hal=
ley<br>
<b>Sent:</b> Thursday, November 08, 2012 6:00 PM<br>
<b>To:</b> webkit-dev at lists.webkit.org<br>
<b>Subject:</b> [webkit-dev] compile failure when I try to introduce GLCont=
extEGL to MediaPlayerPrivateGStreamer<o:p></o:p></span></p>
</div>
</div>
<p class=3D"MsoNormal" align=3D"left" style=3D"text-align:left"><span lang=
=3D"EN-US"><o:p> </o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">Hi experts:<o:p></o:p></span></=
p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">I want to introduce EGL context=
to GStreamer Media player (MediaPlayerPrivateGStreamer),
<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">However, a simple ‘#inclu=
de “GLContextEGL.h”‘ in MediaPlayerPrivateGStreamer.cpp f=
ail to compile.<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">“MediaPlayerPrivateGStrea=
mer.cpp:321:35: error: expected unqualified-id before numeric constant̶=
1;<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">It seems to be namespace issue,=
but I can’t know where break.<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">Could you kindly educate me how=
to do it?<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"><o:p> </o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">Thanks.<o:p></o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US">More backgrounds see here:<o:p>=
</o:p></span></p>
<p class=3D"MsoNormal"><span lang=3D"EN-US"><a href=3D"https://bugs.webkit.=
org/show_bug.cgi?id=3D86410">https://bugs.webkit.org/show_bug.cgi?id=3D8641=
0</a>
<o:p></o:p></span></p>
</div>
</body>
</html>
--_000_81DD1C3FC6BE1E4EAA454D486F820044283D4BSHSMSX101ccrcorpi_--
More information about the webkit-dev
mailing list