Title: [133514] branches/chromium/1312/Source/WebCore
- Revision
- 133514
- Author
- [email protected]
- Date
- 2012-11-05 12:36:31 -0800 (Mon, 05 Nov 2012)
Log Message
Merge 133262 - Build fix. http://trac.webkit.org/changeset/133252 broke the Windows build.
https://bugs.webkit.org/show_bug.cgi?id=101008
Reviewed by [email protected].
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::clearMediaPlayer):
* html/HTMLMediaElement.h:
(HTMLMediaElement):
[email protected]
Review URL: https://codereview.chromium.org/11368088
Modified Paths
Diff
Modified: branches/chromium/1312/Source/WebCore/ChangeLog (133513 => 133514)
--- branches/chromium/1312/Source/WebCore/ChangeLog 2012-11-05 20:36:06 UTC (rev 133513)
+++ branches/chromium/1312/Source/WebCore/ChangeLog 2012-11-05 20:36:31 UTC (rev 133514)
@@ -1,3 +1,28 @@
+2012-11-01 Roger Fong <[email protected]>
+
+ Build fix. http://trac.webkit.org/changeset/133252 broke the Windows build.
+ https://bugs.webkit.org/show_bug.cgi?id=101008
+
+ Reviewed by [email protected].
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::clearMediaPlayer):
+ * html/HTMLMediaElement.h:
+ (HTMLMediaElement):
+
+2012-11-01 Stephen White <[email protected]>
+
+ Unreviewed, rolling out r133244.
+ http://trac.webkit.org/changeset/133244
+ https://bugs.webkit.org/show_bug.cgi?id=100973
+
+ Broke Chromium Mac (clang) builds.
+
+ * bindings/v8/DOMDataStore.cpp:
+ (WebCore::DOMDataStore::DOMDataStore):
+ * bindings/v8/IntrusiveDOMWrapperMap.h:
+ (WebCore::DOMNodeWrapperMap::weakCallback):
+
2012-11-01 Ami Fischman <[email protected]>
HTMLMediaPlayer should free m_player when src is set/changed
Modified: branches/chromium/1312/Source/WebCore/html/HTMLMediaElement.cpp (133513 => 133514)
--- branches/chromium/1312/Source/WebCore/html/HTMLMediaElement.cpp 2012-11-05 20:36:06 UTC (rev 133513)
+++ branches/chromium/1312/Source/WebCore/html/HTMLMediaElement.cpp 2012-11-05 20:36:31 UTC (rev 133514)
@@ -3710,7 +3710,7 @@
#endif
}
-void HTMLMediaElement::clearMediaPlayer(unsigned flags)
+void HTMLMediaElement::clearMediaPlayer(signed flags)
{
#if !ENABLE(PLUGIN_PROXY_FOR_VIDEO)
m_player.clear();
Modified: branches/chromium/1312/Source/WebCore/html/HTMLMediaElement.h (133513 => 133514)
--- branches/chromium/1312/Source/WebCore/html/HTMLMediaElement.h 2012-11-05 20:36:06 UTC (rev 133513)
+++ branches/chromium/1312/Source/WebCore/html/HTMLMediaElement.h 2012-11-05 20:36:31 UTC (rev 133514)
@@ -464,7 +464,7 @@
void scheduleNextSourceChild();
void loadNextSourceChild();
void userCancelledLoad();
- void clearMediaPlayer(unsigned flags);
+ void clearMediaPlayer(signed flags);
bool havePotentialSourceChild();
void noneSupported();
void mediaEngineError(PassRefPtr<MediaError> err);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
