Diff
Modified: trunk/Source/WebKit2/ChangeLog (135843 => 135844)
--- trunk/Source/WebKit2/ChangeLog 2012-11-27 11:20:35 UTC (rev 135843)
+++ trunk/Source/WebKit2/ChangeLog 2012-11-27 11:31:45 UTC (rev 135844)
@@ -1,3 +1,32 @@
+2012-11-27 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r135819.
+ http://trac.webkit.org/changeset/135819
+ https://bugs.webkit.org/show_bug.cgi?id=103388
+
+ It broke many tests on Qt and EFL WK2 platforms (Requested by
+ Ossy on #webkit).
+
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h:
+ (WebPageCreationParameters):
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageCopyRelatedPages):
+ * UIProcess/API/C/WKPagePrivate.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::creationParameters):
+ * UIProcess/WebPageProxy.h:
+ (WebPageProxy):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ (WebKit::WebPage::setIsInWindow):
+ * WebProcess/WebPage/WebPage.h:
+ (WebPage):
+ * WebProcess/WebPage/WebPage.messages.in:
+
2012-11-27 Kyungjin Kim <[email protected]>
[WK2] Expose Accelerated2dCanvas flag set and get in WebKit2
Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp (135843 => 135844)
--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2012-11-27 11:20:35 UTC (rev 135843)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2012-11-27 11:31:45 UTC (rev 135844)
@@ -57,7 +57,6 @@
encoder << canRunModal;
encoder << deviceScaleFactor;
encoder << mediaVolume;
- encoder << mayStartMediaWhenInWindow;
#if PLATFORM(MAC)
encoder << isSmartInsertDeleteEnabled;
@@ -120,8 +119,6 @@
return false;
if (!decoder->decode(parameters.mediaVolume))
return false;
- if (!decoder->decode(parameters.mayStartMediaWhenInWindow))
- return false;
#if PLATFORM(MAC)
if (!decoder->decode(parameters.isSmartInsertDeleteEnabled))
Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.h (135843 => 135844)
--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2012-11-27 11:20:35 UTC (rev 135843)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2012-11-27 11:31:45 UTC (rev 135844)
@@ -85,7 +85,6 @@
float deviceScaleFactor;
float mediaVolume;
- bool mayStartMediaWhenInWindow;
#if PLATFORM(MAC)
bool isSmartInsertDeleteEnabled;
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (135843 => 135844)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2012-11-27 11:20:35 UTC (rev 135843)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2012-11-27 11:31:45 UTC (rev 135844)
@@ -764,8 +764,3 @@
{
return toAPI(toImpl(pageRef)->relatedPages().leakRef());
}
-
-void WKPageSetMayStartMediaWhenInWindow(WKPageRef pageRef, bool mayStartMedia)
-{
- toImpl(pageRef)->setMayStartMediaWhenInWindow(mayStartMedia);
-}
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h (135843 => 135844)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2012-11-27 11:20:35 UTC (rev 135843)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2012-11-27 11:31:45 UTC (rev 135844)
@@ -93,7 +93,6 @@
WK_EXPORT void WKPageSetShouldSendEventsSynchronously(WKPageRef page, bool sync);
WK_EXPORT void WKPageSetMediaVolume(WKPageRef page, float volume);
-WK_EXPORT void WKPageSetMayStartMediaWhenInWindow(WKPageRef page, bool mayStartMedia);
WK_EXPORT WKArrayRef WKPageCopyRelatedPages(WKPageRef page);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (135843 => 135844)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-11-27 11:20:35 UTC (rev 135843)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2012-11-27 11:31:45 UTC (rev 135844)
@@ -234,7 +234,6 @@
, m_shouldSendEventsSynchronously(false)
, m_suppressVisibilityUpdates(false)
, m_mediaVolume(1)
- , m_mayStartMediaWhenInWindow(true)
#if ENABLE(PAGE_VISIBILITY_API)
, m_visibilityState(PageVisibilityStateVisible)
#endif
@@ -2783,19 +2782,6 @@
m_process->send(Messages::WebPage::SetMediaVolume(volume), m_pageID);
}
-void WebPageProxy::setMayStartMediaWhenInWindow(bool mayStartMedia)
-{
- if (mayStartMedia == m_mayStartMediaWhenInWindow)
- return;
-
- m_mayStartMediaWhenInWindow = mayStartMedia;
-
- if (!isValid())
- return;
-
- process()->send(Messages::WebPage::SetMayStartMediaWhenInWindow(mayStartMedia), m_pageID);
-}
-
#if PLATFORM(QT) || PLATFORM(EFL) || PLATFORM(GTK)
void WebPageProxy::handleDownloadRequest(DownloadProxy* download)
{
@@ -3777,7 +3763,6 @@
parameters.canRunModal = m_canRunModal;
parameters.deviceScaleFactor = m_intrinsicDeviceScaleFactor;
parameters.mediaVolume = m_mediaVolume;
- parameters.mayStartMediaWhenInWindow = m_mayStartMediaWhenInWindow;
#if PLATFORM(MAC)
parameters.isSmartInsertDeleteEnabled = m_isSmartInsertDeleteEnabled;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (135843 => 135844)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2012-11-27 11:20:35 UTC (rev 135843)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2012-11-27 11:31:45 UTC (rev 135844)
@@ -736,7 +736,6 @@
void printMainFrame();
void setMediaVolume(float);
- void setMayStartMediaWhenInWindow(bool);
// WebPopupMenuProxy::Client
virtual NativeWebMouseEvent* currentlyProcessedMouseDownEvent();
@@ -1239,7 +1238,6 @@
bool m_suppressVisibilityUpdates;
float m_mediaVolume;
- bool m_mayStartMediaWhenInWindow;
#if PLATFORM(QT)
WTF::HashSet<RefPtr<QtRefCountedNetworkRequestData> > m_applicationSchemeRequests;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (135843 => 135844)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-11-27 11:20:35 UTC (rev 135843)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2012-11-27 11:31:45 UTC (rev 135844)
@@ -364,7 +364,6 @@
m_drawingArea->setPaintingEnabled(true);
setMediaVolume(parameters.mediaVolume);
- m_mayStartMediaWhenInWindow = parameters.mayStartMediaWhenInWindow;
WebProcess::shared().addMessageReceiver(Messages::WebPage::messageReceiverName(), m_pageID, this);
@@ -1894,9 +1893,7 @@
// Defer the call to Page::setCanStartMedia() since it ends up sending a syncrhonous messages to the UI process
// in order to get plug-in connections, and the UI process will be waiting for the Web process to update the backing
// store after moving the view into a window, until it times out and paints white. See <rdar://problem/9242771>.
- if (m_mayStartMediaWhenInWindow)
- m_setCanStartMediaTimer.startOneShot(0);
-
+ m_setCanStartMediaTimer.startOneShot(0);
m_page->didMoveOnscreen();
}
}
@@ -3321,16 +3318,6 @@
m_page->setMediaVolume(volume);
}
-void WebPage::setMayStartMediaWhenInWindow(bool mayStartMedia)
-{
- if (mayStartMedia == m_mayStartMediaWhenInWindow)
- return;
-
- m_mayStartMediaWhenInWindow = mayStartMedia;
- if (m_mayStartMediaWhenInWindow && m_page->isOnscreen())
- m_setCanStartMediaTimer.startOneShot(0);
-}
-
void WebPage::runModal()
{
if (m_isClosed)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (135843 => 135844)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2012-11-27 11:20:35 UTC (rev 135843)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2012-11-27 11:31:45 UTC (rev 135844)
@@ -525,7 +525,6 @@
#endif
void setMediaVolume(float);
- void setMayStartMediaWhenInWindow(bool);
bool mainFrameHasCustomRepresentation() const;
@@ -852,7 +851,6 @@
#endif
WebCore::RunLoop::Timer<WebPage> m_setCanStartMediaTimer;
- bool m_mayStartMediaWhenInWindow;
HashMap<uint64_t, RefPtr<WebUndoStep> > m_undoStepMap;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (135843 => 135844)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2012-11-27 11:20:35 UTC (rev 135843)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2012-11-27 11:31:45 UTC (rev 135844)
@@ -226,7 +226,6 @@
# Media
SetMediaVolume(float volume)
- SetMayStartMediaWhenInWindow(bool mayStartMedia)
SetMemoryCacheMessagesEnabled(bool memoryCacheMessagesEnabled)
