From 98d1cd1b2bae949c2d2605e3980a6b80440ccde7 Mon Sep 17 00:00:00 2001 From: "aestes@apple.com" Date: Thu, 17 Mar 2016 07:05:58 +0000 Subject: [PATCH] [Mac] Enable Content-Disposition: attachment sandbox https://bugs.webkit.org/show_bug.cgi?id=155578 Reviewed by Dan Bernstein. Covered by the existing set of attachment sandbox tests, which have always been run on Mac. Source/WebKit/mac: * WebView/WebView.mm: (-[WebView _commonInitializationWithFrameName:groupName:]): Source/WebKit2: * WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::WebPage): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@198318 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit/mac/ChangeLog | 13 +++++++++++++ Source/WebKit/mac/WebView/WebView.mm | 2 -- Source/WebKit2/ChangeLog | 13 +++++++++++++ Source/WebKit2/WebProcess/WebPage/WebPage.cpp | 2 +- 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog index 553be7e..69ee33d 100644 --- a/Source/WebKit/mac/ChangeLog +++ b/Source/WebKit/mac/ChangeLog @@ -1,3 +1,16 @@ +2016-03-17 Andy Estes + + [Mac] Enable Content-Disposition: attachment sandbox + https://bugs.webkit.org/show_bug.cgi?id=155578 + + + Reviewed by Dan Bernstein. + + Covered by the existing set of attachment sandbox tests, which have always been run on Mac. + + * WebView/WebView.mm: + (-[WebView _commonInitializationWithFrameName:groupName:]): + 2016-03-16 Beth Dakin Provide NSSpellChecker spellChecking methods with the current insertion point diff --git a/Source/WebKit/mac/WebView/WebView.mm b/Source/WebKit/mac/WebView/WebView.mm index 7d0f236..69440bf 100644 --- a/Source/WebKit/mac/WebView/WebView.mm +++ b/Source/WebKit/mac/WebView/WebView.mm @@ -1120,9 +1120,7 @@ static void WebKitInitializeGamepadProviderIfNecessary() _private->page->setDeviceScaleFactor([self _deviceScaleFactor]); #endif -#if PLATFORM(IOS) _private->page->settings().setContentDispositionAttachmentSandboxEnabled(true); -#endif } - (id)_initWithFrame:(NSRect)f frameName:(NSString *)frameName groupName:(NSString *)groupName diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index c31f38c..a05f5c6 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,16 @@ +2016-03-17 Andy Estes + + [Mac] Enable Content-Disposition: attachment sandbox + https://bugs.webkit.org/show_bug.cgi?id=155578 + + + Reviewed by Dan Bernstein. + + Covered by the existing set of attachment sandbox tests, which have always been run on Mac. + + * WebProcess/WebPage/WebPage.cpp: + (WebKit::WebPage::WebPage): + 2016-03-16 Beth Dakin Provide NSSpellChecker spellChecking methods with the current insertion point diff --git a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp index 8c4fd41..7fd398d 100644 --- a/Source/WebKit2/WebProcess/WebPage/WebPage.cpp +++ b/Source/WebKit2/WebProcess/WebPage/WebPage.cpp @@ -546,7 +546,7 @@ WebPage::WebPage(uint64_t pageID, const WebPageCreationParameters& parameters) if (parameters.viewScaleFactor != 1) scaleView(parameters.viewScaleFactor); -#if PLATFORM(IOS) +#if PLATFORM(COCOA) m_page->settings().setContentDispositionAttachmentSandboxEnabled(true); #endif } -- 1.8.3.1