<!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>[180804] trunk/Source/WebKit2</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/180804">180804</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-02-27 17:43:24 -0800 (Fri, 27 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Drop legacy WKBundlePageDiagnosticLoggingClient API
https://bugs.webkit.org/show_bug.cgi?id=141176
Reviewed by Sam Weinig.
Drop legacy WKBundlePageDiagnosticLoggingClient WK2 API as we are now
exposing this functionality via WKPageDiagnosticLoggingClient.h on
UIProcess side. The client-side has already been ported over.
* CMakeLists.txt:
* Shared/API/c/WKSharedAPICast.h:
(WebKit::toAPI): Deleted.
(WebKit::toDiagnosticLoggingResultType): Deleted.
* UIProcess/API/C/WKAPICast.h:
(WebKit::toAPI):
* UIProcess/API/C/WKDiagnosticLoggingResultType.h: Renamed from Source/WebKit2/Shared/API/c/WKDiagnosticLoggingResultType.h.
* 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::WebPage):
(WebKit::WebPage::close):
(WebKit::WebPage::initializeInjectedBundleDiagnosticLoggingClient): Deleted.
* WebProcess/WebPage/WebPage.h:
(WebKit::WebPage::injectedBundleDiagnosticLoggingClient): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKSharedAPICasth">trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKAPICasth">trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagecpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebDiagnosticLoggingClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp</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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKDiagnosticLoggingResultTypeh">trunk/Source/WebKit2/UIProcess/API/C/WKDiagnosticLoggingResultType.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedAPIcWKDiagnosticLoggingResultTypeh">trunk/Source/WebKit2/Shared/API/c/WKDiagnosticLoggingResultType.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageDiagnosticLoggingClienth">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageDiagnosticLoggingClientcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageDiagnosticLoggingClienth">trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2CMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/CMakeLists.txt (180803 => 180804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/CMakeLists.txt 2015-02-28 01:33:20 UTC (rev 180803)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-02-28 01:43:24 UTC (rev 180804)
</span><span class="lines">@@ -510,7 +510,6 @@
</span><span class="cx"> WebProcess/InjectedBundle/InjectedBundleHitTestResult.cpp
</span><span class="cx"> WebProcess/InjectedBundle/InjectedBundleNavigationAction.cpp
</span><span class="cx"> WebProcess/InjectedBundle/InjectedBundlePageContextMenuClient.cpp
</span><del>- WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp
</del><span class="cx"> WebProcess/InjectedBundle/InjectedBundlePageEditorClient.cpp
</span><span class="cx"> WebProcess/InjectedBundle/InjectedBundlePageFormClient.cpp
</span><span class="cx"> WebProcess/InjectedBundle/InjectedBundlePageFullScreenClient.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (180803 => 180804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-02-28 01:33:20 UTC (rev 180803)
+++ trunk/Source/WebKit2/ChangeLog 2015-02-28 01:43:24 UTC (rev 180804)
</span><span class="lines">@@ -1,3 +1,39 @@
</span><ins>+2015-02-27 Chris Dumez <cdumez@apple.com>
+
+ [WK2] Drop legacy WKBundlePageDiagnosticLoggingClient API
+ https://bugs.webkit.org/show_bug.cgi?id=141176
+
+ Reviewed by Sam Weinig.
+
+ Drop legacy WKBundlePageDiagnosticLoggingClient WK2 API as we are now
+ exposing this functionality via WKPageDiagnosticLoggingClient.h on
+ UIProcess side. The client-side has already been ported over.
+
+ * CMakeLists.txt:
+ * Shared/API/c/WKSharedAPICast.h:
+ (WebKit::toAPI): Deleted.
+ (WebKit::toDiagnosticLoggingResultType): Deleted.
+ * UIProcess/API/C/WKAPICast.h:
+ (WebKit::toAPI):
+ * UIProcess/API/C/WKDiagnosticLoggingResultType.h: Renamed from Source/WebKit2/Shared/API/c/WKDiagnosticLoggingResultType.h.
+ * 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::WebPage):
+ (WebKit::WebPage::close):
+ (WebKit::WebPage::initializeInjectedBundleDiagnosticLoggingClient): Deleted.
+ * WebProcess/WebPage/WebPage.h:
+ (WebKit::WebPage::injectedBundleDiagnosticLoggingClient): Deleted.
+
</ins><span class="cx"> 2015-02-27 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename WebResourceCacheManagerCFNet.cpp to WebResourceCacheManagerCFNet.mm
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKDiagnosticLoggingResultTypeh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/API/c/WKDiagnosticLoggingResultType.h (180803 => 180804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKDiagnosticLoggingResultType.h 2015-02-28 01:33:20 UTC (rev 180803)
+++ trunk/Source/WebKit2/Shared/API/c/WKDiagnosticLoggingResultType.h 2015-02-28 01:43:24 UTC (rev 180804)
</span><span class="lines">@@ -1,45 +0,0 @@
</span><del>-/*
- * Copyright (C) 2013, 2015 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 WKDiagnosticLoggingResultType_h
-#define WKDiagnosticLoggingResultType_h
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum {
- kWKDiagnosticLoggingResultPass = 0,
- kWKDiagnosticLoggingResultFail = 1,
- kWKDiagnosticLoggingResultNoop = 2,
-};
-typedef uint32_t WKDiagnosticLoggingResultType;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* WKDiagnosticLoggingResultType_h */
-
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKSharedAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h (180803 => 180804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2015-02-28 01:33:20 UTC (rev 180803)
+++ trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h 2015-02-28 01:43:24 UTC (rev 180804)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx"> #include "SameDocumentNavigationType.h"
</span><span class="cx"> #include "WKBase.h"
</span><span class="cx"> #include "WKContextMenuItemTypes.h"
</span><del>-#include "WKDiagnosticLoggingResultType.h"
</del><span class="cx"> #include "WKEvent.h"
</span><span class="cx"> #include "WKFindOptions.h"
</span><span class="cx"> #include "WKGeometry.h"
</span><span class="lines">@@ -51,7 +50,6 @@
</span><span class="cx"> #include "WebEvent.h"
</span><span class="cx"> #include "WebFindOptions.h"
</span><span class="cx"> #include <WebCore/ContextMenuItem.h>
</span><del>-#include <WebCore/DiagnosticLoggingResultType.h>
</del><span class="cx"> #include <WebCore/FloatRect.h>
</span><span class="cx"> #include <WebCore/FrameLoaderTypes.h>
</span><span class="cx"> #include <WebCore/IntRect.h>
</span><span class="lines">@@ -815,44 +813,6 @@
</span><span class="cx"> return type;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline WKDiagnosticLoggingResultType toAPI(WebCore::DiagnosticLoggingResultType type)
-{
- WKDiagnosticLoggingResultType wkType;
-
- switch (type) {
- case WebCore::DiagnosticLoggingResultPass:
- wkType = kWKDiagnosticLoggingResultPass;
- break;
- case WebCore::DiagnosticLoggingResultFail:
- wkType = kWKDiagnosticLoggingResultFail;
- break;
- case WebCore::DiagnosticLoggingResultNoop:
- wkType = kWKDiagnosticLoggingResultNoop;
- break;
- }
-
- return wkType;
-}
-
-inline WebCore::DiagnosticLoggingResultType toDiagnosticLoggingResultType(WKDiagnosticLoggingResultType wkType)
-{
- WebCore::DiagnosticLoggingResultType type;
-
- switch (wkType) {
- case kWKDiagnosticLoggingResultPass:
- type = WebCore::DiagnosticLoggingResultPass;
- break;
- case kWKDiagnosticLoggingResultFail:
- type = WebCore::DiagnosticLoggingResultFail;
- break;
- case kWKDiagnosticLoggingResultNoop:
- type = WebCore::DiagnosticLoggingResultNoop;
- break;
- }
-
- return type;
-}
-
</del><span class="cx"> inline WKLayoutMilestones toWKLayoutMilestones(WebCore::LayoutMilestones milestones)
</span><span class="cx"> {
</span><span class="cx"> unsigned wkMilestones = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKAPICasth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h (180803 => 180804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2015-02-28 01:33:20 UTC (rev 180803)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h 2015-02-28 01:43:24 UTC (rev 180804)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #include "WKContext.h"
</span><span class="cx"> #include "WKCookieManager.h"
</span><span class="cx"> #include "WKCredentialTypes.h"
</span><ins>+#include "WKDiagnosticLoggingResultType.h"
</ins><span class="cx"> #include "WKPage.h"
</span><span class="cx"> #include "WKPreferencesRef.h"
</span><span class="cx"> #include "WKPreferencesRefPrivate.h"
</span><span class="lines">@@ -46,6 +47,7 @@
</span><span class="cx"> #include "WKSharedAPICast.h"
</span><span class="cx"> #include "WebGrammarDetail.h"
</span><span class="cx"> #include <WebCore/Credential.h>
</span><ins>+#include <WebCore/DiagnosticLoggingResultType.h>
</ins><span class="cx"> #include <WebCore/FrameLoaderTypes.h>
</span><span class="cx"> #include <WebCore/ProtectionSpace.h>
</span><span class="cx"> #include <WebCore/Settings.h>
</span><span class="lines">@@ -525,6 +527,25 @@
</span><span class="cx"> return kWKWebGLLoadPolicyLoadNormally;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline WKDiagnosticLoggingResultType toAPI(WebCore::DiagnosticLoggingResultType type)
+{
+ WKDiagnosticLoggingResultType wkType;
+
+ switch (type) {
+ case WebCore::DiagnosticLoggingResultPass:
+ wkType = kWKDiagnosticLoggingResultPass;
+ break;
+ case WebCore::DiagnosticLoggingResultFail:
+ wkType = kWKDiagnosticLoggingResultFail;
+ break;
+ case WebCore::DiagnosticLoggingResultNoop:
+ wkType = kWKDiagnosticLoggingResultNoop;
+ break;
+ }
+
+ return wkType;
+}
+
</ins><span class="cx"> inline ProxyingRefPtr<WebGrammarDetail> toAPI(const WebCore::GrammarDetail& grammarDetail)
</span><span class="cx"> {
</span><span class="cx"> return ProxyingRefPtr<WebGrammarDetail>(WebGrammarDetail::create(grammarDetail));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKDiagnosticLoggingResultTypehfromrev180802trunkSourceWebKit2SharedAPIcWKDiagnosticLoggingResultTypeh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WebKit2/UIProcess/API/C/WKDiagnosticLoggingResultType.h (from rev 180802, trunk/Source/WebKit2/Shared/API/c/WKDiagnosticLoggingResultType.h) (0 => 180804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKDiagnosticLoggingResultType.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKDiagnosticLoggingResultType.h 2015-02-28 01:43:24 UTC (rev 180804)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+/*
+ * Copyright (C) 2013, 2015 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 WKDiagnosticLoggingResultType_h
+#define WKDiagnosticLoggingResultType_h
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum {
+ kWKDiagnosticLoggingResultPass = 0,
+ kWKDiagnosticLoggingResultFail = 1,
+ kWKDiagnosticLoggingResultNoop = 2,
+};
+typedef uint32_t WKDiagnosticLoggingResultType;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* WKDiagnosticLoggingResultType_h */
+
</ins></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (180803 => 180804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-02-28 01:33:20 UTC (rev 180803)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-02-28 01:43:24 UTC (rev 180804)
</span><span class="lines">@@ -394,7 +394,6 @@
</span><span class="cx"> 1AB474E2184D44800051B622 /* WKBundlePageFormClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB474E1184D44800051B622 /* WKBundlePageFormClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1AB474E4184D44980051B622 /* WKBundlePageContextMenuClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB474E3184D44980051B622 /* WKBundlePageContextMenuClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1AB474E6184D44B40051B622 /* WKBundlePageFullScreenClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB474E5184D44B40051B622 /* WKBundlePageFullScreenClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- 1AB474E8184D44D00051B622 /* WKBundlePageDiagnosticLoggingClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB474E7184D44D00051B622 /* WKBundlePageDiagnosticLoggingClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 1AB474EA184D45130051B622 /* WKBundlePagePolicyClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB474E9184D45130051B622 /* WKBundlePagePolicyClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1AB7D4CA1288AAA700CFD08C /* DownloadProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB7D4C81288AAA700CFD08C /* DownloadProxy.h */; };
</span><span class="cx"> 1AB7D4CB1288AAA700CFD08C /* DownloadProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB7D4C91288AAA700CFD08C /* DownloadProxy.cpp */; };
</span><span class="lines">@@ -836,6 +835,7 @@
</span><span class="cx"> 3F889D14188778C900FEADAF /* WebVideoFullscreenManagerProxy.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3F889D12188778C900FEADAF /* WebVideoFullscreenManagerProxy.mm */; };
</span><span class="cx"> 3F889D15188778C900FEADAF /* WebVideoFullscreenManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 3F889D13188778C900FEADAF /* WebVideoFullscreenManagerProxy.h */; };
</span><span class="cx"> 3F889D171887859300FEADAF /* WebVideoFullscreenManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3F889D0D1887699C00FEADAF /* WebVideoFullscreenManager.mm */; };
</span><ins>+ 46C6D1C11A803684004ACF98 /* WKDiagnosticLoggingResultType.h in Headers */ = {isa = PBXBuildFile; fileRef = 46C6D1C01A803684004ACF98 /* WKDiagnosticLoggingResultType.h */; settings = {ATTRIBUTES = (Private, ); }; };
</ins><span class="cx"> 4A3CC18A19B063E700D14AEF /* UserMediaPermissionRequestManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A410F3919AF7B04002EBAB5 /* UserMediaPermissionRequestManagerProxy.cpp */; };
</span><span class="cx"> 4A3CC18B19B0640F00D14AEF /* UserMediaPermissionRequestManagerProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 4A410F3A19AF7B04002EBAB5 /* UserMediaPermissionRequestManagerProxy.h */; };
</span><span class="cx"> 4A3CC18C19B0641500D14AEF /* UserMediaPermissionRequestProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4A410F3B19AF7B04002EBAB5 /* UserMediaPermissionRequestProxy.cpp */; };
</span><span class="lines">@@ -1167,7 +1167,6 @@
</span><span class="cx"> 8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 8372DB241A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 8372DB281A67562800C697C5 /* WebPageDiagnosticLoggingClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8372DB261A67562800C697C5 /* WebPageDiagnosticLoggingClient.cpp */; };
</span><span class="cx"> 8372DB291A67562800C697C5 /* WebPageDiagnosticLoggingClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 8372DB271A67562800C697C5 /* WebPageDiagnosticLoggingClient.h */; };
</span><del>- 8372DB2F1A677D4A00C697C5 /* WKDiagnosticLoggingResultType.h in Headers */ = {isa = PBXBuildFile; fileRef = 8372DB2E1A677D4A00C697C5 /* WKDiagnosticLoggingResultType.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 83891B631A68B3420030F386 /* APIDiagnosticLoggingClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 83891B621A68B3420030F386 /* APIDiagnosticLoggingClient.h */; };
</span><span class="cx"> 83891B691A68BEBC0030F386 /* _WKDiagnosticLoggingDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 83891B681A68BEBC0030F386 /* _WKDiagnosticLoggingDelegate.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 83891B6C1A68C30B0030F386 /* DiagnosticLoggingClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 83891B6A1A68C30B0030F386 /* DiagnosticLoggingClient.h */; };
</span><span class="lines">@@ -1670,7 +1669,6 @@
</span><span class="cx"> CD19A26E1A13E834008D650E /* WebDiagnosticLoggingClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CD19A26A1A13E821008D650E /* WebDiagnosticLoggingClient.h */; };
</span><span class="cx"> CD5C66A0134B9D38004FE2A8 /* InjectedBundlePageFullScreenClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD5C669E134B9D36004FE2A8 /* InjectedBundlePageFullScreenClient.cpp */; };
</span><span class="cx"> CD5C66A1134B9D38004FE2A8 /* InjectedBundlePageFullScreenClient.h in Headers */ = {isa = PBXBuildFile; fileRef = CD5C669F134B9D37004FE2A8 /* InjectedBundlePageFullScreenClient.h */; };
</span><del>- CD67D30E15C08F9A00843ADF /* InjectedBundlePageDiagnosticLoggingClient.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD67D30815C07BE000843ADF /* InjectedBundlePageDiagnosticLoggingClient.cpp */; };
</del><span class="cx"> CD6F75F4131B66D000D6B21E /* WebFullScreenManagerProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD73BA3E131A2E8A00EEDED2 /* WebFullScreenManagerProxy.cpp */; };
</span><span class="cx"> CD73BA47131ACC9A00EEDED2 /* WebFullScreenManagerProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD73BA45131ACC8800EEDED2 /* WebFullScreenManagerProxyMessageReceiver.cpp */; };
</span><span class="cx"> CD73BA4E131ACDB700EEDED2 /* WebFullScreenManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CD73BA48131ACD8E00EEDED2 /* WebFullScreenManagerMessageReceiver.cpp */; };
</span><span class="lines">@@ -2502,7 +2500,6 @@
</span><span class="cx"> 1AB474E1184D44800051B622 /* WKBundlePageFormClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundlePageFormClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AB474E3184D44980051B622 /* WKBundlePageContextMenuClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundlePageContextMenuClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AB474E5184D44B40051B622 /* WKBundlePageFullScreenClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundlePageFullScreenClient.h; sourceTree = "<group>"; };
</span><del>- 1AB474E7184D44D00051B622 /* WKBundlePageDiagnosticLoggingClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundlePageDiagnosticLoggingClient.h; sourceTree = "<group>"; };
</del><span class="cx"> 1AB474E9184D45130051B622 /* WKBundlePagePolicyClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKBundlePagePolicyClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AB7D4C81288AAA700CFD08C /* DownloadProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DownloadProxy.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AB7D4C91288AAA700CFD08C /* DownloadProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DownloadProxy.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -2985,6 +2982,7 @@
</span><span class="cx"> 3F889D12188778C900FEADAF /* WebVideoFullscreenManagerProxy.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebVideoFullscreenManagerProxy.mm; path = ios/WebVideoFullscreenManagerProxy.mm; sourceTree = "<group>"; };
</span><span class="cx"> 3F889D13188778C900FEADAF /* WebVideoFullscreenManagerProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebVideoFullscreenManagerProxy.h; path = ios/WebVideoFullscreenManagerProxy.h; sourceTree = "<group>"; };
</span><span class="cx"> 3F889D1618877A2400FEADAF /* WebVideoFullscreenManagerProxy.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; name = WebVideoFullscreenManagerProxy.messages.in; path = ios/WebVideoFullscreenManagerProxy.messages.in; sourceTree = "<group>"; };
</span><ins>+ 46C6D1C01A803684004ACF98 /* WKDiagnosticLoggingResultType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDiagnosticLoggingResultType.h; sourceTree = "<group>"; };
</ins><span class="cx"> 4A410F3519AF7AC3002EBAB5 /* WKUserMediaPermissionRequest.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKUserMediaPermissionRequest.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 4A410F3619AF7AC3002EBAB5 /* WKUserMediaPermissionRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserMediaPermissionRequest.h; sourceTree = "<group>"; };
</span><span class="cx"> 4A410F3919AF7B04002EBAB5 /* UserMediaPermissionRequestManagerProxy.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserMediaPermissionRequestManagerProxy.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -3355,7 +3353,6 @@
</span><span class="cx"> 8372DB241A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKPageDiagnosticLoggingClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 8372DB261A67562800C697C5 /* WebPageDiagnosticLoggingClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPageDiagnosticLoggingClient.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 8372DB271A67562800C697C5 /* WebPageDiagnosticLoggingClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPageDiagnosticLoggingClient.h; sourceTree = "<group>"; };
</span><del>- 8372DB2E1A677D4A00C697C5 /* WKDiagnosticLoggingResultType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKDiagnosticLoggingResultType.h; sourceTree = "<group>"; };
</del><span class="cx"> 83891B621A68B3420030F386 /* APIDiagnosticLoggingClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIDiagnosticLoggingClient.h; sourceTree = "<group>"; };
</span><span class="cx"> 83891B681A68BEBC0030F386 /* _WKDiagnosticLoggingDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKDiagnosticLoggingDelegate.h; sourceTree = "<group>"; };
</span><span class="cx"> 83891B6A1A68C30B0030F386 /* DiagnosticLoggingClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiagnosticLoggingClient.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -3890,8 +3887,6 @@
</span><span class="cx"> CD19A26A1A13E821008D650E /* WebDiagnosticLoggingClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebDiagnosticLoggingClient.h; sourceTree = "<group>"; };
</span><span class="cx"> CD5C669E134B9D36004FE2A8 /* InjectedBundlePageFullScreenClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedBundlePageFullScreenClient.cpp; sourceTree = "<group>"; };
</span><span class="cx"> CD5C669F134B9D37004FE2A8 /* InjectedBundlePageFullScreenClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedBundlePageFullScreenClient.h; sourceTree = "<group>"; };
</span><del>- 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>"; };
</del><span class="cx"> CD73BA37131A29FE00EEDED2 /* WebFullScreenManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebFullScreenManager.cpp; path = FullScreen/WebFullScreenManager.cpp; sourceTree = "<group>"; };
</span><span class="cx"> CD73BA38131A29FE00EEDED2 /* WebFullScreenManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebFullScreenManager.h; path = FullScreen/WebFullScreenManager.h; sourceTree = "<group>"; };
</span><span class="cx"> CD73BA39131A29FE00EEDED2 /* WebFullScreenManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = WebFullScreenManager.messages.in; path = FullScreen/WebFullScreenManager.messages.in; sourceTree = "<group>"; };
</span><span class="lines">@@ -6287,6 +6282,7 @@
</span><span class="cx"> 518ACF1012B015F800B04B83 /* WKCredentialTypes.h */,
</span><span class="cx"> F62A765F12B1ABED0005F1B6 /* WKDatabaseManager.cpp */,
</span><span class="cx"> F62A766012B1ABED0005F1B6 /* WKDatabaseManager.h */,
</span><ins>+ 46C6D1C01A803684004ACF98 /* WKDiagnosticLoggingResultType.h */,
</ins><span class="cx"> 1AB7D78C1288CD9A00CFD08C /* WKDownload.cpp */,
</span><span class="cx"> 1AB7D78B1288CD9A00CFD08C /* WKDownload.h */,
</span><span class="cx"> BCE469571214EDF4000B98EB /* WKFormSubmissionListener.cpp */,
</span><span class="lines">@@ -6529,8 +6525,6 @@
</span><span class="cx"> BC8147D312F66D31007B2C32 /* InjectedBundleNavigationAction.h */,
</span><span class="cx"> 512935E11288D97800A4B695 /* InjectedBundlePageContextMenuClient.cpp */,
</span><span class="cx"> 512935E21288D97800A4B695 /* InjectedBundlePageContextMenuClient.h */,
</span><del>- CD67D30815C07BE000843ADF /* InjectedBundlePageDiagnosticLoggingClient.cpp */,
- CD67D30915C07BE000843ADF /* InjectedBundlePageDiagnosticLoggingClient.h */,
</del><span class="cx"> E1EE53E611F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp */,
</span><span class="cx"> E1EE53DC11F8CF9F00CCBEE4 /* InjectedBundlePageEditorClient.h */,
</span><span class="cx"> BC14E107120B905E00826C0C /* InjectedBundlePageFormClient.cpp */,
</span><span class="lines">@@ -6603,7 +6597,6 @@
</span><span class="cx"> 7CF47FF417275B71008ACB91 /* WKBundlePageBanner.cpp */,
</span><span class="cx"> 7CF47FF517275B71008ACB91 /* WKBundlePageBanner.h */,
</span><span class="cx"> 1AB474E3184D44980051B622 /* WKBundlePageContextMenuClient.h */,
</span><del>- 1AB474E7184D44D00051B622 /* WKBundlePageDiagnosticLoggingClient.h */,
</del><span class="cx"> 1AB474DF184D446A0051B622 /* WKBundlePageEditorClient.h */,
</span><span class="cx"> 1AB474E1184D44800051B622 /* WKBundlePageFormClient.h */,
</span><span class="cx"> 1AB474E5184D44B40051B622 /* WKBundlePageFullScreenClient.h */,
</span><span class="lines">@@ -7060,7 +7053,6 @@
</span><span class="cx"> BC4075DC124FF0270068F20A /* WKData.h */,
</span><span class="cx"> 377EAD4417E2C51A002D193D /* WKDeclarationSpecifiers.h */,
</span><span class="cx"> 1AFF48FE1833DE78009AB15A /* WKDeprecatedFunctions.cpp */,
</span><del>- 8372DB2E1A677D4A00C697C5 /* WKDiagnosticLoggingResultType.h */,
</del><span class="cx"> BC4075DD124FF0270068F20A /* WKDictionary.cpp */,
</span><span class="cx"> BC4075DE124FF0270068F20A /* WKDictionary.h */,
</span><span class="cx"> BC4075DF124FF0270068F20A /* WKErrorRef.cpp */,
</span><span class="lines">@@ -8095,9 +8087,7 @@
</span><span class="cx"> BC20528111C94284008F3375 /* WKBundlePage.h in Headers */,
</span><span class="cx"> 7CF47FF717275B71008ACB91 /* WKBundlePageBanner.h in Headers */,
</span><span class="cx"> 7CF47FFF17276AE3008ACB91 /* WKBundlePageBannerMac.h in Headers */,
</span><del>- 8372DB2F1A677D4A00C697C5 /* WKDiagnosticLoggingResultType.h in Headers */,
</del><span class="cx"> 1AB474E4184D44980051B622 /* WKBundlePageContextMenuClient.h in Headers */,
</span><del>- 1AB474E8184D44D00051B622 /* WKBundlePageDiagnosticLoggingClient.h in Headers */,
</del><span class="cx"> 7C89D2BC1A6B0F5B003A5FDE /* _WKUserContentFilterInternal.h in Headers */,
</span><span class="cx"> 1AB474E0184D446A0051B622 /* WKBundlePageEditorClient.h in Headers */,
</span><span class="cx"> 1AB474E2184D44800051B622 /* WKBundlePageFormClient.h in Headers */,
</span><span class="lines">@@ -8140,6 +8130,7 @@
</span><span class="cx"> BC4075FA124FF0270068F20A /* WKDictionary.h in Headers */,
</span><span class="cx"> BC017D0716260FF4007054F5 /* WKDOMDocument.h in Headers */,
</span><span class="cx"> BC017D0916260FF4007054F5 /* WKDOMElement.h in Headers */,
</span><ins>+ 46C6D1C11A803684004ACF98 /* WKDiagnosticLoggingResultType.h in Headers */,
</ins><span class="cx"> BC017D0B16260FF4007054F5 /* WKDOMInternals.h in Headers */,
</span><span class="cx"> BC017D0D16260FF4007054F5 /* WKDOMNode.h in Headers */,
</span><span class="cx"> BC5D24C216CD706D007D5461 /* WKDOMNodePrivate.h in Headers */,
</span><span class="lines">@@ -9397,7 +9388,6 @@
</span><span class="cx"> BC8147D612F66D31007B2C32 /* InjectedBundleNavigationAction.cpp in Sources */,
</span><span class="cx"> BC4BEEAC120A0A5F00FBA0C7 /* InjectedBundleNodeHandle.cpp in Sources */,
</span><span class="cx"> 512935E31288D97800A4B695 /* InjectedBundlePageContextMenuClient.cpp in Sources */,
</span><del>- CD67D30E15C08F9A00843ADF /* InjectedBundlePageDiagnosticLoggingClient.cpp in Sources */,
</del><span class="cx"> E1EE53E711F8CFFB00CCBEE4 /* InjectedBundlePageEditorClient.cpp in Sources */,
</span><span class="cx"> BC14E109120B905E00826C0C /* InjectedBundlePageFormClient.cpp in Sources */,
</span><span class="cx"> CD5C66A0134B9D38004FE2A8 /* InjectedBundlePageFullScreenClient.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp (180803 => 180804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2015-02-28 01:33:20 UTC (rev 180803)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.cpp 2015-02-28 01:43:24 UTC (rev 180804)
</span><span class="lines">@@ -154,11 +154,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKBundlePageSetDiagnosticLoggingClient(WKBundlePageRef pageRef, WKBundlePageDiagnosticLoggingClientBase* client)
-{
- toImpl(pageRef)->initializeInjectedBundleDiagnosticLoggingClient(client);
-}
-
</del><span class="cx"> WKBundlePageGroupRef WKBundlePageGetPageGroup(WKBundlePageRef pageRef)
</span><span class="cx"> {
</span><span class="cx"> return toAPI(toImpl(pageRef)->pageGroup());
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h (180803 => 180804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2015-02-28 01:33:20 UTC (rev 180803)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h 2015-02-28 01:43:24 UTC (rev 180804)
</span><span class="lines">@@ -29,7 +29,6 @@
</span><span class="cx"> #include <JavaScriptCore/JavaScript.h>
</span><span class="cx"> #include <WebKit/WKBase.h>
</span><span class="cx"> #include <WebKit/WKBundlePageContextMenuClient.h>
</span><del>-#include <WebKit/WKBundlePageDiagnosticLoggingClient.h>
</del><span class="cx"> #include <WebKit/WKBundlePageEditorClient.h>
</span><span class="cx"> #include <WebKit/WKBundlePageFormClient.h>
</span><span class="cx"> #include <WebKit/WKBundlePageFullScreenClient.h>
</span><span class="lines">@@ -65,7 +64,6 @@
</span><span class="cx"> WK_EXPORT void WKBundlePageSetPolicyClient(WKBundlePageRef page, WKBundlePagePolicyClientBase* client);
</span><span class="cx"> WK_EXPORT void WKBundlePageSetUIClient(WKBundlePageRef page, WKBundlePageUIClientBase* client);
</span><span class="cx"> WK_EXPORT void WKBundlePageSetFullScreenClient(WKBundlePageRef page, WKBundlePageFullScreenClientBase* client);
</span><del>-WK_EXPORT void WKBundlePageSetDiagnosticLoggingClient(WKBundlePageRef page, WKBundlePageDiagnosticLoggingClientBase* client);
</del><span class="cx">
</span><span class="cx"> WK_EXPORT WKBundlePageGroupRef WKBundlePageGetPageGroup(WKBundlePageRef page);
</span><span class="cx"> WK_EXPORT WKBundleFrameRef WKBundlePageGetMainFrame(WKBundlePageRef page);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePageDiagnosticLoggingClienth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h (180803 => 180804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h 2015-02-28 01:33:20 UTC (rev 180803)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePageDiagnosticLoggingClient.h 2015-02-28 01:43:24 UTC (rev 180804)
</span><span class="lines">@@ -1,75 +0,0 @@
</span><del>-/*
- * 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;
-
-enum { kWKBundlePageDiagnosticLoggingClientCurrentVersion WK_ENUM_DEPRECATED("Use an explicit version number instead") = 1 };
-typedef struct WKBundlePageDiagnosticLoggingClient {
- int version;
- const void * clientInfo;
-
- // Version 0.
- WKBundlePageDiagnosticLoggingCallback logDiagnosticMessageDeprecated;
-
- // Version 1.
- WKBundlePageLogDiagnosticMessageCallback logDiagnosticMessage;
- WKBundlePageLogDiagnosticMessageWithResultCallback logDiagnosticMessageWithResult;
- WKBundlePageLogDiagnosticMessageWithValueCallback logDiagnosticMessageWithValue;
-} WKBundlePageDiagnosticLoggingClient WK_C_DEPRECATED("Use an explicit versioned struct instead");
-
-#endif // WKBundlePageDiagnosticLoggingClient_h
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageDiagnosticLoggingClientcpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp (180803 => 180804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp 2015-02-28 01:33:20 UTC (rev 180803)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.cpp 2015-02-28 01:43:24 UTC (rev 180804)
</span><span class="lines">@@ -1,63 +0,0 @@
</span><del>-/*
- * 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);
-}
-
-}
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleInjectedBundlePageDiagnosticLoggingClienth"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h (180803 => 180804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h 2015-02-28 01:33:20 UTC (rev 180803)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageDiagnosticLoggingClient.h 2015-02-28 01:43:24 UTC (rev 180804)
</span><span class="lines">@@ -1,57 +0,0 @@
</span><del>-/*
- * 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 <JavaScriptCore/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
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebDiagnosticLoggingClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp (180803 => 180804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp 2015-02-28 01:33:20 UTC (rev 180803)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebDiagnosticLoggingClient.cpp 2015-02-28 01:43:24 UTC (rev 180804)
</span><span class="lines">@@ -46,8 +46,6 @@
</span><span class="cx"> if (!m_page.corePage()->settings().diagnosticLoggingEnabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // FIXME: Remove this injected bundle API.
- m_page.injectedBundleDiagnosticLoggingClient().logDiagnosticMessage(&m_page, message, description);
</del><span class="cx"> m_page.send(Messages::WebPageProxy::LogDiagnosticMessage(message, description, shouldSample == WebCore::ShouldSample::Yes));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -56,8 +54,6 @@
</span><span class="cx"> if (!m_page.corePage()->settings().diagnosticLoggingEnabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // FIXME: Remove this injected bundle API.
- m_page.injectedBundleDiagnosticLoggingClient().logDiagnosticMessageWithResult(&m_page, message, description, result);
</del><span class="cx"> m_page.send(Messages::WebPageProxy::LogDiagnosticMessageWithResult(message, description, result, shouldSample == WebCore::ShouldSample::Yes));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -66,8 +62,6 @@
</span><span class="cx"> if (!m_page.corePage()->settings().diagnosticLoggingEnabled())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- // FIXME: Remove this injected bundle API.
- m_page.injectedBundleDiagnosticLoggingClient().logDiagnosticMessageWithValue(&m_page, message, description, value);
</del><span class="cx"> m_page.send(Messages::WebPageProxy::LogDiagnosticMessageWithValue(message, description, value, shouldSample == WebCore::ShouldSample::Yes));
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (180803 => 180804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-02-28 01:33:20 UTC (rev 180803)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2015-02-28 01:43:24 UTC (rev 180804)
</span><span class="lines">@@ -65,7 +65,6 @@
</span><span class="cx"> #include "WebContextMenuClient.h"
</span><span class="cx"> #include "WebCoreArgumentCoders.h"
</span><span class="cx"> #include "WebDatabaseProvider.h"
</span><del>-#include "WebDiagnosticLoggingClient.h"
</del><span class="cx"> #include "WebDocumentLoader.h"
</span><span class="cx"> #include "WebDragClient.h"
</span><span class="cx"> #include "WebEditorClient.h"
</span><span class="lines">@@ -371,7 +370,6 @@
</span><span class="cx"> pageConfiguration.plugInClient = new WebPlugInClient(*this);
</span><span class="cx"> pageConfiguration.loaderClientForMainFrame = new WebFrameLoaderClient;
</span><span class="cx"> pageConfiguration.progressTrackerClient = new WebProgressTrackerClient(*this);
</span><del>- pageConfiguration.diagnosticLoggingClient = new WebDiagnosticLoggingClient(*this);
</del><span class="cx">
</span><span class="cx"> pageConfiguration.databaseProvider = WebDatabaseProvider::getOrCreate(m_pageGroup->pageGroupID());
</span><span class="cx"> pageConfiguration.storageNamespaceProvider = WebStorageNamespaceProvider::getOrCreate(m_pageGroup->pageGroupID());
</span><span class="lines">@@ -665,11 +663,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void WebPage::initializeInjectedBundleDiagnosticLoggingClient(WKBundlePageDiagnosticLoggingClientBase* client)
-{
- m_logDiagnosticMessageClient.initialize(client);
-}
-
</del><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> PassRefPtr<Plugin> WebPage::createPlugin(WebFrame* frame, HTMLPlugInElement* pluginElement, const Plugin::Parameters& parameters, String& newMIMEType)
</span><span class="cx"> {
</span><span class="lines">@@ -963,7 +956,6 @@
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> m_fullScreenClient.initialize(0);
</span><span class="cx"> #endif
</span><del>- m_logDiagnosticMessageClient.initialize(0);
</del><span class="cx">
</span><span class="cx"> m_printContext = nullptr;
</span><span class="cx"> m_mainFrame->coreFrame()->loader().detachFromParent();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (180803 => 180804)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-02-28 01:33:20 UTC (rev 180803)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2015-02-28 01:43:24 UTC (rev 180804)
</span><span class="lines">@@ -34,7 +34,6 @@
</span><span class="cx"> #include "FindController.h"
</span><span class="cx"> #include "GeolocationPermissionRequestManager.h"
</span><span class="cx"> #include "ImageOptions.h"
</span><del>-#include "InjectedBundlePageDiagnosticLoggingClient.h"
</del><span class="cx"> #include "InjectedBundlePageEditorClient.h"
</span><span class="cx"> #include "InjectedBundlePageFullScreenClient.h"
</span><span class="cx"> #include "InjectedBundlePageLoaderClient.h"
</span><span class="lines">@@ -293,7 +292,6 @@
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> void initializeInjectedBundleFullScreenClient(WKBundlePageFullScreenClientBase*);
</span><span class="cx"> #endif
</span><del>- void initializeInjectedBundleDiagnosticLoggingClient(WKBundlePageDiagnosticLoggingClientBase*);
</del><span class="cx">
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx"> API::InjectedBundle::PageContextMenuClient& injectedBundleContextMenuClient() { return *m_contextMenuClient.get(); }
</span><span class="lines">@@ -304,7 +302,6 @@
</span><span class="cx"> InjectedBundlePagePolicyClient& injectedBundlePolicyClient() { return m_policyClient; }
</span><span class="cx"> InjectedBundlePageResourceLoadClient& injectedBundleResourceLoadClient() { return m_resourceLoadClient; }
</span><span class="cx"> API::InjectedBundle::PageUIClient& injectedBundleUIClient() { return *m_uiClient.get(); }
</span><del>- InjectedBundlePageDiagnosticLoggingClient& injectedBundleDiagnosticLoggingClient() { return m_logDiagnosticMessageClient; }
</del><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> InjectedBundlePageFullScreenClient& injectedBundleFullScreenClient() { return m_fullScreenClient; }
</span><span class="cx"> #endif
</span><span class="lines">@@ -1198,7 +1195,6 @@
</span><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx"> InjectedBundlePageFullScreenClient m_fullScreenClient;
</span><span class="cx"> #endif
</span><del>- InjectedBundlePageDiagnosticLoggingClient m_logDiagnosticMessageClient;
</del><span class="cx">
</span><span class="cx"> FindController m_findController;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>