Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (211743 => 211744)
--- trunk/Source/WebKit2/CMakeLists.txt 2017-02-06 20:06:52 UTC (rev 211743)
+++ trunk/Source/WebKit2/CMakeLists.txt 2017-02-06 20:18:36 UTC (rev 211744)
@@ -473,7 +473,6 @@
WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp
WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp
- WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp
WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp
WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp
WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.cpp
Modified: trunk/Source/WebKit2/ChangeLog (211743 => 211744)
--- trunk/Source/WebKit2/ChangeLog 2017-02-06 20:06:52 UTC (rev 211743)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-06 20:18:36 UTC (rev 211744)
@@ -1,3 +1,32 @@
+2017-02-06 Chris Dumez <cdu...@apple.com>
+
+ [WK2] Drop legacy WKBundlePageDiagnosticLoggingClient API
+ https://bugs.webkit.org/show_bug.cgi?id=167883
+ <rdar://problem/30376695>
+
+ Reviewed by Sam Weinig.
+
+ Drop legacy WKBundlePageDiagnosticLoggingClient API as I am not aware of any remaining client.
+ All clients have now switched to the equivalent UIProcess-side API.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.cpp:
+ (WKBundlePageSetDiagnosticLoggingClient): Deleted.
+ * WebProcess/InjectedBundle/API/c/WKBundlePage.h:
+ * WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h: Removed.
+ * WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp: Removed.
+ * WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h: Removed.
+ * WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp:
+ (WebKit::WebDiagnosticLoggingClient::logDiagnosticMessage):
+ (WebKit::WebDiagnosticLoggingClient::logDiagnosticMessageWithResult):
+ (WebKit::WebDiagnosticLoggingClient::logDiagnosticMessageWithValue):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::close):
+ (WebKit::WebPage::initializeInjectedBundleDiagnosticLoggingClient): Deleted.
+ * WebProcess/WebPage/WebPage.h:
+ (WebKit::WebPage::injectedBundleUIClient):
+ (WebKit::WebPage::injectedBundleDiagnosticLoggingClient): Deleted.
+
2017-02-06 Anders Carlsson <ander...@apple.com>
Null check the WebKit::RemoteObjectProxy object before calling it
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (211743 => 211744)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2017-02-06 20:06:52 UTC (rev 211743)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2017-02-06 20:18:36 UTC (rev 211744)
@@ -409,7 +409,6 @@
1AB474E2184D44800051B622 /* WKBundlePageFormClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB474E1184D44800051B622 /* WKBundlePageFormClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
1AB474E4184D44980051B622 /* WKBundlePageContextMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB474E3184D44980051B622 /* WKBundlePageContextMenuClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
1AB474E6184D44B40051B622 /* WKBundlePageFullScreenClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB474E5184D44B40051B622 /* WKBundlePageFullScreenClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 1AB474E8184D44D00051B622 /* WKBundlePageDiagnosticLoggingClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB474E7184D44D00051B622 /* WKBundlePageDiagnosticLoggingClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
1AB474EA184D45130051B622 /* WKBundlePagePolicyClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB474E9184D45130051B622 /* WKBundlePagePolicyClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
1AB7D4CA1288AAA700CFD08C /* DownloadProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB7D4C81288AAA700CFD08C /* DownloadProxy.h */; };
1AB7D4CB1288AAA700CFD08C /* DownloadProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB7D4C91288AAA700CFD08C /* DownloadProxy.cpp */; };
@@ -1839,7 +1838,6 @@
CD19A26E1A13E834008D650E /* WebDiagnosticLoggingClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CD19A26A1A13E821008D650E /* WebDiagnosticLoggingClient.h */; };
CD5C66A0134B9D38004FE2A8 /* InjectedBundlePageFullScreenClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD5C669E134B9D36004FE2A8 /* InjectedBundlePageFullScreenClient.cpp */; };
CD5C66A1134B9D38004FE2A8 /* InjectedBundlePageFullScreenClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CD5C669F134B9D37004FE2A8 /* InjectedBundlePageFullScreenClient.h */; };
- CD67D30E15C08F9A00843ADF /* InjectedBundlePageDiagnosticLoggingClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD67D30815C07BE000843ADF /* InjectedBundlePageDiagnosticLoggingClient.cpp */; };
CD6F75F4131B66D000D6B21E /* WebFullScreenManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD73BA3E131A2E8A00EEDED2 /* WebFullScreenManagerProxy.cpp */; };
CD73BA47131ACC9A00EEDED2 /* WebFullScreenManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD73BA45131ACC8800EEDED2 /* WebFullScreenManagerProxyMessageReceiver.cpp */; };
CD73BA4E131ACDB700EEDED2 /* WebFullScreenManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD73BA48131ACD8E00EEDED2 /* WebFullScreenManagerMessageReceiver.cpp */; };
@@ -2521,7 +2519,6 @@
1AB474E1184D44800051B622 /* WKBundlePageFormClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundlePageFormClient.h; sourceTree = "<group>"; };
1AB474E3184D44980051B622 /* WKBundlePageContextMenuClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundlePageContextMenuClient.h; sourceTree = "<group>"; };
1AB474E5184D44B40051B622 /* WKBundlePageFullScreenClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundlePageFullScreenClient.h; sourceTree = "<group>"; };
- 1AB474E7184D44D00051B622 /* WKBundlePageDiagnosticLoggingClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundlePageDiagnosticLoggingClient.h; sourceTree = "<group>"; };
1AB474E9184D45130051B622 /* WKBundlePagePolicyClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundlePagePolicyClient.h; sourceTree = "<group>"; };
1AB7D4C81288AAA700CFD08C /* DownloadProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DownloadProxy.h; sourceTree = "<group>"; };
1AB7D4C91288AAA700CFD08C /* DownloadProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DownloadProxy.cpp; sourceTree = "<group>"; };
@@ -4069,8 +4066,6 @@
CD19A26A1A13E821008D650E /* WebDiagnosticLoggingClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDiagnosticLoggingClient.h; sourceTree = "<group>"; };
CD5C669E134B9D36004FE2A8 /* InjectedBundlePageFullScreenClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageFullScreenClient.cpp; sourceTree = "<group>"; };
CD5C669F134B9D37004FE2A8 /* InjectedBundlePageFullScreenClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageFullScreenClient.h; sourceTree = "<group>"; };
- CD67D30815C07BE000843ADF /* InjectedBundlePageDiagnosticLoggingClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageDiagnosticLoggingClient.cpp; sourceTree = "<group>"; };
- CD67D30915C07BE000843ADF /* InjectedBundlePageDiagnosticLoggingClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageDiagnosticLoggingClient.h; sourceTree = "<group>"; };
CD73BA37131A29FE00EEDED2 /* WebFullScreenManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebFullScreenManager.cpp; path = FullScreen/WebFullScreenManager.cpp; sourceTree = "<group>"; };
CD73BA38131A29FE00EEDED2 /* WebFullScreenManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebFullScreenManager.h; path = FullScreen/WebFullScreenManager.h; sourceTree = "<group>"; };
CD73BA39131A29FE00EEDED2 /* WebFullScreenManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebFullScreenManager.messages.in; path = FullScreen/WebFullScreenManager.messages.in; sourceTree = "<group>"; };
@@ -6889,8 +6884,6 @@
BC8147D312F66D31007B2C32 /* InjectedBundleNavigationAction.h */,
512935E11288D97800A4B695 /* InjectedBundlePageContextMenuClient.cpp */,
512935E21288D97800A4B695 /* InjectedBundlePageContextMenuClient.h */,
- CD67D30815C07BE000843ADF /* InjectedBundlePageDiagnosticLoggingClient.cpp */,
- CD67D30915C07BE000843ADF /* InjectedBundlePageDiagnosticLoggingClient.h */,
E1EE53E611F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp */,
E1EE53DC11F8CF9F00CCBEE4 /* InjectedBundlePageEditorClient.h */,
BC14E107120B905E00826C0C /* InjectedBundlePageFormClient.cpp */,
@@ -6965,7 +6958,6 @@
7CF47FF417275B71008ACB91 /* WKBundlePageBanner.cpp */,
7CF47FF517275B71008ACB91 /* WKBundlePageBanner.h */,
1AB474E3184D44980051B622 /* WKBundlePageContextMenuClient.h */,
- 1AB474E7184D44D00051B622 /* WKBundlePageDiagnosticLoggingClient.h */,
1AB474DF184D446A0051B622 /* WKBundlePageEditorClient.h */,
1AB474E1184D44800051B622 /* WKBundlePageFormClient.h */,
1AB474E5184D44B40051B622 /* WKBundlePageFullScreenClient.h */,
@@ -8489,7 +8481,6 @@
7CF47FF717275B71008ACB91 /* WKBundlePageBanner.h in Headers */,
7CF47FFF17276AE3008ACB91 /* WKBundlePageBannerMac.h in Headers */,
1AB474E4184D44980051B622 /* WKBundlePageContextMenuClient.h in Headers */,
- 1AB474E8184D44D00051B622 /* WKBundlePageDiagnosticLoggingClient.h in Headers */,
1AB474E0184D446A0051B622 /* WKBundlePageEditorClient.h in Headers */,
1AB474E2184D44800051B622 /* WKBundlePageFormClient.h in Headers */,
1AB474E6184D44B40051B622 /* WKBundlePageFullScreenClient.h in Headers */,
@@ -9529,7 +9520,6 @@
BC8147D612F66D31007B2C32 /* InjectedBundleNavigationAction.cpp in Sources */,
BC4BEEAC120A0A5F00FBA0C7 /* InjectedBundleNodeHandle.cpp in Sources */,
512935E31288D97800A4B695 /* InjectedBundlePageContextMenuClient.cpp in Sources */,
- CD67D30E15C08F9A00843ADF /* InjectedBundlePageDiagnosticLoggingClient.cpp in Sources */,
E1EE53E711F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp in Sources */,
BC14E109120B905E00826C0C /* InjectedBundlePageFormClient.cpp in Sources */,
CD5C66A0134B9D38004FE2A8 /* InjectedBundlePageFullScreenClient.cpp in Sources */,
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (211743 => 211744)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2017-02-06 20:06:52 UTC (rev 211743)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2017-02-06 20:18:36 UTC (rev 211744)
@@ -158,11 +158,6 @@
#endif
}
-void WKBundlePageSetDiagnosticLoggingClient(WKBundlePageRef pageRef, WKBundlePageDiagnosticLoggingClientBase* client)
-{
- toImpl(pageRef)->initializeInjectedBundleDiagnosticLoggingClient(client);
-}
-
WKBundlePageGroupRef WKBundlePageGetPageGroup(WKBundlePageRef pageRef)
{
return toAPI(toImpl(pageRef)->pageGroup());
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h (211743 => 211744)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2017-02-06 20:06:52 UTC (rev 211743)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2017-02-06 20:18:36 UTC (rev 211744)
@@ -29,7 +29,6 @@
#include <_javascript_Core/_javascript_.h>
#include <WebKit/WKBase.h>
#include <WebKit/WKBundlePageContextMenuClient.h>
-#include <WebKit/WKBundlePageDiagnosticLoggingClient.h>
#include <WebKit/WKBundlePageEditorClient.h>
#include <WebKit/WKBundlePageFormClient.h>
#include <WebKit/WKBundlePageFullScreenClient.h>
@@ -65,7 +64,6 @@
WK_EXPORT void WKBundlePageSetPolicyClient(WKBundlePageRef page, WKBundlePagePolicyClientBase* client);
WK_EXPORT void WKBundlePageSetUIClient(WKBundlePageRef page, WKBundlePageUIClientBase* client);
WK_EXPORT void WKBundlePageSetFullScreenClient(WKBundlePageRef page, WKBundlePageFullScreenClientBase* client);
-WK_EXPORT void WKBundlePageSetDiagnosticLoggingClient(WKBundlePageRef page, WKBundlePageDiagnosticLoggingClientBase* client);
WK_EXPORT WKBundlePageGroupRef WKBundlePageGetPageGroup(WKBundlePageRef page);
WK_EXPORT WKBundleFrameRef WKBundlePageGetMainFrame(WKBundlePageRef page);
Deleted: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h (211743 => 211744)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h 2017-02-06 20:06:52 UTC (rev 211743)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h 2017-02-06 20:18:36 UTC (rev 211744)
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2013 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef WKBundlePageDiagnosticLoggingClient_h
-#define WKBundlePageDiagnosticLoggingClient_h
-
-#include <WebKit/WKBase.h>
-#include <WebKit/WKDiagnosticLoggingResultType.h>
-
-typedef void (*WKBundlePageDiagnosticLoggingCallback)(WKBundlePageRef page, WKStringRef message, WKStringRef description, WKStringRef success, const void* clientInfo);
-typedef void (*WKBundlePageLogDiagnosticMessageCallback)(WKBundlePageRef page, WKStringRef message, WKStringRef description, const void* clientInfo);
-typedef void (*WKBundlePageLogDiagnosticMessageWithResultCallback)(WKBundlePageRef page, WKStringRef message, WKStringRef description, WKDiagnosticLoggingResultType result, const void* clientInfo);
-typedef void (*WKBundlePageLogDiagnosticMessageWithValueCallback)(WKBundlePageRef page, WKStringRef message, WKStringRef description, WKStringRef value, const void* clientInfo);
-
-typedef struct WKBundlePageDiagnosticLoggingClientBase {
- int version;
- const void * clientInfo;
-} WKBundlePageDiagnosticLoggingClientBase;
-
-typedef struct WKBundlePageDiagnosticLoggingClientV0 {
- WKBundlePageDiagnosticLoggingClientBase base;
-
- // Version 0.
- WKBundlePageDiagnosticLoggingCallback logDiagnosticMessage;
-} WKBundlePageDiagnosticLoggingClientV0;
-
-typedef struct WKBundlePageDiagnosticLoggingClientV1 {
- WKBundlePageDiagnosticLoggingClientBase base;
-
- // Version 0.
- WKBundlePageDiagnosticLoggingCallback logDiagnosticMessageDeprecated;
-
- // Version 1.
- WKBundlePageLogDiagnosticMessageCallback logDiagnosticMessage;
- WKBundlePageLogDiagnosticMessageWithResultCallback logDiagnosticMessageWithResult;
- WKBundlePageLogDiagnosticMessageWithValueCallback logDiagnosticMessageWithValue;
-} WKBundlePageDiagnosticLoggingClientV1;
-
-#endif // WKBundlePageDiagnosticLoggingClient_h
Deleted: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp (211743 => 211744)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp 2017-02-06 20:06:52 UTC (rev 211743)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp 2017-02-06 20:18:36 UTC (rev 211744)
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "InjectedBundlePageDiagnosticLoggingClient.h"
-
-#include "WKAPICast.h"
-#include "WKBundleAPICast.h"
-#include "WebPage.h"
-
-namespace WebKit {
-
-void InjectedBundlePageDiagnosticLoggingClient::logDiagnosticMessageDeprecated(WebPage* page, const String& message, const String& description, const String& success)
-{
- if (!m_client.logDiagnosticMessageDeprecated)
- return;
- m_client.logDiagnosticMessageDeprecated(toAPI(page), toAPI(message.impl()), toAPI(description.impl()), toAPI(success.impl()), m_client.base.clientInfo);
-}
-
-void InjectedBundlePageDiagnosticLoggingClient::logDiagnosticMessage(WebPage* page, const String& message, const String& description)
-{
- if (!m_client.logDiagnosticMessage)
- return;
- m_client.logDiagnosticMessage(toAPI(page), toAPI(message.impl()), toAPI(description.impl()), m_client.base.clientInfo);
-}
-
-void InjectedBundlePageDiagnosticLoggingClient::logDiagnosticMessageWithResult(WebPage* page, const String& message, const String& description, WebCore::DiagnosticLoggingResultType result)
-{
- if (!m_client.logDiagnosticMessageWithResult)
- return;
- m_client.logDiagnosticMessageWithResult(toAPI(page), toAPI(message.impl()), toAPI(description.impl()), toAPI(result), m_client.base.clientInfo);
-}
-
-void InjectedBundlePageDiagnosticLoggingClient::logDiagnosticMessageWithValue(WebPage* page, const String& message, const String& description, const String& value)
-{
- if (!m_client.logDiagnosticMessageWithValue)
- return;
- m_client.logDiagnosticMessageWithValue(toAPI(page), toAPI(message.impl()), toAPI(description.impl()), toAPI(value.impl()), m_client.base.clientInfo);
-}
-
-}
Deleted: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h (211743 => 211744)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h 2017-02-06 20:06:52 UTC (rev 211743)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h 2017-02-06 20:18:36 UTC (rev 211744)
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2012 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef InjectedBundlePageDiagnosticLoggingClient_h
-#define InjectedBundlePageDiagnosticLoggingClient_h
-
-#include "APIClient.h"
-#include "WKBundlePage.h"
-#include <_javascript_Core/JSBase.h>
-#include <WebCore/DiagnosticLoggingResultType.h>
-#include <wtf/Forward.h>
-
-namespace API {
-template<> struct ClientTraits<WKBundlePageDiagnosticLoggingClientBase> {
- typedef std::tuple<WKBundlePageDiagnosticLoggingClientV0, WKBundlePageDiagnosticLoggingClientV1> Versions;
-};
-}
-
-namespace WebKit {
-
-class InjectedBundleHitTestResult;
-class WebContextMenuItemData;
-class WebPage;
-
-class InjectedBundlePageDiagnosticLoggingClient : public API::Client<WKBundlePageDiagnosticLoggingClientBase> {
-public:
- void logDiagnosticMessageDeprecated(WebPage*, const String& message, const String& description, const String& success);
- void logDiagnosticMessage(WebPage*, const String& message, const String& description);
- void logDiagnosticMessageWithResult(WebPage*, const String& message, const String& description, WebCore::DiagnosticLoggingResultType);
- void logDiagnosticMessageWithValue(WebPage*, const String& message, const String& description, const String& value);
-};
-
-} // namespace WebKit
-
-#endif // InjectedBundlePageDiagnosticLoggingClient_h
Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp (211743 => 211744)
--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp 2017-02-06 20:06:52 UTC (rev 211743)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp 2017-02-06 20:18:36 UTC (rev 211744)
@@ -50,8 +50,6 @@
if (!shouldLogAfterSampling(shouldSample))
return;
- // FIXME: Remove this injected bundle API.
- m_page.injectedBundleDiagnosticLoggingClient().logDiagnosticMessage(&m_page, message, description);
m_page.send(Messages::WebPageProxy::LogDiagnosticMessage(message, description, ShouldSample::No));
}
@@ -62,8 +60,6 @@
if (!shouldLogAfterSampling(shouldSample))
return;
- // FIXME: Remove this injected bundle API.
- m_page.injectedBundleDiagnosticLoggingClient().logDiagnosticMessageWithResult(&m_page, message, description, result);
m_page.send(Messages::WebPageProxy::LogDiagnosticMessageWithResult(message, description, result, ShouldSample::No));
}
@@ -74,8 +70,6 @@
if (!shouldLogAfterSampling(shouldSample))
return;
- // FIXME: Remove this injected bundle API.
- m_page.injectedBundleDiagnosticLoggingClient().logDiagnosticMessageWithValue(&m_page, message, description, String::number(value, significantFigures));
m_page.send(Messages::WebPageProxy::LogDiagnosticMessageWithValue(message, description, value, significantFigures, ShouldSample::No));
}
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (211743 => 211744)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-02-06 20:06:52 UTC (rev 211743)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-02-06 20:18:36 UTC (rev 211744)
@@ -728,11 +728,6 @@
}
#endif
-void WebPage::initializeInjectedBundleDiagnosticLoggingClient(WKBundlePageDiagnosticLoggingClientBase* client)
-{
- m_logDiagnosticMessageClient.initialize(client);
-}
-
#if ENABLE(NETSCAPE_PLUGIN_API)
RefPtr<Plugin> WebPage::createPlugin(WebFrame* frame, HTMLPlugInElement* pluginElement, const Plugin::Parameters& parameters, String& newMIMEType)
@@ -1119,7 +1114,6 @@
#if ENABLE(FULLSCREEN_API)
m_fullScreenClient.initialize(0);
#endif
- m_logDiagnosticMessageClient.initialize(0);
m_printContext = nullptr;
m_mainFrame->coreFrame()->loader().detachFromParent();
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (211743 => 211744)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2017-02-06 20:06:52 UTC (rev 211743)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2017-02-06 20:18:36 UTC (rev 211744)
@@ -35,7 +35,6 @@
#include "FindController.h"
#include "GeolocationPermissionRequestManager.h"
#include "ImageOptions.h"
-#include "InjectedBundlePageDiagnosticLoggingClient.h"
#include "InjectedBundlePageFullScreenClient.h"
#include "InjectedBundlePageLoaderClient.h"
#include "InjectedBundlePagePolicyClient.h"
@@ -334,7 +333,6 @@
#if ENABLE(FULLSCREEN_API)
void initializeInjectedBundleFullScreenClient(WKBundlePageFullScreenClientBase*);
#endif
- void initializeInjectedBundleDiagnosticLoggingClient(WKBundlePageDiagnosticLoggingClientBase*);
#if ENABLE(CONTEXT_MENUS)
API::InjectedBundle::PageContextMenuClient& injectedBundleContextMenuClient() { return *m_contextMenuClient.get(); }
@@ -345,7 +343,6 @@
InjectedBundlePagePolicyClient& injectedBundlePolicyClient() { return m_policyClient; }
InjectedBundlePageResourceLoadClient& injectedBundleResourceLoadClient() { return m_resourceLoadClient; }
API::InjectedBundle::PageUIClient& injectedBundleUIClient() { return *m_uiClient.get(); }
- InjectedBundlePageDiagnosticLoggingClient& injectedBundleDiagnosticLoggingClient() { return m_logDiagnosticMessageClient; }
#if ENABLE(FULLSCREEN_API)
InjectedBundlePageFullScreenClient& injectedBundleFullScreenClient() { return m_fullScreenClient; }
#endif
@@ -1370,7 +1367,6 @@
#if ENABLE(FULLSCREEN_API)
InjectedBundlePageFullScreenClient m_fullScreenClient;
#endif
- InjectedBundlePageDiagnosticLoggingClient m_logDiagnosticMessageClient;
FindController m_findController;
