Diff
Modified: trunk/Source/WebKit2/ChangeLog (215137 => 215138)
--- trunk/Source/WebKit2/ChangeLog 2017-04-08 02:23:12 UTC (rev 215137)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-08 02:26:43 UTC (rev 215138)
@@ -1,5 +1,34 @@
2017-04-07 Alex Christensen <[email protected]>
+ Modernize WebPage.h
+ https://bugs.webkit.org/show_bug.cgi?id=170633
+
+ Reviewed by Joseph Pecoraro.
+
+ * UIProcess/API/APIUIClient.h:
+ (API::UIClient::createNewPage):
+ * UIProcess/API/C/WKPage.cpp:
+ (WebKit::RunBeforeUnloadConfirmPanelResultListener::create):
+ (WebKit::RunJavaScriptAlertResultListener::create):
+ (WebKit::RunJavaScriptConfirmResultListener::create):
+ (WebKit::RunJavaScriptConfirmResultListener::RunJavaScriptConfirmResultListener):
+ (WebKit::RunJavaScriptPromptResultListener::create):
+ (WebKit::RunJavaScriptPromptResultListener::RunJavaScriptPromptResultListener):
+ (WKPageSetPageUIClient):
+ * UIProcess/Cocoa/UIDelegate.h:
+ * UIProcess/Cocoa/UIDelegate.mm:
+ (WebKit::UIDelegate::UIClient::createNewPage):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::loadDataImpl):
+ (WebKit::WebPage::loadStringImpl):
+ (WebKit::WebPage::loadData):
+ (WebKit::WebPage::scaledSnapshotWithOptions):
+ (WebKit::WebPage::SandboxExtensionTracker::willPerformLoadDragDestinationAction):
+ (WebKit::WebPage::SandboxExtensionTracker::setPendingProvisionalSandboxExtension):
+ * WebProcess/WebPage/WebPage.h:
+
+2017-04-07 Alex Christensen <[email protected]>
+
Use audit_token_t instead of pid_t for checking sandbox of other processes
https://bugs.webkit.org/show_bug.cgi?id=170616
<rdar://problem/31158189>
Modified: trunk/Source/WebKit2/UIProcess/API/APIUIClient.h (215137 => 215138)
--- trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2017-04-08 02:23:12 UTC (rev 215137)
+++ trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2017-04-08 02:26:43 UTC (rev 215138)
@@ -23,8 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef APIUIClient_h
-#define APIUIClient_h
+#pragma once
#include "WKPage.h"
#include "WebEvent.h"
@@ -32,7 +31,6 @@
#include "WebPageProxy.h"
#include <WebCore/FloatRect.h>
#include <functional>
-#include <wtf/PassRefPtr.h>
#if PLATFORM(IOS)
OBJC_CLASS NSArray;
@@ -75,7 +73,7 @@
public:
virtual ~UIClient() { }
- virtual PassRefPtr<WebKit::WebPageProxy> createNewPage(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::SecurityOriginData&, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, const WebKit::NavigationActionData&) { return nullptr; }
+ virtual RefPtr<WebKit::WebPageProxy> createNewPage(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::SecurityOriginData&, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, const WebKit::NavigationActionData&) { return nullptr; }
virtual void showPage(WebKit::WebPageProxy*) { }
virtual void fullscreenMayReturnToInline(WebKit::WebPageProxy*) { }
virtual void didEnterFullscreen(WebKit::WebPageProxy*) { }
@@ -180,5 +178,3 @@
};
} // namespace API
-
-#endif // APIUIClient_h
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (215137 => 215138)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2017-04-08 02:23:12 UTC (rev 215137)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2017-04-08 02:26:43 UTC (rev 215138)
@@ -1546,9 +1546,9 @@
class RunBeforeUnloadConfirmPanelResultListener : public API::ObjectImpl<API::Object::Type::RunBeforeUnloadConfirmPanelResultListener> {
public:
- static PassRefPtr<RunBeforeUnloadConfirmPanelResultListener> create(Function<void (bool)>&& completionHandler)
+ static Ref<RunBeforeUnloadConfirmPanelResultListener> create(Function<void(bool)>&& completionHandler)
{
- return adoptRef(new RunBeforeUnloadConfirmPanelResultListener(WTFMove(completionHandler)));
+ return adoptRef(*new RunBeforeUnloadConfirmPanelResultListener(WTFMove(completionHandler)));
}
virtual ~RunBeforeUnloadConfirmPanelResultListener()
@@ -1571,9 +1571,9 @@
class RunJavaScriptAlertResultListener : public API::ObjectImpl<API::Object::Type::RunJavaScriptAlertResultListener> {
public:
- static PassRefPtr<RunJavaScriptAlertResultListener> create(Function<void ()>&& completionHandler)
+ static Ref<RunJavaScriptAlertResultListener> create(Function<void()>&& completionHandler)
{
- return adoptRef(new RunJavaScriptAlertResultListener(WTFMove(completionHandler)));
+ return adoptRef(*new RunJavaScriptAlertResultListener(WTFMove(completionHandler)));
}
virtual ~RunJavaScriptAlertResultListener()
@@ -1596,9 +1596,9 @@
class RunJavaScriptConfirmResultListener : public API::ObjectImpl<API::Object::Type::RunJavaScriptConfirmResultListener> {
public:
- static PassRefPtr<RunJavaScriptConfirmResultListener> create(Function<void (bool)>&& completionHandler)
+ static Ref<RunJavaScriptConfirmResultListener> create(Function<void(bool)>&& completionHandler)
{
- return adoptRef(new RunJavaScriptConfirmResultListener(WTFMove(completionHandler)));
+ return adoptRef(*new RunJavaScriptConfirmResultListener(WTFMove(completionHandler)));
}
virtual ~RunJavaScriptConfirmResultListener()
@@ -1611,7 +1611,7 @@
}
private:
- explicit RunJavaScriptConfirmResultListener(Function<void (bool)>&& completionHandler)
+ explicit RunJavaScriptConfirmResultListener(Function<void(bool)>&& completionHandler)
: m_completionHandler(WTFMove(completionHandler))
{
}
@@ -1621,9 +1621,9 @@
class RunJavaScriptPromptResultListener : public API::ObjectImpl<API::Object::Type::RunJavaScriptPromptResultListener> {
public:
- static PassRefPtr<RunJavaScriptPromptResultListener> create(Function<void (const String&)>&& completionHandler)
+ static Ref<RunJavaScriptPromptResultListener> create(Function<void(const String&)>&& completionHandler)
{
- return adoptRef(new RunJavaScriptPromptResultListener(WTFMove(completionHandler)));
+ return adoptRef(*new RunJavaScriptPromptResultListener(WTFMove(completionHandler)));
}
virtual ~RunJavaScriptPromptResultListener()
@@ -1636,7 +1636,7 @@
}
private:
- explicit RunJavaScriptPromptResultListener(Function<void (const String&)>&& completionHandler)
+ explicit RunJavaScriptPromptResultListener(Function<void(const String&)>&& completionHandler)
: m_completionHandler(WTFMove(completionHandler))
{
}
@@ -1708,7 +1708,7 @@
}
private:
- PassRefPtr<WebPageProxy> createNewPage(WebPageProxy* page, WebFrameProxy* initiatingFrame, const SecurityOriginData& securityOriginData, const ResourceRequest& resourceRequest, const WindowFeatures& windowFeatures, const NavigationActionData& navigationActionData) override
+ RefPtr<WebPageProxy> createNewPage(WebPageProxy* page, WebFrameProxy* initiatingFrame, const SecurityOriginData& securityOriginData, const ResourceRequest& resourceRequest, const WindowFeatures& windowFeatures, const NavigationActionData& navigationActionData) override
{
if (m_client.createNewPage) {
auto configuration = page->configuration().copy();
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h (215137 => 215138)
--- trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h 2017-04-08 02:23:12 UTC (rev 215137)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h 2017-04-08 02:26:43 UTC (rev 215138)
@@ -23,8 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef UIClient_h
-#define UIClient_h
+#pragma once
#import "WKFoundation.h"
@@ -76,7 +75,7 @@
private:
// API::UIClient
- PassRefPtr<WebKit::WebPageProxy> createNewPage(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::SecurityOriginData&, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, const WebKit::NavigationActionData&) override;
+ RefPtr<WebKit::WebPageProxy> createNewPage(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::SecurityOriginData&, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, const WebKit::NavigationActionData&) override;
void close(WebKit::WebPageProxy*) override;
void fullscreenMayReturnToInline(WebKit::WebPageProxy*) override;
void didEnterFullscreen(WebKit::WebPageProxy*) override;
@@ -160,5 +159,3 @@
} // namespace WebKit
#endif // WK_API_ENABLED
-
-#endif // UIClient_h
Modified: trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm (215137 => 215138)
--- trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2017-04-08 02:23:12 UTC (rev 215137)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2017-04-08 02:26:43 UTC (rev 215138)
@@ -169,7 +169,7 @@
{
}
-PassRefPtr<WebKit::WebPageProxy> UIDelegate::UIClient::createNewPage(WebKit::WebPageProxy* page, WebKit::WebFrameProxy* initiatingFrame, const WebCore::SecurityOriginData& securityOriginData, const WebCore::ResourceRequest& request, const WebCore::WindowFeatures& windowFeatures, const WebKit::NavigationActionData& navigationActionData)
+RefPtr<WebKit::WebPageProxy> UIDelegate::UIClient::createNewPage(WebKit::WebPageProxy* page, WebKit::WebFrameProxy* initiatingFrame, const WebCore::SecurityOriginData& securityOriginData, const WebCore::ResourceRequest& request, const WebCore::WindowFeatures& windowFeatures, const WebKit::NavigationActionData& navigationActionData)
{
if (!m_uiDelegate.m_delegateMethods.webViewCreateWebViewWithConfigurationForNavigationActionWindowFeatures)
return nullptr;
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (215137 => 215138)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-04-08 02:23:12 UTC (rev 215137)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2017-04-08 02:26:43 UTC (rev 215138)
@@ -1208,7 +1208,7 @@
ASSERT(!m_pendingNavigationID);
}
-void WebPage::loadDataImpl(uint64_t navigationID, PassRefPtr<SharedBuffer> sharedBuffer, const String& MIMEType, const String& encodingName, const URL& baseURL, const URL& unreachableURL, const UserData& userData)
+void WebPage::loadDataImpl(uint64_t navigationID, Ref<SharedBuffer>&& sharedBuffer, const String& MIMEType, const String& encodingName, const URL& baseURL, const URL& unreachableURL, const UserData& userData)
{
SendStopResponsivenessTimer stopper(this);
@@ -1216,7 +1216,7 @@
ResourceRequest request(baseURL);
ResourceResponse response(URL(), MIMEType, sharedBuffer->size(), encodingName);
- SubstituteData substituteData(sharedBuffer, unreachableURL, response, SubstituteData::SessionHistoryVisibility::Hidden);
+ SubstituteData substituteData(WTFMove(sharedBuffer), unreachableURL, response, SubstituteData::SessionHistoryVisibility::Hidden);
// Let the InjectedBundle know we are about to start the load, passing the user data from the UIProcess
// to all the client to set up any needed state.
@@ -1229,11 +1229,11 @@
void WebPage::loadStringImpl(uint64_t navigationID, const String& htmlString, const String& MIMEType, const URL& baseURL, const URL& unreachableURL, const UserData& userData)
{
if (!htmlString.isNull() && htmlString.is8Bit()) {
- RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(htmlString.characters8()), htmlString.length() * sizeof(LChar));
- loadDataImpl(navigationID, sharedBuffer, MIMEType, ASCIILiteral("latin1"), baseURL, unreachableURL, userData);
+ auto sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(htmlString.characters8()), htmlString.length() * sizeof(LChar));
+ loadDataImpl(navigationID, WTFMove(sharedBuffer), MIMEType, ASCIILiteral("latin1"), baseURL, unreachableURL, userData);
} else {
- RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(htmlString.characters16()), htmlString.length() * sizeof(UChar));
- loadDataImpl(navigationID, sharedBuffer, MIMEType, ASCIILiteral("utf-16"), baseURL, unreachableURL, userData);
+ auto sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(htmlString.characters16()), htmlString.length() * sizeof(UChar));
+ loadDataImpl(navigationID, WTFMove(sharedBuffer), MIMEType, ASCIILiteral("utf-16"), baseURL, unreachableURL, userData);
}
}
@@ -1241,9 +1241,9 @@
{
platformDidReceiveLoadParameters(loadParameters);
- RefPtr<SharedBuffer> sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(loadParameters.data.data()), loadParameters.data.size());
+ auto sharedBuffer = SharedBuffer::create(reinterpret_cast<const char*>(loadParameters.data.data()), loadParameters.data.size());
URL baseURL = loadParameters.baseURLString.isEmpty() ? blankURL() : URL(URL(), loadParameters.baseURLString);
- loadDataImpl(loadParameters.navigationID, sharedBuffer, loadParameters.MIMEType, loadParameters.encodingName, baseURL, URL(), loadParameters.userData);
+ loadDataImpl(loadParameters.navigationID, WTFMove(sharedBuffer), loadParameters.MIMEType, loadParameters.encodingName, baseURL, URL(), loadParameters.userData);
}
void WebPage::loadString(const LoadParameters& loadParameters)
@@ -1919,7 +1919,7 @@
send(Messages::WebPageProxy::ImageCallback(handle, callbackID));
}
-PassRefPtr<WebImage> WebPage::scaledSnapshotWithOptions(const IntRect& rect, double additionalScaleFactor, SnapshotOptions options)
+RefPtr<WebImage> WebPage::scaledSnapshotWithOptions(const IntRect& rect, double additionalScaleFactor, SnapshotOptions options)
{
IntRect snapshotRect = rect;
IntSize bitmapSize = snapshotRect.size();
@@ -4148,9 +4148,9 @@
}
}
-void WebPage::SandboxExtensionTracker::willPerformLoadDragDestinationAction(PassRefPtr<SandboxExtension> pendingDropSandboxExtension)
+void WebPage::SandboxExtensionTracker::willPerformLoadDragDestinationAction(RefPtr<SandboxExtension>&& pendingDropSandboxExtension)
{
- setPendingProvisionalSandboxExtension(pendingDropSandboxExtension);
+ setPendingProvisionalSandboxExtension(WTFMove(pendingDropSandboxExtension));
}
void WebPage::SandboxExtensionTracker::beginLoad(WebFrame* frame, const SandboxExtension::Handle& handle)
@@ -4160,9 +4160,9 @@
setPendingProvisionalSandboxExtension(SandboxExtension::create(handle));
}
-void WebPage::SandboxExtensionTracker::setPendingProvisionalSandboxExtension(PassRefPtr<SandboxExtension> pendingProvisionalSandboxExtension)
+void WebPage::SandboxExtensionTracker::setPendingProvisionalSandboxExtension(RefPtr<SandboxExtension>&& pendingProvisionalSandboxExtension)
{
- m_pendingProvisionalSandboxExtension = pendingProvisionalSandboxExtension;
+ m_pendingProvisionalSandboxExtension = WTFMove(pendingProvisionalSandboxExtension);
}
static bool shouldReuseCommittedSandboxExtension(WebFrame* frame)
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (215137 => 215138)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2017-04-08 02:23:12 UTC (rev 215137)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2017-04-08 02:26:43 UTC (rev 215138)
@@ -489,7 +489,7 @@
WebCore::IntRect rootViewToAccessibilityScreen(const WebCore::IntRect&);
#endif
- PassRefPtr<WebImage> scaledSnapshotWithOptions(const WebCore::IntRect&, double additionalScaleFactor, SnapshotOptions);
+ RefPtr<WebImage> scaledSnapshotWithOptions(const WebCore::IntRect&, double additionalScaleFactor, SnapshotOptions);
static const WebEvent* currentEvent();
@@ -630,13 +630,13 @@
void invalidate();
void beginLoad(WebFrame*, const SandboxExtension::Handle& handle);
- void willPerformLoadDragDestinationAction(PassRefPtr<SandboxExtension> pendingDropSandboxExtension);
+ void willPerformLoadDragDestinationAction(RefPtr<SandboxExtension>&& pendingDropSandboxExtension);
void didStartProvisionalLoad(WebFrame*);
void didCommitProvisionalLoad(WebFrame*);
void didFailProvisionalLoad(WebFrame*);
private:
- void setPendingProvisionalSandboxExtension(PassRefPtr<SandboxExtension>);
+ void setPendingProvisionalSandboxExtension(RefPtr<SandboxExtension>&&);
RefPtr<SandboxExtension> m_pendingProvisionalSandboxExtension;
RefPtr<SandboxExtension> m_provisionalSandboxExtension;
@@ -1032,7 +1032,7 @@
String sourceForFrame(WebFrame*);
- void loadDataImpl(uint64_t navigationID, PassRefPtr<WebCore::SharedBuffer>, const String& MIMEType, const String& encodingName, const WebCore::URL& baseURL, const WebCore::URL& failingURL, const UserData&);
+ void loadDataImpl(uint64_t navigationID, Ref<WebCore::SharedBuffer>&&, const String& MIMEType, const String& encodingName, const WebCore::URL& baseURL, const WebCore::URL& failingURL, const UserData&);
void loadStringImpl(uint64_t navigationID, const String&, const String& MIMEType, const WebCore::URL& baseURL, const WebCore::URL& failingURL, const UserData&);
bool platformHasLocalDataForURL(const WebCore::URL&);
