Title: [188041] trunk/Source/WebCore
- Revision
- 188041
- Author
- achristen...@apple.com
- Date
- 2015-08-06 09:36:39 -0700 (Thu, 06 Aug 2015)
Log Message
Fix build without ENABLE(VIDEO) after r188030.
* dom/Document.h:
* html/HTMLMediaElement.cpp:
* html/HTMLMediaElement.h:
Move definition of HTMLMediaElementInvalidID to Document.h so it can be used outside of ENABLE(VIDEO) macros.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (188040 => 188041)
--- trunk/Source/WebCore/ChangeLog 2015-08-06 16:24:38 UTC (rev 188040)
+++ trunk/Source/WebCore/ChangeLog 2015-08-06 16:36:39 UTC (rev 188041)
@@ -1,3 +1,12 @@
+2015-08-06 Alex Christensen <achristen...@webkit.org>
+
+ Fix build without ENABLE(VIDEO) after r188030.
+
+ * dom/Document.h:
+ * html/HTMLMediaElement.cpp:
+ * html/HTMLMediaElement.h:
+ Move definition of HTMLMediaElementInvalidID to Document.h so it can be used outside of ENABLE(VIDEO) macros.
+
2015-08-04 Matt Rajca <mra...@apple.com>
Media Session: push paused state to the media session focus manager instead of polling
Modified: trunk/Source/WebCore/dom/Document.h (188040 => 188041)
--- trunk/Source/WebCore/dom/Document.h 2015-08-06 16:24:38 UTC (rev 188040)
+++ trunk/Source/WebCore/dom/Document.h 2015-08-06 16:36:39 UTC (rev 188041)
@@ -226,7 +226,7 @@
class MediaSession;
#endif
-WEBCORE_EXPORT extern const uint64_t HTMLMediaElementInvalidID;
+const uint64_t HTMLMediaElementInvalidID = 0;
enum PageshowEventPersistence {
PageshowEventNotPersisted = 0,
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (188040 => 188041)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-08-06 16:24:38 UTC (rev 188040)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2015-08-06 16:36:39 UTC (rev 188041)
@@ -41,6 +41,7 @@
#include "DiagnosticLoggingClient.h"
#include "DiagnosticLoggingKeys.h"
#include "DisplaySleepDisabler.h"
+#include "Document.h"
#include "DocumentLoader.h"
#include "ElementIterator.h"
#include "EventNames.h"
@@ -202,8 +203,6 @@
static const char* mediaStreamBlobProtocol = "blob";
#endif
-const uint64_t HTMLMediaElementInvalidID = 0;
-
using namespace HTMLNames;
typedef HashMap<Document*, HashSet<HTMLMediaElement*>> DocumentElementSetMap;
Modified: trunk/Source/WebCore/html/HTMLMediaElement.h (188040 => 188041)
--- trunk/Source/WebCore/html/HTMLMediaElement.h 2015-08-06 16:24:38 UTC (rev 188040)
+++ trunk/Source/WebCore/html/HTMLMediaElement.h 2015-08-06 16:36:39 UTC (rev 188041)
@@ -98,8 +98,6 @@
class MediaStream;
#endif
-extern const uint64_t HTMLMediaElementInvalidID;
-
class HTMLMediaElement
: public HTMLElement
, private MediaPlayerClient, public MediaPlayerSupportsTypeClient, private MediaCanStartListener, public ActiveDOMObject, public MediaControllerInterface , public PlatformMediaSessionClient, private MediaProducer
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
