<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[186913] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/186913">186913</a></dd>
<dt>Author</dt> <dd>mrajca@apple.com</dd>
<dt>Date</dt> <dd>2015-07-16 15:27:30 -0700 (Thu, 16 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Media Session: remove plumbing for delivering start/end-of-interruption events
https://bugs.webkit.org/show_bug.cgi?id=147005
Reviewed by Eric Carlson.
Instead of receiving interruptions through WebKit, we will provide platform-specific implementations in WebCore
so the same behavior is available to all clients.
WebCore:
* Modules/mediasession/MediaSessionEvents.h:
* page/Page.cpp:
* page/Page.h:
WebKit:
* UIProcess/API/C/WKPage.cpp:
* UIProcess/API/C/WKPagePrivate.h:
* UIProcess/WebPageProxy.cpp:
* UIProcess/WebPageProxy.h:
* WebProcess/WebPage/WebPage.cpp:
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/WebPage.messages.in:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediasessionMediaSessionEventsh">trunk/Source/WebCore/Modules/mediasession/MediaSessionEvents.h</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagePrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186912 => 186913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebCore/ChangeLog 2015-07-16 22:27:30 UTC (rev 186913)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-07-16 Matt Rajca <mrajca@apple.com>
+
+ Media Session: remove plumbing for delivering start/end-of-interruption events
+ https://bugs.webkit.org/show_bug.cgi?id=147005
+
+ Reviewed by Eric Carlson.
+
+ Instead of receiving interruptions through WebKit, we will provide platform-specific implementations in WebCore
+ so the same behavior is available to all clients.
+
+ * Modules/mediasession/MediaSessionEvents.h:
+ * page/Page.cpp:
+ * page/Page.h:
+
</ins><span class="cx"> 2015-07-16 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Content Extensions] Cache domain actions
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediasessionMediaSessionEventsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediasession/MediaSessionEvents.h (186912 => 186913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediasession/MediaSessionEvents.h 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebCore/Modules/mediasession/MediaSessionEvents.h 2015-07-16 22:27:30 UTC (rev 186913)
</span><span class="lines">@@ -36,17 +36,6 @@
</span><span class="cx"> TrackPrevious
</span><span class="cx"> };
</span><span class="cx">
</span><del>-enum MediaSessionInterruptionEvent {
- StartOfInterruption,
- EndOfInterruption
-};
-
-enum MediaSessionInterruptingCategory {
- Content,
- Transient,
- TransientSolo
-};
-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (186912 => 186913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebCore/page/Page.cpp 2015-07-16 22:27:30 UTC (rev 186913)
</span><span class="lines">@@ -57,7 +57,6 @@
</span><span class="cx"> #include "MediaCanStartListener.h"
</span><span class="cx"> #include "Navigator.h"
</span><span class="cx"> #include "NetworkStateNotifier.h"
</span><del>-#include "NotImplemented.h"
</del><span class="cx"> #include "PageCache.h"
</span><span class="cx"> #include "PageConfiguration.h"
</span><span class="cx"> #include "PageConsoleClient.h"
</span><span class="lines">@@ -1225,11 +1224,6 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
-void Page::handleMediaSessionInterruptionEvent(MediaSessionInterruptionEvent event, MediaSessionInterruptingCategory category)
-{
- notImplemented();
-}
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !ASSERT_DISABLED
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (186912 => 186913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebCore/page/Page.h 2015-07-16 22:27:30 UTC (rev 186913)
</span><span class="lines">@@ -442,7 +442,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="cx"> WEBCORE_EXPORT void handleMediaEvent(MediaEventType);
</span><del>- WEBCORE_EXPORT void handleMediaSessionInterruptionEvent(MediaSessionInterruptionEvent, MediaSessionInterruptingCategory);
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (186912 => 186913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebKit2/ChangeLog 2015-07-16 22:27:30 UTC (rev 186913)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-07-16 Matt Rajca <mrajca@apple.com>
+
+ Media Session: remove plumbing for delivering start/end-of-interruption events
+ https://bugs.webkit.org/show_bug.cgi?id=147005
+
+ Reviewed by Eric Carlson.
+
+ Instead of receiving interruptions through WebKit, we will provide platform-specific implementations in WebCore
+ so the same behavior is available to all clients.
+
+ * UIProcess/API/C/WKPage.cpp:
+ * UIProcess/API/C/WKPagePrivate.h:
+ * UIProcess/WebPageProxy.cpp:
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
</ins><span class="cx"> 2015-07-16 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r186464): [SOUP] ASSERTION FAILED: !m_messageReceiverMapCount when closing any tab
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (186912 => 186913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2015-07-16 22:27:30 UTC (rev 186913)
</span><span class="lines">@@ -2189,56 +2189,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(MEDIA_SESSION)
-// NOTE: The values in the WKMediaSessionInterruptingCategory enum must stay in sync with those in WebCore::MediaSessionInterruptingCategory.
-COMPILE_ASSERT(MediaSessionInterruptingCategory::Content == static_cast<MediaSessionInterruptingCategory>(kWKMediaSessionInterruptingCategoryContent), MediaSessionInterruptingCategoryEnumContent_Is_Wrong_Should_Be_kWKMediaSessionInterruptingCategoryContent);
-COMPILE_ASSERT(MediaSessionInterruptingCategory::Transient == static_cast<MediaSessionInterruptingCategory>(kWKMediaSessionInterruptingCategoryTransient), MediaSessionInterruptingCategoryEnumTransient_Is_Wrong_Should_Be_kWKMediaSessionInterruptingCategoryTransient);
-COMPILE_ASSERT(MediaSessionInterruptingCategory::TransientSolo == static_cast<MediaSessionInterruptingCategory>(kWKMediaSessionInterruptingCategoryTransientSolo), MediaSessionInterruptingCategoryEnumTransientSolo_Is_Wrong_Should_Be_kWKMediaSessionInterruptingCategoryTransientSolo);
-
-COMPILE_ASSERT(MediaSessionInterruptionEvent::StartOfInterruption == static_cast<MediaSessionInterruptionEvent>(kWKMediaSessionInterruptionEventStartOfInterruption), MediaSessionInterruptionEventEnumStartOfInterruption_Is_Wrong_Should_Be_kWKMediaSessionInterruptionEventStartOfInterruption);
-COMPILE_ASSERT(MediaSessionInterruptionEvent::EndOfInterruption == static_cast<MediaSessionInterruptionEvent>(kWKMediaSessionInterruptionEventEndOfInterruption), MediaSessionInterruptionEventEnumEndOfInterruption_Is_Wrong_Should_Be_kWKMediaSessionInterruptionEventEndOfInterruption);
-#endif
-
-void WKPageHandleMediaSessionInterruptionEvent(WKPageRef page, WKMediaSessionInterruptionEvent wkEvent, WKMediaSessionInterruptingCategory wkCategory)
-{
-#if ENABLE(MEDIA_SESSION)
- MediaSessionInterruptingCategory category;
-
- switch (wkCategory) {
- case kWKMediaSessionInterruptingCategoryContent:
- category = MediaSessionInterruptingCategory::Content;
- break;
- case kWKMediaSessionInterruptingCategoryTransient:
- category = MediaSessionInterruptingCategory::Transient;
- break;
- case kWKMediaSessionInterruptingCategoryTransientSolo:
- category = MediaSessionInterruptingCategory::TransientSolo;
- break;
- default:
- ASSERT_NOT_REACHED();
- }
-
- MediaSessionInterruptionEvent event;
-
- switch (wkEvent) {
- case kWKMediaSessionInterruptionEventStartOfInterruption:
- event = MediaSessionInterruptionEvent::StartOfInterruption;
- break;
- case kWKMediaSessionInterruptionEventEndOfInterruption:
- event = MediaSessionInterruptionEvent::EndOfInterruption;
- break;
- default:
- ASSERT_NOT_REACHED();
- }
-
- toImpl(page)->handleMediaSessionInterruptionEvent(event, category);
-#else
- UNUSED_PARAM(page);
- UNUSED_PARAM(wkEvent);
- UNUSED_PARAM(wkCategory);
-#endif
-}
-
</del><span class="cx"> void WKPagePostMessageToInjectedBundle(WKPageRef pageRef, WKStringRef messageNameRef, WKTypeRef messageBodyRef)
</span><span class="cx"> {
</span><span class="cx"> toImpl(pageRef)->postMessageToInjectedBundle(toImpl(messageNameRef)->string(), toImpl(messageBodyRef));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h (186912 => 186913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2015-07-16 22:27:30 UTC (rev 186913)
</span><span class="lines">@@ -118,22 +118,8 @@
</span><span class="cx"> };
</span><span class="cx"> typedef uint32_t WKMediaEventType;
</span><span class="cx">
</span><del>-enum {
- kWKMediaSessionInterruptingCategoryContent,
- kWKMediaSessionInterruptingCategoryTransient,
- kWKMediaSessionInterruptingCategoryTransientSolo
-};
-typedef uint32_t WKMediaSessionInterruptingCategory;
-
-enum {
- kWKMediaSessionInterruptionEventStartOfInterruption,
- kWKMediaSessionInterruptionEventEndOfInterruption
-};
-typedef uint32_t WKMediaSessionInterruptionEvent;
-
</del><span class="cx"> WK_EXPORT bool WKPageHasMediaSessionWithActiveMediaElements(WKPageRef page);
</span><span class="cx"> WK_EXPORT void WKPageHandleMediaEvent(WKPageRef page, WKMediaEventType event);
</span><del>-WK_EXPORT void WKPageHandleMediaSessionInterruptionEvent(WKPageRef page, WKMediaSessionInterruptionEvent event, WKMediaSessionInterruptingCategory category);
</del><span class="cx">
</span><span class="cx"> WK_EXPORT void WKPageLoadURLWithShouldOpenExternalURLsPolicy(WKPageRef page, WKURLRef url, bool shouldOpenExternalURLs);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (186912 => 186913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-07-16 22:27:30 UTC (rev 186913)
</span><span class="lines">@@ -3878,14 +3878,6 @@
</span><span class="cx">
</span><span class="cx"> m_process->send(Messages::WebPage::HandleMediaEvent(eventType), m_pageID);
</span><span class="cx"> }
</span><del>-
-void WebPageProxy::handleMediaSessionInterruptionEvent(MediaSessionInterruptionEvent event, MediaSessionInterruptingCategory category)
-{
- if (!isValid())
- return;
-
- m_process->send(Messages::WebPage::HandleMediaSessionInterruptionEvent(event, category), m_pageID);
-}
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::setMayStartMediaWhenInWindow(bool mayStartMedia)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (186912 => 186913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-07-16 22:27:30 UTC (rev 186913)
</span><span class="lines">@@ -943,7 +943,6 @@
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="cx"> bool hasMediaSessionWithActiveMediaElements() const { return m_hasMediaSessionWithActiveMediaElements; }
</span><span class="cx"> void handleMediaEvent(WebCore::MediaEventType);
</span><del>- void handleMediaSessionInterruptionEvent(WebCore::MediaSessionInterruptionEvent, WebCore::MediaSessionInterruptingCategory);
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // WebPopupMenuProxy::Client
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (186912 => 186913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-07-16 22:27:30 UTC (rev 186913)
</span><span class="lines">@@ -4043,11 +4043,6 @@
</span><span class="cx"> {
</span><span class="cx"> m_page->handleMediaEvent(static_cast<MediaEventType>(eventType));
</span><span class="cx"> }
</span><del>-
-void WebPage::handleMediaSessionInterruptionEvent(uint32_t event, uint32_t category)
-{
- m_page->handleMediaSessionInterruptionEvent(static_cast<MediaSessionInterruptionEvent>(event), static_cast<MediaSessionInterruptingCategory>(category));
-}
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void WebPage::setMayStartMediaWhenInWindow(bool mayStartMedia)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (186912 => 186913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-07-16 22:27:30 UTC (rev 186913)
</span><span class="lines">@@ -744,7 +744,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="cx"> void handleMediaEvent(uint32_t /* WebCore::MediaEventType */);
</span><del>- void handleMediaSessionInterruptionEvent(uint32_t /* WebCore::MediaSessionInterruptionEvent */, uint32_t /* WebCore::MediaSessionInterruptingCategory */);
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void updateMainFrameScrollOffsetPinning();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (186912 => 186913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-07-16 22:08:19 UTC (rev 186912)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2015-07-16 22:27:30 UTC (rev 186913)
</span><span class="lines">@@ -315,7 +315,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="cx"> HandleMediaEvent(uint32_t eventType)
</span><del>- HandleMediaSessionInterruptionEvent(uint32_t event, uint32_t interruptingCategory)
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // FIXME: This a dummy message, to avoid breaking the build for platforms that don't require
</span></span></pre>
</div>
</div>
</body>
</html>