Diff
Modified: trunk/Source/WebKit2/ChangeLog (153955 => 153956)
--- trunk/Source/WebKit2/ChangeLog 2013-08-12 19:47:09 UTC (rev 153955)
+++ trunk/Source/WebKit2/ChangeLog 2013-08-12 20:54:20 UTC (rev 153956)
@@ -1,3 +1,29 @@
+2013-08-12 Beth Dakin <[email protected]>
+
+ Remove didNewFirstVisuallyNonEmptyLayout from WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=119658
+
+ Reviewed by Darin Adler.
+
+ Removing this function entirely will change some functionality in the Nightlies,
+ but we think that is an acceptable difference for the Nightlies. If is does cause
+ a problem though, we can roll out this patch and deprecate the function instead.
+
+ * UIProcess/API/C/WKPage.h:
+ * UIProcess/WebLoaderClient.cpp:
+ * UIProcess/WebLoaderClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::initializeLoaderClient):
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.messages.in:
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.h:
+ * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
+ * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h:
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::dispatchDidLayout):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::initializeInjectedBundleLoaderClient):
+
2013-08-12 Arunprasad Rajkumar <[email protected]>
[Qt] [WebKit2] Remove duplicate RAM Size calculation and reuse WTF::ramSize()
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.h (153955 => 153956)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2013-08-12 19:47:09 UTC (rev 153955)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.h 2013-08-12 20:54:20 UTC (rev 153956)
@@ -79,7 +79,6 @@
typedef void (*WKPageDidReceiveAuthenticationChallengeInFrameCallback)(WKPageRef page, WKFrameRef frame, WKAuthenticationChallengeRef authenticationChallenge, const void *clientInfo);
typedef void (*WKPageDidChangeBackForwardListCallback)(WKPageRef page, WKBackForwardListItemRef addedItem, WKArrayRef removedItems, const void *clientInfo);
typedef bool (*WKPageShouldGoToBackForwardListItemCallback)(WKPageRef page, WKBackForwardListItemRef item, const void *clientInfo);
-typedef void (*WKPageDidNewFirstVisuallyNonEmptyLayoutCallback)(WKPageRef page, WKTypeRef userData, const void *clientInfo);
typedef void (*WKPageWillGoToBackForwardListItemCallback)(WKPageRef page, WKBackForwardListItemRef item, WKTypeRef userData, const void *clientInfo);
typedef void (*WKPageDidLayoutCallback)(WKPageRef page, WKLayoutMilestones milestones, WKTypeRef userData, const void *clientInfo);
typedef WKPluginLoadPolicy (*WKPagePluginLoadPolicyCallback)(WKPageRef page, WKPluginLoadPolicy currentPluginLoadPolicy, WKDictionaryRef pluginInfoDictionary, WKStringRef* unavailabilityDescription, const void* clientInfo);
@@ -126,9 +125,7 @@
// Version 1
WKPageDidDetectXSSForFrameCallback didDetectXSSForFrame;
- // FIXME: didNewFirstVisuallyNonEmptyLayout should be removed. We should consider removing didFirstVisuallyNonEmptyLayoutForFrame
- // as well. Their functionality is replaced by didLayout.
- WKPageDidNewFirstVisuallyNonEmptyLayoutCallback didNewFirstVisuallyNonEmptyLayout;
+ void* didNewFirstVisuallyNonEmptyLayout_unavailable;
WKPageWillGoToBackForwardListItemCallback willGoToBackForwardListItem;
@@ -140,7 +137,7 @@
void (*registerIntentServiceForFrame_unavailable)(void);
WKPageDidLayoutCallback didLayout;
- WKPagePluginLoadPolicyCallback_deprecatedForUseWithV2 pluginLoadPolicy_deprecatedForUseWithV2;
+ WKPagePluginLoadPolicyCallback_deprecatedForUseWithV2 pluginLoadPolicy_deprecatedForUseWithV2;
WKPagePluginDidFailCallback pluginDidFail;
// Version 3
Modified: trunk/Source/WebKit2/UIProcess/WebLoaderClient.cpp (153955 => 153956)
--- trunk/Source/WebKit2/UIProcess/WebLoaderClient.cpp 2013-08-12 19:47:09 UTC (rev 153955)
+++ trunk/Source/WebKit2/UIProcess/WebLoaderClient.cpp 2013-08-12 20:54:20 UTC (rev 153956)
@@ -126,14 +126,6 @@
m_client.didFirstVisuallyNonEmptyLayoutForFrame(toAPI(page), toAPI(frame), toAPI(userData), m_client.clientInfo);
}
-void WebLoaderClient::didNewFirstVisuallyNonEmptyLayout(WebPageProxy* page, APIObject* userData)
-{
- if (!m_client.didNewFirstVisuallyNonEmptyLayout)
- return;
-
- m_client.didNewFirstVisuallyNonEmptyLayout(toAPI(page), toAPI(userData), m_client.clientInfo);
-}
-
void WebLoaderClient::didLayout(WebPageProxy* page, LayoutMilestones milestones, APIObject* userData)
{
if (!m_client.didLayout)
Modified: trunk/Source/WebKit2/UIProcess/WebLoaderClient.h (153955 => 153956)
--- trunk/Source/WebKit2/UIProcess/WebLoaderClient.h 2013-08-12 19:47:09 UTC (rev 153955)
+++ trunk/Source/WebKit2/UIProcess/WebLoaderClient.h 2013-08-12 20:54:20 UTC (rev 153956)
@@ -62,15 +62,15 @@
void didSameDocumentNavigationForFrame(WebPageProxy*, WebFrameProxy*, SameDocumentNavigationType, APIObject*);
void didReceiveTitleForFrame(WebPageProxy*, const String&, WebFrameProxy*, APIObject*);
void didFirstLayoutForFrame(WebPageProxy*, WebFrameProxy*, APIObject*);
+
+ // FIXME: We should consider removing didFirstVisuallyNonEmptyLayoutForFrame since it is replaced by didLayout.
void didFirstVisuallyNonEmptyLayoutForFrame(WebPageProxy*, WebFrameProxy*, APIObject*);
+
void didRemoveFrameFromHierarchy(WebPageProxy*, WebFrameProxy*, APIObject*);
void didDisplayInsecureContentForFrame(WebPageProxy*, WebFrameProxy*, APIObject*);
void didRunInsecureContentForFrame(WebPageProxy*, WebFrameProxy*, APIObject*);
void didDetectXSSForFrame(WebPageProxy*, WebFrameProxy*, APIObject*);
- // FIXME: didNewFirstVisuallyNonEmptyLayout should be removed. We should consider removing didFirstVisuallyNonEmptyLayoutForFrame
- // as well. They are both being replaced by didLayout.
- void didNewFirstVisuallyNonEmptyLayout(WebPageProxy*, APIObject*);
void didLayout(WebPageProxy*, WebCore::LayoutMilestones, APIObject*);
bool canAuthenticateAgainstProtectionSpaceInFrame(WebPageProxy*, WebFrameProxy*, WebProtectionSpace*);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (153955 => 153956)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-08-12 19:47:09 UTC (rev 153955)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2013-08-12 20:54:20 UTC (rev 153956)
@@ -421,8 +421,6 @@
milestones |= WebCore::DidFirstLayout;
if (loadClient->didFirstVisuallyNonEmptyLayoutForFrame)
milestones |= WebCore::DidFirstVisuallyNonEmptyLayout;
- if (loadClient->didNewFirstVisuallyNonEmptyLayout)
- milestones |= WebCore::DidHitRelevantRepaintedObjectsAreaThreshold;
if (milestones)
m_process->send(Messages::WebPage::ListenForLayoutMilestones(milestones), m_pageID);
@@ -2397,16 +2395,6 @@
m_loaderClient.didFirstVisuallyNonEmptyLayoutForFrame(this, frame, userData.get());
}
-void WebPageProxy::didNewFirstVisuallyNonEmptyLayout(CoreIPC::MessageDecoder& decoder)
-{
- RefPtr<APIObject> userData;
- WebContextUserMessageDecoder messageDecoder(userData, m_process.get());
- if (!decoder.decode(messageDecoder))
- return;
-
- m_loaderClient.didNewFirstVisuallyNonEmptyLayout(this, userData.get());
-}
-
void WebPageProxy::didLayout(uint32_t layoutMilestones, CoreIPC::MessageDecoder& decoder)
{
RefPtr<APIObject> userData;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (153955 => 153956)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-08-12 19:47:09 UTC (rev 153955)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2013-08-12 20:54:20 UTC (rev 153956)
@@ -816,7 +816,6 @@
void didReceiveTitleForFrame(uint64_t frameID, const String&, CoreIPC::MessageDecoder&);
void didFirstLayoutForFrame(uint64_t frameID, CoreIPC::MessageDecoder&);
void didFirstVisuallyNonEmptyLayoutForFrame(uint64_t frameID, CoreIPC::MessageDecoder&);
- void didNewFirstVisuallyNonEmptyLayout(CoreIPC::MessageDecoder&);
void didLayout(uint32_t layoutMilestones, CoreIPC::MessageDecoder&);
void didRemoveFrameFromHierarchy(uint64_t frameID, CoreIPC::MessageDecoder&);
void didDisplayInsecureContentForFrame(uint64_t frameID, CoreIPC::MessageDecoder&);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in (153955 => 153956)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2013-08-12 19:47:09 UTC (rev 153955)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.messages.in 2013-08-12 20:54:20 UTC (rev 153956)
@@ -123,7 +123,6 @@
DidFinishLoadForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
DidFirstLayoutForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
DidFirstVisuallyNonEmptyLayoutForFrame(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
- DidNewFirstVisuallyNonEmptyLayout(WebKit::InjectedBundleUserMessageEncoder userData) Variadic
DidLayout(uint32_t type, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
DidReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, WTF::String url, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
DidRemoveFrameFromHierarchy(uint64_t frameID, WebKit::InjectedBundleUserMessageEncoder userData) Variadic
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h (153955 => 153956)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2013-08-12 19:47:09 UTC (rev 153955)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2013-08-12 20:54:20 UTC (rev 153956)
@@ -97,7 +97,6 @@
typedef void (*WKBundlePageDidDetectXSSForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo);
typedef void (*WKBundlePageDidFirstLayoutForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo);
typedef void (*WKBundlePageDidFirstVisuallyNonEmptyLayoutForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, WKTypeRef* userData, const void *clientInfo);
-typedef void (*WKBundlePageDidNewFirstVisuallyNonEmptyLayoutCallback)(WKBundlePageRef page, WKTypeRef* userData, const void *clientInfo);
typedef void (*WKBundlePageDidLayoutForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, const void* clientInfo);
typedef void (*WKBundlePageDidClearWindowObjectForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, WKBundleScriptWorldRef world, const void *clientInfo);
typedef void (*WKBundlePageDidCancelClientRedirectForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, const void *clientInfo);
@@ -140,7 +139,7 @@
// Version 1.
WKBundlePageDidLayoutForFrameCallback didLayoutForFrame;
- WKBundlePageDidNewFirstVisuallyNonEmptyLayoutCallback didNewFirstVisuallyNonEmptyLayout;
+ void * didNewFirstVisuallyNonEmptyLayout_unavailable;
WKBundlePageDidDetectXSSForFrameCallback didDetectXSSForFrame;
WKBundlePageShouldGoToBackForwardListItemCallback shouldGoToBackForwardListItem;
WKBundlePageGlobalObjectIsAvailableForFrameCallback globalObjectIsAvailableForFrame;
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp (153955 => 153956)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp 2013-08-12 19:47:09 UTC (rev 153955)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp 2013-08-12 20:54:20 UTC (rev 153956)
@@ -247,16 +247,6 @@
m_client.didLayoutForFrame(toAPI(page), toAPI(frame), m_client.clientInfo);
}
-void InjectedBundlePageLoaderClient::didNewFirstVisuallyNonEmptyLayout(WebPage* page, RefPtr<APIObject>& userData)
-{
- if (!m_client.didNewFirstVisuallyNonEmptyLayout)
- return;
-
- WKTypeRef userDataToPass = 0;
- m_client.didNewFirstVisuallyNonEmptyLayout(toAPI(page), &userDataToPass, m_client.clientInfo);
- userData = adoptRef(toImpl(userDataToPass));
-}
-
void InjectedBundlePageLoaderClient::didLayout(WebPage* page, LayoutMilestones milestones, RefPtr<APIObject>& userData)
{
if (!m_client.didLayout)
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h (153955 => 153956)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h 2013-08-12 19:47:09 UTC (rev 153955)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h 2013-08-12 20:54:20 UTC (rev 153956)
@@ -75,7 +75,6 @@
void didFirstLayoutForFrame(WebPage*, WebFrame*, RefPtr<APIObject>& userData);
void didFirstVisuallyNonEmptyLayoutForFrame(WebPage*, WebFrame*, RefPtr<APIObject>& userData);
void didLayoutForFrame(WebPage*, WebFrame*);
- void didNewFirstVisuallyNonEmptyLayout(WebPage*, WTF::RefPtr<APIObject>& userData);
void didLayout(WebPage*, WebCore::LayoutMilestones, RefPtr<APIObject>& userData);
void didClearWindowObjectForFrame(WebPage*, WebFrame*, WebCore::DOMWrapperWorld*);
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (153955 => 153956)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2013-08-12 19:47:09 UTC (rev 153955)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2013-08-12 20:54:20 UTC (rev 153956)
@@ -567,12 +567,6 @@
webPage->injectedBundleLoaderClient().didFirstVisuallyNonEmptyLayoutForFrame(webPage, m_frame, userData);
webPage->send(Messages::WebPageProxy::DidFirstVisuallyNonEmptyLayoutForFrame(m_frame->frameID(), InjectedBundleUserMessageEncoder(userData.get())));
}
-
- if (milestones & DidHitRelevantRepaintedObjectsAreaThreshold) {
- // FIXME: This can go away when we remove didNewFirstVisuallyNonEmptyLayout.
- webPage->injectedBundleLoaderClient().didNewFirstVisuallyNonEmptyLayout(webPage, userData);
- webPage->send(Messages::WebPageProxy::DidNewFirstVisuallyNonEmptyLayout(InjectedBundleUserMessageEncoder(userData.get())));
- }
}
void WebFrameLoaderClient::dispatchDidLayout()
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (153955 => 153956)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-08-12 19:47:09 UTC (rev 153955)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2013-08-12 20:54:20 UTC (rev 153956)
@@ -494,8 +494,6 @@
milestones |= WebCore::DidFirstLayout;
if (client->didFirstVisuallyNonEmptyLayoutForFrame)
milestones |= WebCore::DidFirstVisuallyNonEmptyLayout;
- if (client->didNewFirstVisuallyNonEmptyLayout)
- milestones |= WebCore::DidHitRelevantRepaintedObjectsAreaThreshold;
}
if (milestones)
Modified: trunk/Tools/ChangeLog (153955 => 153956)
--- trunk/Tools/ChangeLog 2013-08-12 19:47:09 UTC (rev 153955)
+++ trunk/Tools/ChangeLog 2013-08-12 20:54:20 UTC (rev 153956)
@@ -1,3 +1,17 @@
+2013-08-12 Beth Dakin <[email protected]>
+
+ Remove didNewFirstVisuallyNonEmptyLayout from WebKit2
+ https://bugs.webkit.org/show_bug.cgi?id=119658
+
+ Reviewed by Darin Adler.
+
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController awakeFromNib]):
+ * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
+ (WTR::InjectedBundlePage::InjectedBundlePage):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::createWebViewWithOptions):
+
2013-08-12 Seokju Kwon <[email protected]>
Remove glu's libtest rule from checker.py
Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (153955 => 153956)
--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2013-08-12 19:47:09 UTC (rev 153955)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2013-08-12 20:54:20 UTC (rev 153956)
@@ -653,7 +653,7 @@
0, // shouldGoToBackForwardItem
0, // didFailToInitializePlugin
didDetectXSSForFrame,
- 0, // didNewFirstVisuallyNonEmptyLayout
+ 0, // didNewFirstVisuallyNonEmptyLayout_unavailable
0, // willGoToBackForwardListItem
0, // interactionOccurredWhileProcessUnresponsive
0, // pluginDidFail_deprecatedForUseWithV1
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp (153955 => 153956)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2013-08-12 19:47:09 UTC (rev 153955)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp 2013-08-12 20:54:20 UTC (rev 153956)
@@ -294,7 +294,7 @@
willPerformClientRedirectForFrame,
didHandleOnloadEventsForFrame,
0, // didLayoutForFrame
- 0, // didNewFirstVisuallyNonEmptyLayoutForFrame
+ 0, // didNewFirstVisuallyNonEmptyLayout_unavailable
didDetectXSSForFrame,
0, // shouldGoToBackForwardListItem
0, // didCreateGlobalObjectForFrame
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (153955 => 153956)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2013-08-12 19:47:09 UTC (rev 153955)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2013-08-12 20:54:20 UTC (rev 153956)
@@ -480,7 +480,7 @@
0, // shouldGoToBackForwardListItem
0, // didRunInsecureContentForFrame
0, // didDetectXSSForFrame
- 0, // didNewFirstVisuallyNonEmptyLayout
+ 0, // didNewFirstVisuallyNonEmptyLayout_unavailable
0, // willGoToBackForwardListItem
0, // interactionOccurredWhileProcessUnresponsive
0, // pluginDidFail_deprecatedForUseWithV1