<!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>[159788] 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/159788">159788</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2013-11-26 12:07:48 -0800 (Tue, 26 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Some WebKit2 headers are not self-contained
https://bugs.webkit.org/show_bug.cgi?id=124884
Reviewed by Anders Carlsson.
* Shared/API/Cocoa/WKRemoteObjectInterface.h: Added import.
* Shared/API/Cocoa/WKRemoteObjectRegistry.h: Ditto.
* Shared/API/c/WKContextMenuItemTypes.h: Added include.
* Shared/API/c/WKFindOptions.h: Ditto.
* Shared/API/c/WKMutableArray.h: Ditto.
* Shared/API/c/WKPageLoadTypes.h: Ditto.
* Shared/API/c/WKPageVisibilityTypes.h: Ditto.
* Shared/API/c/WKPluginInformation.cpp:
(WKPluginInformationBundleIdentifierKey): Made this API function always be defined. When
the Netscape plug-in API is not enabled, it returns 0.
(WKPluginInformationBundleVersionKey): Ditto.
(WKPluginInformationBundleShortVersionKey): Ditto.
(WKPluginInformationPathKey): Ditto.
(WKPluginInformationDisplayNameKey): Ditto.
(WKPluginInformationDefaultLoadPolicyKey): Ditto.
(WKPluginInformationUpdatePastLastBlockedVersionIsKnownAvailableKey): Ditto.
(WKPluginInformationHasSandboxProfileKey): Ditto.
(WKPluginInformationFrameURLKey): Ditto.
(WKPluginInformationMIMETypeKey): Ditto.
(WKPluginInformationPageURLKey): Ditto.
(WKPluginInformationPluginspageAttributeURLKey): Ditto.
(WKPluginInformationPluginURLKey): Ditto.
(WKPlugInInformationReplacementObscuredKey): Ditto.
* Shared/API/c/WKString.h: Added include.
* UIProcess/API/C/WKCredentialTypes.h: Ditto.
* UIProcess/API/C/WKPageContextMenuClient.h: Ditto.
* UIProcess/API/C/WKPageLoaderClient.h: Added includes.
* UIProcess/API/C/WKPagePolicyClient.h: Ditto.
* UIProcess/API/C/WKPageUIClient.h: Ditto.
* UIProcess/API/C/WKPluginSiteDataManager.cpp:
(WKPluginSiteDataManagerGetTypeID): Fixed the !ENABLE(NETSCAPE_PLUGIN_API) build.
* UIProcess/API/C/mac/WKContextPrivateMac.h: Removed use of ENABLE() from this private
header.
* UIProcess/API/C/mac/WKContextPrivateMac.mm:
(WKContextCopyPlugInInfoForBundleIdentifier): Made this API function always be defined.
When the Netscape plug-in API is not enabled, it returns 0.
(WKContextGetInfoForInstalledPlugIns): Made this API function always be defined.
* UIProcess/API/C/mac/WKInspectorPrivateMac.h: Added imports.
* UIProcess/API/C/mac/WKPagePrivateMac.h: Added include.
* UIProcess/API/Cocoa/WKBackForwardListItem.h: Added import.
* UIProcess/API/Cocoa/WKNavigationData.h: Ditto.
* UIProcess/API/cpp/WKRetainPtr.h: Replaced use of WARN_UNUSED_RETURN in this private header
with an equivalent macro defined in the header.
* WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h: Added include.
* WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp:
(WKBundleInspectorGetTypeID): Made this API function always be defined. When the Inspector
is not enabled, it returns the Null type.
(WKBundleInspectorShow): Made this API function always be defined.
(WKBundleInspectorClose): Ditto.
(WKBundleInspectorEvaluateScriptForTest): Ditto.
(WKBundleInspectorSetPageProfilingEnabled): Ditto.
* WebProcess/InjectedBundle/API/c/WKBundleInspector.h: Removed use of ENABLE() from this
private header.
* WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h: Added includes.
* WebProcess/InjectedBundle/API/c/WKBundlePrivate.h: Added include.
* WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainer.mm:
(-[WKNPAPIPlugInContainer openPlugInPreferencePane]): Fixed the !ENABLE(NETSCAPE_PLUGIN_API)
build.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::createJavaAppletWidget): Ditto.
* WebProcess/WebPage/mac/WebInspectorMac.mm: Fixed the !ENABLE(INSPECTOR) build.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoaWKRemoteObjectInterfaceh">trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectInterface.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPICocoaWKRemoteObjectRegistryh">trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectRegistry.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKContextMenuItemTypesh">trunk/Source/WebKit2/Shared/API/c/WKContextMenuItemTypes.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKFindOptionsh">trunk/Source/WebKit2/Shared/API/c/WKFindOptions.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKMutableArrayh">trunk/Source/WebKit2/Shared/API/c/WKMutableArray.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKPageLoadTypesh">trunk/Source/WebKit2/Shared/API/c/WKPageLoadTypes.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKPageVisibilityTypesh">trunk/Source/WebKit2/Shared/API/c/WKPageVisibilityTypes.h</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKPluginInformationcpp">trunk/Source/WebKit2/Shared/API/c/WKPluginInformation.cpp</a></li>
<li><a href="#trunkSourceWebKit2SharedAPIcWKStringh">trunk/Source/WebKit2/Shared/API/c/WKString.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKCredentialTypesh">trunk/Source/WebKit2/UIProcess/API/C/WKCredentialTypes.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageContextMenuClienth">trunk/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageLoaderClienth">trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagePolicyClienth">trunk/Source/WebKit2/UIProcess/API/C/WKPagePolicyClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPageUIClienth">trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPluginSiteDataManagercpp">trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICmacWKContextPrivateMach">trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICmacWKContextPrivateMacmm">trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICmacWKInspectorPrivateMach">trunk/Source/WebKit2/UIProcess/API/C/mac/WKInspectorPrivateMac.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMach">trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKBackForwardListItemh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKNavigationDatah">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationData.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIcppWKRetainPtrh">trunk/Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleFramePrivateh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleInspectorcpp">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleInspectorh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagePrivateh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePrivateh">trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsNetscapemacWKNPAPIPlugInContainermm">trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainer.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp">trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacWebInspectorMacmm">trunk/Source/WebKit2/WebProcess/WebPage/mac/WebInspectorMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/ChangeLog 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -1,3 +1,82 @@
</span><ins>+2013-11-26 Dan Bernstein <mitz@apple.com>
+
+ Some WebKit2 headers are not self-contained
+ https://bugs.webkit.org/show_bug.cgi?id=124884
+
+ Reviewed by Anders Carlsson.
+
+ * Shared/API/Cocoa/WKRemoteObjectInterface.h: Added import.
+ * Shared/API/Cocoa/WKRemoteObjectRegistry.h: Ditto.
+ * Shared/API/c/WKContextMenuItemTypes.h: Added include.
+ * Shared/API/c/WKFindOptions.h: Ditto.
+ * Shared/API/c/WKMutableArray.h: Ditto.
+ * Shared/API/c/WKPageLoadTypes.h: Ditto.
+ * Shared/API/c/WKPageVisibilityTypes.h: Ditto.
+
+ * Shared/API/c/WKPluginInformation.cpp:
+ (WKPluginInformationBundleIdentifierKey): Made this API function always be defined. When
+ the Netscape plug-in API is not enabled, it returns 0.
+ (WKPluginInformationBundleVersionKey): Ditto.
+ (WKPluginInformationBundleShortVersionKey): Ditto.
+ (WKPluginInformationPathKey): Ditto.
+ (WKPluginInformationDisplayNameKey): Ditto.
+ (WKPluginInformationDefaultLoadPolicyKey): Ditto.
+ (WKPluginInformationUpdatePastLastBlockedVersionIsKnownAvailableKey): Ditto.
+ (WKPluginInformationHasSandboxProfileKey): Ditto.
+ (WKPluginInformationFrameURLKey): Ditto.
+ (WKPluginInformationMIMETypeKey): Ditto.
+ (WKPluginInformationPageURLKey): Ditto.
+ (WKPluginInformationPluginspageAttributeURLKey): Ditto.
+ (WKPluginInformationPluginURLKey): Ditto.
+ (WKPlugInInformationReplacementObscuredKey): Ditto.
+
+ * Shared/API/c/WKString.h: Added include.
+ * UIProcess/API/C/WKCredentialTypes.h: Ditto.
+ * UIProcess/API/C/WKPageContextMenuClient.h: Ditto.
+ * UIProcess/API/C/WKPageLoaderClient.h: Added includes.
+ * UIProcess/API/C/WKPagePolicyClient.h: Ditto.
+ * UIProcess/API/C/WKPageUIClient.h: Ditto.
+
+ * UIProcess/API/C/WKPluginSiteDataManager.cpp:
+ (WKPluginSiteDataManagerGetTypeID): Fixed the !ENABLE(NETSCAPE_PLUGIN_API) build.
+
+ * UIProcess/API/C/mac/WKContextPrivateMac.h: Removed use of ENABLE() from this private
+ header.
+ * UIProcess/API/C/mac/WKContextPrivateMac.mm:
+ (WKContextCopyPlugInInfoForBundleIdentifier): Made this API function always be defined.
+ When the Netscape plug-in API is not enabled, it returns 0.
+ (WKContextGetInfoForInstalledPlugIns): Made this API function always be defined.
+
+ * UIProcess/API/C/mac/WKInspectorPrivateMac.h: Added imports.
+ * UIProcess/API/C/mac/WKPagePrivateMac.h: Added include.
+ * UIProcess/API/Cocoa/WKBackForwardListItem.h: Added import.
+ * UIProcess/API/Cocoa/WKNavigationData.h: Ditto.
+ * UIProcess/API/cpp/WKRetainPtr.h: Replaced use of WARN_UNUSED_RETURN in this private header
+ with an equivalent macro defined in the header.
+
+ * WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h: Added include.
+ * WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp:
+ (WKBundleInspectorGetTypeID): Made this API function always be defined. When the Inspector
+ is not enabled, it returns the Null type.
+ (WKBundleInspectorShow): Made this API function always be defined.
+ (WKBundleInspectorClose): Ditto.
+ (WKBundleInspectorEvaluateScriptForTest): Ditto.
+ (WKBundleInspectorSetPageProfilingEnabled): Ditto.
+ * WebProcess/InjectedBundle/API/c/WKBundleInspector.h: Removed use of ENABLE() from this
+ private header.
+
+ * WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h: Added includes.
+ * WebProcess/InjectedBundle/API/c/WKBundlePrivate.h: Added include.
+
+ * WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainer.mm:
+ (-[WKNPAPIPlugInContainer openPlugInPreferencePane]): Fixed the !ENABLE(NETSCAPE_PLUGIN_API)
+ build.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::createJavaAppletWidget): Ditto.
+
+ * WebProcess/WebPage/mac/WebInspectorMac.mm: Fixed the !ENABLE(INSPECTOR) build.
+
</ins><span class="cx"> 2013-11-25 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Use class extensions for IPI
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoaWKRemoteObjectInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectInterface.h (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectInterface.h 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectInterface.h 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import <Foundation/Foundation.h>
+
</ins><span class="cx"> WK_API_CLASS
</span><span class="cx"> @interface WKRemoteObjectInterface : NSObject
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPICocoaWKRemoteObjectRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectRegistry.h (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectRegistry.h 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/Shared/API/Cocoa/WKRemoteObjectRegistry.h 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import <Foundation/Foundation.h>
+
</ins><span class="cx"> @class WKRemoteObjectInterface;
</span><span class="cx">
</span><span class="cx"> WK_API_CLASS
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKContextMenuItemTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKContextMenuItemTypes.h (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKContextMenuItemTypes.h 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/Shared/API/c/WKContextMenuItemTypes.h 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef WKContextMenuItemTypes_h
</span><span class="cx"> #define WKContextMenuItemTypes_h
</span><span class="cx">
</span><ins>+#include <stdint.h>
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKFindOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKFindOptions.h (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKFindOptions.h 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/Shared/API/c/WKFindOptions.h 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef WKFindOptions_h
</span><span class="cx"> #define WKFindOptions_h
</span><span class="cx">
</span><ins>+#include <stdint.h>
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKMutableArrayh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKMutableArray.h (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKMutableArray.h 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/Shared/API/c/WKMutableArray.h 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define WKMutableArray_h
</span><span class="cx">
</span><span class="cx"> #include <WebKit2/WKBase.h>
</span><ins>+#include <stddef.h>
</ins><span class="cx">
</span><span class="cx"> #ifndef __cplusplus
</span><span class="cx"> #include <stdbool.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKPageLoadTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKPageLoadTypes.h (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKPageLoadTypes.h 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/Shared/API/c/WKPageLoadTypes.h 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef WKPageLoadTypes_h
</span><span class="cx"> #define WKPageLoadTypes_h
</span><span class="cx">
</span><ins>+#include <stdint.h>
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKPageVisibilityTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKPageVisibilityTypes.h (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKPageVisibilityTypes.h 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/Shared/API/c/WKPageVisibilityTypes.h 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef WKPageVisibilityTypes_h
</span><span class="cx"> #define WKPageVisibilityTypes_h
</span><span class="cx">
</span><ins>+#include <stdint.h>
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKPluginInformationcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKPluginInformation.cpp (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKPluginInformation.cpp 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/Shared/API/c/WKPluginInformation.cpp 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WKPluginInformation.h"
</span><span class="cx">
</span><del>-#if ENABLE(NETSCAPE_PLUGIN_API)
-
</del><span class="cx"> #include "PluginInformation.h"
</span><span class="cx"> #include "WKSharedAPICast.h"
</span><span class="cx"> #include "WebString.h"
</span><span class="lines">@@ -36,85 +34,140 @@
</span><span class="cx">
</span><span class="cx"> WKStringRef WKPluginInformationBundleIdentifierKey()
</span><span class="cx"> {
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> static WebString* key = WebString::create(pluginInformationBundleIdentifierKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><ins>+#else
+ return 0;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKPluginInformationBundleVersionKey()
</span><span class="cx"> {
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> static WebString* key = WebString::create(pluginInformationBundleVersionKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><ins>+#else
+ return 0;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKPluginInformationBundleShortVersionKey()
</span><span class="cx"> {
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> static WebString* key = WebString::create(pluginInformationBundleShortVersionKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><ins>+#else
+ return 0;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKPluginInformationPathKey()
</span><span class="cx"> {
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> static WebString* key = WebString::create(pluginInformationPathKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><ins>+#else
+ return 0;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKPluginInformationDisplayNameKey()
</span><span class="cx"> {
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> static WebString* key = WebString::create(pluginInformationDisplayNameKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><ins>+#else
+ return 0;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKPluginInformationDefaultLoadPolicyKey()
</span><span class="cx"> {
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> static WebString* key = WebString::create(pluginInformationDefaultLoadPolicyKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><ins>+#else
+ return 0;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKPluginInformationUpdatePastLastBlockedVersionIsKnownAvailableKey()
</span><span class="cx"> {
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> static WebString* key = WebString::create(pluginInformationUpdatePastLastBlockedVersionIsKnownAvailableKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><ins>+#else
+ return 0;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKPluginInformationHasSandboxProfileKey()
</span><span class="cx"> {
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> static WebString* key = WebString::create(pluginInformationHasSandboxProfileKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><ins>+#else
+ return 0;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKPluginInformationFrameURLKey()
</span><span class="cx"> {
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> static WebString* key = WebString::create(pluginInformationFrameURLKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><ins>+#else
+ return 0;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKPluginInformationMIMETypeKey()
</span><span class="cx"> {
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> static WebString* key = WebString::create(pluginInformationMIMETypeKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><ins>+#else
+ return 0;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKPluginInformationPageURLKey()
</span><span class="cx"> {
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> static WebString* key = WebString::create(pluginInformationPageURLKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><ins>+#else
+ return 0;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKPluginInformationPluginspageAttributeURLKey()
</span><span class="cx"> {
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> static WebString* key = WebString::create(pluginInformationPluginspageAttributeURLKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><ins>+#else
+ return 0;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKPluginInformationPluginURLKey()
</span><span class="cx"> {
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> static WebString* key = WebString::create(pluginInformationPluginURLKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><ins>+#else
+ return 0;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WKStringRef WKPlugInInformationReplacementObscuredKey()
</span><span class="cx"> {
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> static WebString* key = WebString::create(plugInInformationReplacementObscuredKey()).leakRef();
</span><span class="cx"> return toAPI(key);
</span><ins>+#else
+ return 0;
+#endif
</ins><span class="cx"> }
</span><del>-#endif // ENABLE(NETSCAPE_PLUGIN_API)
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedAPIcWKStringh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/API/c/WKString.h (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/API/c/WKString.h 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/Shared/API/c/WKString.h 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define WKString_h
</span><span class="cx">
</span><span class="cx"> #include <WebKit2/WKBase.h>
</span><ins>+#include <stddef.h>
</ins><span class="cx">
</span><span class="cx"> #ifndef __cplusplus
</span><span class="cx"> #include <stdbool.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKCredentialTypesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKCredentialTypes.h (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKCredentialTypes.h 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKCredentialTypes.h 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #ifndef WKCredentialTypes_h
</span><span class="cx"> #define WKCredentialTypes_h
</span><span class="cx">
</span><ins>+#include <stdint.h>
+
</ins><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageContextMenuClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageContextMenuClient.h 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define WKPageContextMenuClient_h
</span><span class="cx">
</span><span class="cx"> #include <WebKit2/WKBase.h>
</span><ins>+#include <WebKit2/WKGeometry.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageLoaderClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageLoaderClient.h 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx"> #define WKPageLoaderClient_h
</span><span class="cx">
</span><span class="cx"> #include <WebKit2/WKBase.h>
</span><ins>+#include <WebKit2/WKError.h>
+#include <WebKit2/WKPageLoadTypes.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagePolicyClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPagePolicyClient.h (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPagePolicyClient.h 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPagePolicyClient.h 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx"> #define WKPagePolicyClient_h
</span><span class="cx">
</span><span class="cx"> #include <WebKit2/WKBase.h>
</span><ins>+#include <WebKit2/WKEvent.h>
+#include <WebKit2/WKPageLoadTypes.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPageUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPageUIClient.h 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -27,6 +27,9 @@
</span><span class="cx"> #define WKPageUIClient_h
</span><span class="cx">
</span><span class="cx"> #include <WebKit2/WKBase.h>
</span><ins>+#include <WebKit2/WKEvent.h>
+#include <WebKit2/WKGeometry.h>
+#include <WebKit2/WKNativeEvent.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPluginSiteDataManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPluginSiteDataManager.cpp 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> return toAPI(WebPluginSiteDataManager::APIType);
</span><span class="cx"> #else
</span><del>- return API::Object::Type::Null;
</del><ins>+ return toAPI(API::Object::Type::Null);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKContextPrivateMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.h 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -37,8 +37,6 @@
</span><span class="cx">
</span><span class="cx"> WK_EXPORT bool WKContextIsPlugInUpdateAvailable(WKContextRef context, WKStringRef plugInBundleIdentifier);
</span><span class="cx">
</span><del>-#if ENABLE(NETSCAPE_PLUGIN_API)
-
</del><span class="cx"> WK_EXPORT WKDictionaryRef WKContextCopyPlugInInfoForBundleIdentifier(WKContextRef context, WKStringRef plugInBundleIdentifier);
</span><span class="cx">
</span><span class="cx"> typedef void (^WKContextGetInfoForInstalledPlugInsBlock)(WKArrayRef, WKErrorRef);
</span><span class="lines">@@ -66,8 +64,6 @@
</span><span class="cx"> /* Value type: WKBooleanRef */
</span><span class="cx"> WK_EXPORT WKStringRef WKPlugInInfoIsSandboxedKey();
</span><span class="cx">
</span><del>-#endif // ENABLE(NETSCAPE_PLUGIN_API)
-
</del><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKContextPrivateMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKContextPrivateMac.mm 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -63,20 +63,23 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(NETSCAPE_PLUGIN_API)
-
</del><span class="cx"> WKDictionaryRef WKContextCopyPlugInInfoForBundleIdentifier(WKContextRef contextRef, WKStringRef plugInBundleIdentifierRef)
</span><span class="cx"> {
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> PluginModuleInfo plugin = toImpl(contextRef)->pluginInfoStore().findPluginWithBundleIdentifier(toWTFString(plugInBundleIdentifierRef));
</span><span class="cx"> if (plugin.path.isNull())
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> RefPtr<ImmutableDictionary> dictionary = createPluginInformationDictionary(plugin);
</span><span class="cx"> return toAPI(dictionary.release().leakRef());
</span><ins>+#else
+ return 0;
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKContextGetInfoForInstalledPlugIns(WKContextRef contextRef, WKContextGetInfoForInstalledPlugInsBlock block)
</span><span class="cx"> {
</span><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> Vector<PluginModuleInfo> plugins = toImpl(contextRef)->pluginInfoStore().plugins();
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<API::Object>> pluginInfoDictionaries;
</span><span class="lines">@@ -93,6 +96,7 @@
</span><span class="cx">
</span><span class="cx"> toImpl(contextRef)->deref();
</span><span class="cx"> });
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKContextResetHSTSHosts(WKContextRef context)
</span><span class="lines">@@ -132,5 +136,3 @@
</span><span class="cx"> {
</span><span class="cx"> return WKPluginInformationHasSandboxProfileKey();
</span><span class="cx"> }
</span><del>-
-#endif // ENABLE(NETSCAPE_PLUGIN_API)
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKInspectorPrivateMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKInspectorPrivateMac.h (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKInspectorPrivateMac.h 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKInspectorPrivateMac.h 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -23,8 +23,9 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef WKInspectorPrivateMac_h
-#define WKInspectorPrivateMac_h
</del><ins>+#import <AppKit/NSWindow.h>
+#import <WebKit2/WKDeclarationSpecifiers.h>
+#import <WebKit2/WKInspector.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span><span class="lines">@@ -45,5 +46,3 @@
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>-
-#endif // WKInspectorPrivateMac_h
</del></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICmacWKPagePrivateMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.h 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define WKPagePrivateMac_h
</span><span class="cx">
</span><span class="cx"> #include <WebKit2/WKBase.h>
</span><ins>+#include <sys/types.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKBackForwardListItemh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.h (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.h 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBackForwardListItem.h 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import <Foundation/Foundation.h>
+
</ins><span class="cx"> WK_API_CLASS
</span><span class="cx"> @interface WKBackForwardListItem : NSObject
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKNavigationDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationData.h (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationData.h 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKNavigationData.h 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="cx">
</span><ins>+#import <Foundation/Foundation.h>
+
</ins><span class="cx"> WK_API_CLASS
</span><span class="cx"> @interface WKNavigationData : NSObject
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIcppWKRetainPtrh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/UIProcess/API/cpp/WKRetainPtr.h 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -229,8 +229,16 @@
</span><span class="cx"> return a != b.get();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-template<typename T> inline WKRetainPtr<T> adoptWK(T) WARN_UNUSED_RETURN;
</del><ins>+#if defined(__GNUC__) && !(defined(__CC_ARM) || defined(__ARMCC__))
+#define WK_WARN_UNUSED_RETURN __attribute__((warn_unused_result))
+#else
+#define WK_WARN_UNUSED_RETURN
+#endif
</ins><span class="cx">
</span><ins>+template<typename T> inline WKRetainPtr<T> adoptWK(T) WK_WARN_UNUSED_RETURN;
+
+#undef WK_WARN_UNUSED_RETURN
+
</ins><span class="cx"> template<typename T> inline WKRetainPtr<T> adoptWK(T o)
</span><span class="cx"> {
</span><span class="cx"> return WKRetainPtr<T>(AdoptWK, o);
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleFramePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleFramePrivate.h 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include <JavaScriptCore/JavaScript.h>
</span><span class="cx"> #include <WebKit2/WKBase.h>
</span><ins>+#include <WebKit2/WKGeometry.h>
</ins><span class="cx">
</span><span class="cx"> #ifndef __cplusplus
</span><span class="cx"> #include <stdbool.h>
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleInspectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.cpp 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -26,8 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "WKBundleInspector.h"
</span><span class="cx">
</span><del>-#if ENABLE(INSPECTOR)
-
</del><span class="cx"> #include "WKAPICast.h"
</span><span class="cx"> #include "WKBundleAPICast.h"
</span><span class="cx"> #include "WebInspector.h"
</span><span class="lines">@@ -37,30 +35,40 @@
</span><span class="cx">
</span><span class="cx"> WKTypeID WKBundleInspectorGetTypeID()
</span><span class="cx"> {
</span><ins>+#if ENABLE(INSPECTOR)
</ins><span class="cx"> return toAPI(WebInspector::APIType);
</span><ins>+#else
+ return toAPI(API::Object::Type::Null);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKBundleInspectorShow(WKBundleInspectorRef inspectorRef)
</span><span class="cx"> {
</span><del>- return toImpl(inspectorRef)->show();
</del><ins>+#if ENABLE(INSPECTOR)
+ toImpl(inspectorRef)->show();
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKBundleInspectorClose(WKBundleInspectorRef inspectorRef)
</span><span class="cx"> {
</span><del>- return toImpl(inspectorRef)->close();
</del><ins>+#if ENABLE(INSPECTOR)
+ toImpl(inspectorRef)->close();
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKBundleInspectorEvaluateScriptForTest(WKBundleInspectorRef inspectorRef, long callID, WKStringRef script)
</span><span class="cx"> {
</span><del>- return toImpl(inspectorRef)->evaluateScriptForTest(callID, toWTFString(script));
</del><ins>+#if ENABLE(INSPECTOR)
+ toImpl(inspectorRef)->evaluateScriptForTest(callID, toWTFString(script));
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WKBundleInspectorSetPageProfilingEnabled(WKBundleInspectorRef inspectorRef, bool enabled)
</span><span class="cx"> {
</span><ins>+#if ENABLE(INSPECTOR)
</ins><span class="cx"> if (enabled)
</span><span class="cx"> toImpl(inspectorRef)->startPageProfiling();
</span><span class="cx"> else
</span><span class="cx"> toImpl(inspectorRef)->stopPageProfiling();
</span><ins>+#endif
</ins><span class="cx"> }
</span><del>-
-#endif // ENABLE(INSPECTOR)
</del></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundleInspectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.h (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.h 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleInspector.h 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -28,8 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #include <WebKit2/WKBase.h>
</span><span class="cx">
</span><del>-#if ENABLE(INSPECTOR)
-
</del><span class="cx"> #ifndef __cplusplus
</span><span class="cx"> #include <stdbool.h>
</span><span class="cx"> #endif
</span><span class="lines">@@ -50,7 +48,5 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#endif // ENABLE(INSPECTOR)
-
</del><span class="cx"> #endif // WKBundleInspector_h
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePagePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePagePrivate.h 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx"> #define WKBundlePagePrivate_h
</span><span class="cx">
</span><span class="cx"> #include <WebKit2/WKBase.h>
</span><ins>+#include <WebKit2/WKEvent.h>
+#include <WebKit2/WKGeometry.h>
</ins><span class="cx">
</span><span class="cx"> #ifdef __cplusplus
</span><span class="cx"> extern "C" {
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessInjectedBundleAPIcWKBundlePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePrivate.h 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include <stdbool.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#include <JavaScriptCore/JSBase.h>
</ins><span class="cx"> #include <WebKit2/WKUserContentInjectedFrames.h>
</span><span class="cx"> #include <WebKit2/WKUserScriptInjectionTime.h>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsNetscapemacWKNPAPIPlugInContainermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainer.mm (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainer.mm 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/WebProcess/Plugins/Netscape/mac/WKNPAPIPlugInContainer.mm 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> if (!_plugin)
</span><span class="cx"> return NO;
</span><span class="cx">
</span><del>-#if !PLATFORM(IOS)
</del><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> _plugin->openPluginPreferencePane();
</span><span class="cx"> return YES;
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebCoreSupportWebFrameLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -1373,7 +1373,7 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<Widget> WebFrameLoaderClient::createJavaAppletWidget(const IntSize& pluginSize, HTMLAppletElement* appletElement, const URL&, const Vector<String>& paramNames, const Vector<String>& paramValues)
</span><span class="cx"> {
</span><del>-#if !PLATFORM(IOS)
</del><ins>+#if ENABLE(NETSCAPE_PLUGIN_API)
</ins><span class="cx"> RefPtr<Widget> plugin = createPlugin(pluginSize, appletElement, URL(), paramNames, paramValues, appletElement->serviceType(), false);
</span><span class="cx"> if (!plugin) {
</span><span class="cx"> if (WebPage* webPage = m_frame->page()) {
</span><span class="lines">@@ -1385,7 +1385,7 @@
</span><span class="cx"> return plugin.release();
</span><span class="cx"> #else
</span><span class="cx"> return 0;
</span><del>-#endif // !PLATFORM(IOS)
</del><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(PLUGIN_PROXY_FOR_VIDEO)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacWebInspectorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/WebInspectorMac.mm (159787 => 159788)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/WebInspectorMac.mm 2013-11-26 19:19:37 UTC (rev 159787)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/WebInspectorMac.mm 2013-11-26 20:07:48 UTC (rev 159788)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> #import "config.h"
</span><span class="cx"> #import "WebInspector.h"
</span><span class="cx">
</span><ins>+#if ENABLE(INSPECTOR)
+
</ins><span class="cx"> #import <WebCore/SoftLinking.h>
</span><span class="cx">
</span><span class="cx"> SOFT_LINK_STAGED_FRAMEWORK(WebInspectorUI, PrivateFrameworks, A)
</span><span class="lines">@@ -54,3 +56,5 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span><ins>+
+#endif // ENABLE(INSPECTOR)
</ins></span></pre>
</div>
</div>
</body>
</html>