Diff
Modified: trunk/Source/WebKit2/ChangeLog (167741 => 167742)
--- trunk/Source/WebKit2/ChangeLog 2014-04-24 03:43:47 UTC (rev 167741)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-24 03:56:09 UTC (rev 167742)
@@ -1,3 +1,30 @@
+2014-04-23 Andreas Kling <akl...@apple.com>
+
+ Remove unused WKPageSetMemoryCacheClientCallsEnabled API.
+ <https://webkit.org/b/132098>
+
+ This API was added to WK2 back in 2011 but never actually used.
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/WebPageCreationParameters.cpp:
+ (WebKit::WebPageCreationParameters::encode):
+ (WebKit::WebPageCreationParameters::decode):
+ * Shared/WebPageCreationParameters.h:
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageSetMemoryCacheClientCallsEnabled): Deleted.
+ * UIProcess/API/C/WKPage.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::creationParameters):
+ (WebKit::WebPageProxy::setMemoryCacheClientCallsEnabled): Deleted.
+ * UIProcess/WebPageProxy.h:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ (WebKit::WebPage::setMemoryCacheMessagesEnabled): Deleted.
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/WebPage.messages.in:
+
2014-04-23 Simon Fraser <simon.fra...@apple.com>
[iOS WK2] Make -webkit-overflow-scrolling:touch work
Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp (167741 => 167742)
--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2014-04-24 03:43:47 UTC (rev 167741)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp 2014-04-24 03:56:09 UTC (rev 167742)
@@ -41,7 +41,6 @@
encoder << drawsBackground;
encoder << drawsTransparentBackground;
encoder << underlayColor;
- encoder << areMemoryCacheClientCallsEnabled;
encoder << useFixedLayout;
encoder << fixedLayoutSize;
encoder.encodeEnum(paginationMode);
@@ -95,8 +94,6 @@
return false;
if (!decoder.decode(parameters.underlayColor))
return false;
- if (!decoder.decode(parameters.areMemoryCacheClientCallsEnabled))
- return false;
if (!decoder.decode(parameters.useFixedLayout))
return false;
if (!decoder.decode(parameters.fixedLayoutSize))
Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.h (167741 => 167742)
--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2014-04-24 03:43:47 UTC (rev 167741)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2014-04-24 03:56:09 UTC (rev 167742)
@@ -69,8 +69,6 @@
WebCore::Color underlayColor;
- bool areMemoryCacheClientCallsEnabled;
-
bool useFixedLayout;
WebCore::IntSize fixedLayoutSize;
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (167741 => 167742)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-04-24 03:43:47 UTC (rev 167741)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2014-04-24 03:56:09 UTC (rev 167742)
@@ -295,11 +295,6 @@
return toImpl(pageRef)->estimatedProgress();
}
-void WKPageSetMemoryCacheClientCallsEnabled(WKPageRef pageRef, bool memoryCacheClientCallsEnabled)
-{
- toImpl(pageRef)->setMemoryCacheClientCallsEnabled(memoryCacheClientCallsEnabled);
-}
-
WKStringRef WKPageCopyUserAgent(WKPageRef pageRef)
{
return toCopiedAPI(toImpl(pageRef)->userAgent());
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.h (167741 => 167742)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2014-04-24 03:43:47 UTC (rev 167741)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2014-04-24 03:56:09 UTC (rev 167742)
@@ -108,8 +108,6 @@
WK_EXPORT uint64_t WKPageGetRenderTreeSize(WKPageRef page);
-WK_EXPORT void WKPageSetMemoryCacheClientCallsEnabled(WKPageRef page, bool memoryCacheClientCallsEnabled);
-
WK_EXPORT WKInspectorRef WKPageGetInspector(WKPageRef page);
WK_EXPORT WKVibrationRef WKPageGetVibration(WKPageRef page);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (167741 => 167742)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-04-24 03:43:47 UTC (rev 167741)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-04-24 03:56:09 UTC (rev 167742)
@@ -283,7 +283,6 @@
, m_layerHostingMode(LayerHostingMode::InProcess)
, m_drawsBackground(true)
, m_drawsTransparentBackground(false)
- , m_areMemoryCacheClientCallsEnabled(true)
, m_useFixedLayout(false)
, m_suppressScrollbarAnimations(false)
, m_paginationMode(Pagination::Unpaginated)
@@ -2032,18 +2031,6 @@
m_pageZoomFactor = zoomFactor;
}
-void WebPageProxy::setMemoryCacheClientCallsEnabled(bool memoryCacheClientCallsEnabled)
-{
- if (!isValid())
- return;
-
- if (m_areMemoryCacheClientCallsEnabled == memoryCacheClientCallsEnabled)
- return;
-
- m_areMemoryCacheClientCallsEnabled = memoryCacheClientCallsEnabled;
- m_process->send(Messages::WebPage::SetMemoryCacheMessagesEnabled(memoryCacheClientCallsEnabled), m_pageID);
-}
-
void WebPageProxy::findStringMatches(const String& string, FindOptions options, unsigned maxMatchCount)
{
if (string.isEmpty()) {
@@ -4228,7 +4215,6 @@
parameters.drawsBackground = m_drawsBackground;
parameters.drawsTransparentBackground = m_drawsTransparentBackground;
parameters.underlayColor = m_underlayColor;
- parameters.areMemoryCacheClientCallsEnabled = m_areMemoryCacheClientCallsEnabled;
parameters.useFixedLayout = m_useFixedLayout;
parameters.fixedLayoutSize = m_fixedLayoutSize;
parameters.suppressScrollbarAnimations = m_suppressScrollbarAnimations;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (167741 => 167742)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-04-24 03:43:47 UTC (rev 167741)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-04-24 03:56:09 UTC (rev 167742)
@@ -811,8 +811,6 @@
void pageScaleFactorDidChange(double);
void pageZoomFactorDidChange(double);
- void setMemoryCacheClientCallsEnabled(bool);
-
// Find.
void findString(const String&, FindOptions, unsigned maxMatchCount);
void findStringMatches(const String&, FindOptions, unsigned maxMatchCount);
@@ -1521,8 +1519,6 @@
WebCore::Color m_underlayColor;
WebCore::Color m_pageExtendedBackgroundColor;
- bool m_areMemoryCacheClientCallsEnabled;
-
bool m_useFixedLayout;
WebCore::IntSize m_fixedLayoutSize;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (167741 => 167742)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-24 03:43:47 UTC (rev 167741)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-24 03:56:09 UTC (rev 167742)
@@ -390,8 +390,6 @@
setPageLength(parameters.pageLength);
setGapBetweenPages(parameters.gapBetweenPages);
- setMemoryCacheMessagesEnabled(parameters.areMemoryCacheClientCallsEnabled);
-
// If the page is created off-screen, its visibilityState should be prerender.
m_page->setViewState(m_viewState);
if (!isVisible())
@@ -3731,11 +3729,6 @@
ASSERT(!m_isRunningModal);
}
-void WebPage::setMemoryCacheMessagesEnabled(bool memoryCacheMessagesEnabled)
-{
- m_page->setMemoryCacheClientCallsEnabled(memoryCacheMessagesEnabled);
-}
-
bool WebPage::canHandleRequest(const WebCore::ResourceRequest& request)
{
if (SchemeRegistry::shouldLoadURLSchemeAsEmptyDocument(request.url().protocol()))
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (167741 => 167742)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-04-24 03:43:47 UTC (rev 167741)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-04-24 03:56:09 UTC (rev 167742)
@@ -668,8 +668,6 @@
void setDeviceScaleFactor(float);
float deviceScaleFactor() const;
- void setMemoryCacheMessagesEnabled(bool);
-
void forceRepaintWithoutCallback();
void unmarkAllMisspellings();
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (167741 => 167742)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-04-24 03:43:47 UTC (rev 167741)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2014-04-24 03:56:09 UTC (rev 167742)
@@ -271,8 +271,6 @@
SetMediaVolume(float volume)
SetMayStartMediaWhenInWindow(bool mayStartMedia)
- SetMemoryCacheMessagesEnabled(bool memoryCacheMessagesEnabled)
-
// FIXME: This a dummy message, to avoid breaking the build for platforms that don't require
// any synchronous messages, and should be removed when <rdar://problem/8775115> is fixed.
Dummy() -> (bool dummyReturn)
