[arch-commits] Commit in chromium/trunk (4 files)
Evangelos Foutras
foutrelis at archlinux.org
Wed Oct 8 21:10:49 UTC 2014
Date: Wednesday, October 8, 2014 @ 23:10:49
Author: foutrelis
Revision: 224125
upgpkg: chromium 38.0.2125.101-1
- New upstream release.
- Build with system ICU once again.
Modified:
chromium/trunk/PKGBUILD
Deleted:
chromium/trunk/chromium-nacl-bootstrap-cflags.patch
chromium/trunk/chromium-sanitize-referrer-in-context-menus.patch
chromium/trunk/chromium-use-correct-referrer-policy.patch
---------------------------------------------------+
PKGBUILD | 54 --
chromium-nacl-bootstrap-cflags.patch | 10
chromium-sanitize-referrer-in-context-menus.patch | 388 --------------------
chromium-use-correct-referrer-policy.patch | 32 -
4 files changed, 17 insertions(+), 467 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-10-08 20:14:26 UTC (rev 224124)
+++ PKGBUILD 2014-10-08 21:10:49 UTC (rev 224125)
@@ -5,13 +5,13 @@
# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
pkgname=chromium
-pkgver=37.0.2062.120
-pkgrel=2
+pkgver=38.0.2125.101
+pkgrel=1
pkgdesc="The open-source project behind Google Chrome, an attempt at creating a safer, faster, and more stable browser"
arch=('i686' 'x86_64')
url="http://www.chromium.org/"
license=('BSD')
-depends=('gtk2' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss'
+depends=('gtk2' 'nss' 'alsa-lib' 'xdg-utils' 'bzip2' 'libevent' 'libxss' 'icu'
'libexif' 'libgcrypt' 'ttf-font' 'systemd' 'dbus' 'flac' 'snappy'
'speech-dispatcher' 'pciutils' 'libpulse' 'harfbuzz'
'desktop-file-utils' 'hicolor-icon-theme')
@@ -28,16 +28,10 @@
source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz
chromium.desktop
chromium.default
- chromium-nacl-bootstrap-cflags.patch
- chromium-sanitize-referrer-in-context-menus.patch
- chromium-use-correct-referrer-policy.patch
chromium.sh)
-sha256sums=('b3073758b6caf384d30de20ba7514ee52cce5c1460bc768cd28d15f53f0c6efb'
+sha256sums=('d3303519ab471a3bc831e9b366e64dc2fe651894e52ae5d1e74de60ee2a1198a'
'09bfac44104f4ccda4c228053f689c947b3e97da9a4ab6fa34ce061ee83d0322'
'478340d5760a9bd6c549e19b1b5d1c5b4933ebf5f8cfb2b3e2d70d07443fe232'
- 'd82bafd8d4d6517c2d420b2987fdbe1dfcc32d5fed74a6c0011bcb2f868225c3'
- 'c5d793dbaaaee8455ffc5cf008239b0b0bb8fe32e2e7b2b44d181cebb432f28e'
- '9f5b73070b1d360c1d7915115c6829e11361d243e424c24179ca39b28ae03f85'
'4999fded897af692f4974f0a3e3bbb215193519918a1fa9b31ed51e74a2dccb9')
# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
@@ -51,18 +45,11 @@
prepare() {
cd "$srcdir/$pkgname-$pkgver"
- # Filter out -fstack-protector-strong for nacl_helper_bootstrap
- # https://code.google.com/p/chromium/issues/detail?id=104569
- patch -Np0 <../chromium-nacl-bootstrap-cflags.patch
+ # Remove bundled ICU; its header files appear to get picked up instead of
+ # the system ones, leading to errors during the final link stage
+ # https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/BNGvJc08B6Q
+ find third_party/icu -type f \! -regex '.*\.\(gyp\|gypi\|isolate\)' -delete
- # URL request check fails for save-as command (FS#41033)
- # https://code.google.com/p/chromium/issues/detail?id=357473
- patch -Np1 <../chromium-sanitize-referrer-in-context-menus.patch
-
- # Make sure to use the correct referrer policy in the FrameFetchContext
- # https://code.google.com/p/chromium/issues/detail?id=407510
- patch -d third_party/WebKit -Np1 <../chromium-use-correct-referrer-policy.patch
-
# Use Python 2
find . -type f -exec sed -i -r \
-e 's|/usr/bin/python$|&2|g' \
@@ -75,16 +62,6 @@
# Download NaCL toolchains
python2 build/download_nacl_toolchains.py \
--packages nacl_x86_newlib,pnacl_newlib,pnacl_translator
-
- # Build with clang as a temporary solution to startup crash with GCC 4.9
- mkdir -p third_party/llvm-build/Release+Asserts/bin
- ln -s /usr/bin/clang third_party/llvm-build/Release+Asserts/bin/
- ln -s /usr/bin/clang++ third_party/llvm-build/Release+Asserts/bin/
- ln -s /usr/bin/llvm-symbolizer third_party/llvm-build/Release+Asserts/bin/
- # clang 3.4 doesn't support this option
- sed -i '/-Wno-absolute-value/d' \
- build/common.gypi \
- third_party/ffmpeg/ffmpeg.gyp
}
build() {
@@ -95,6 +72,11 @@
# CFLAGS are passed through release_extra_cflags below
export -n CFLAGS CXXFLAGS
+ # Build with clang as a temporary solution to startup crash with GCC 4.9
+ # https://code.google.com/p/chromium/issues/detail?id=412967
+ export CC=clang
+ export CXX=clang++
+
local _chromium_conf=(
-Dgoogle_api_key=$_google_api_key
-Dgoogle_default_client_id=$_google_default_client_id
@@ -111,6 +93,7 @@
-Dlinux_use_bundled_binutils=0
-Dlinux_use_bundled_gold=0
-Dlinux_use_gold_flags=0
+ -Dicu_use_data_file_flag=0
-Dlogging_like_official_build=1
-Drelease_extra_cflags="$CFLAGS"
-Dlibspeechd_h_prefix=speech-dispatcher/
@@ -120,6 +103,7 @@
-Duse_system_flac=1
-Duse_system_ffmpeg=0
-Duse_system_harfbuzz=1
+ -Duse_system_icu=1
-Duse_system_libevent=1
-Duse_system_libjpeg=1
-Duse_system_libpng=1
@@ -135,9 +119,6 @@
-Ddisable_fatal_linker_warnings=1
-Ddisable_glibc=1)
- # https://code.google.com/p/chromium/issues/detail?id=386097
- third_party/libaddressinput/chromium/tools/update-strings.py
-
build/linux/unbundle/replace_gyp_files.py "${_chromium_conf[@]}"
build/gyp_chromium --depth=. "${_chromium_conf[@]}"
@@ -155,7 +136,7 @@
install -D out/Release/chromedriver "$pkgdir/usr/lib/chromium/chromedriver"
cp out/Release/{*.pak,libffmpegsumo.so,nacl_helper{,_bootstrap}} \
- out/Release/{libppGoogleNaClPluginChrome.so,nacl_irt_*.nexe} \
+ out/Release/nacl_irt_*.nexe \
out/Release/libpdf.so \
"$pkgdir/usr/lib/chromium/"
@@ -164,13 +145,12 @@
"$pkgdir/usr/lib/chromium/chromedriver" \
"$pkgdir/usr/lib/chromium/"nacl_helper{,_bootstrap}
strip $STRIP_SHARED "$pkgdir/usr/lib/chromium/libffmpegsumo.so" \
- "$pkgdir/usr/lib/chromium/libppGoogleNaClPluginChrome.so" \
"$pkgdir/usr/lib/chromium/libpdf.so"
# Allow users to override command-line options
install -Dm644 "$srcdir/chromium.default" "$pkgdir/etc/chromium/default"
- cp -a out/Release/locales out/Release/icudtl.dat "$pkgdir/usr/lib/chromium/"
+ cp -a out/Release/locales "$pkgdir/usr/lib/chromium/"
install -Dm644 out/Release/chrome.1 "$pkgdir/usr/share/man/man1/chromium.1"
Deleted: chromium-nacl-bootstrap-cflags.patch
===================================================================
--- chromium-nacl-bootstrap-cflags.patch 2014-10-08 20:14:26 UTC (rev 224124)
+++ chromium-nacl-bootstrap-cflags.patch 2014-10-08 21:10:49 UTC (rev 224125)
@@ -1,10 +0,0 @@
---- native_client/src/trusted/service_runtime/linux/nacl_bootstrap.gyp.orig 2014-05-20 23:59:56.000000000 +0300
-+++ native_client/src/trusted/service_runtime/linux/nacl_bootstrap.gyp 2014-05-21 00:00:28.000000000 +0300
-@@ -96,6 +96,7 @@
- # coming after the -fno-stack-protector we added above.
- '-fstack-protector',
- '-fstack-protector-all',
-+ '-fstack-protector-strong',
- '-fprofile-generate',
- '-finstrument-functions',
- '-funwind-tables',
Deleted: chromium-sanitize-referrer-in-context-menus.patch
===================================================================
--- chromium-sanitize-referrer-in-context-menus.patch 2014-10-08 20:14:26 UTC (rev 224124)
+++ chromium-sanitize-referrer-in-context-menus.patch 2014-10-08 21:10:49 UTC (rev 224125)
@@ -1,388 +0,0 @@
-Index: chrome/browser/download/download_browsertest.cc
-diff --git a/chrome/browser/download/download_browsertest.cc b/chrome/browser/download/download_browsertest.cc
-index 9fd163b1133b65f68a2369e9e0c452e5253d1b47..91525d254e70e40afe3b1765119d547c5b295a79 100644
---- a/chrome/browser/download/download_browsertest.cc
-+++ b/chrome/browser/download/download_browsertest.cc
-@@ -15,6 +15,7 @@
- #include "base/path_service.h"
- #include "base/prefs/pref_service.h"
- #include "base/stl_util.h"
-+#include "base/strings/string_number_conversions.h"
- #include "base/strings/string_split.h"
- #include "base/strings/string_util.h"
- #include "base/strings/stringprintf.h"
-@@ -44,6 +45,7 @@
- #include "chrome/browser/infobars/infobar_service.h"
- #include "chrome/browser/net/url_request_mock_util.h"
- #include "chrome/browser/profiles/profile.h"
-+#include "chrome/browser/renderer_context_menu/render_view_context_menu_browsertest_util.h"
- #include "chrome/browser/renderer_context_menu/render_view_context_menu_test_util.h"
- #include "chrome/browser/safe_browsing/download_feedback_service.h"
- #include "chrome/browser/safe_browsing/download_protection_service.h"
-@@ -2750,6 +2752,116 @@ IN_PROC_BROWSER_TEST_F(DownloadTest, LoadURLExternallyReferrerPolicy) {
- ASSERT_TRUE(VerifyFile(file, expected_contents, expected_contents.length()));
- }
-
-+// This test ensures that the Referer header is properly sanitized when
-+// Save Link As is chosen from the context menu.
-+IN_PROC_BROWSER_TEST_F(DownloadTest, SaveLinkAsReferrerPolicyOrigin) {
-+ // Do initial setup.
-+ ASSERT_TRUE(test_server()->Start());
-+ net::SpawnedTestServer ssl_test_server(
-+ net::SpawnedTestServer::TYPE_HTTPS,
-+ net::SpawnedTestServer::kLocalhost,
-+ base::FilePath(FILE_PATH_LITERAL("chrome/test/data/referrer_policy")));
-+ ASSERT_TRUE(ssl_test_server.Start());
-+ EnableFileChooser(true);
-+ std::vector<DownloadItem*> download_items;
-+ GetDownloads(browser(), &download_items);
-+ ASSERT_TRUE(download_items.empty());
-+
-+ // Navigate to the initial page, where Save Link As will be executed.
-+ GURL url = ssl_test_server.GetURL(
-+ std::string("files/referrer-policy-start.html?policy=origin") +
-+ "&port=" + base::IntToString(test_server()->host_port_pair().port()) +
-+ "&ssl_port=" +
-+ base::IntToString(ssl_test_server.host_port_pair().port()) +
-+ "&redirect=echoheader&link=true&target=");
-+ ASSERT_TRUE(url.is_valid());
-+ ui_test_utils::NavigateToURL(browser(), url);
-+
-+ scoped_ptr<content::DownloadTestObserver> waiter(
-+ new content::DownloadTestObserverTerminal(
-+ DownloadManagerForBrowser(browser()), 1,
-+ content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
-+
-+ // Right-click on the link and choose Save Link As. This will download the
-+ // link target.
-+ ContextMenuNotificationObserver context_menu_observer(
-+ IDC_CONTENT_CONTEXT_SAVELINKAS);
-+
-+ WebContents* tab = browser()->tab_strip_model()->GetActiveWebContents();
-+ blink::WebMouseEvent mouse_event;
-+ mouse_event.type = blink::WebInputEvent::MouseDown;
-+ mouse_event.button = blink::WebMouseEvent::ButtonRight;
-+ mouse_event.x = 15;
-+ mouse_event.y = 15;
-+ mouse_event.clickCount = 1;
-+ tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
-+ mouse_event.type = blink::WebInputEvent::MouseUp;
-+ tab->GetRenderViewHost()->ForwardMouseEvent(mouse_event);
-+
-+ waiter->WaitForFinished();
-+ EXPECT_EQ(1u, waiter->NumDownloadsSeenInState(DownloadItem::COMPLETE));
-+ CheckDownloadStates(1, DownloadItem::COMPLETE);
-+
-+ // Validate that the correct file was downloaded.
-+ GetDownloads(browser(), &download_items);
-+ EXPECT_EQ(1u, download_items.size());
-+ EXPECT_EQ(test_server()->GetURL("echoheader?Referer"),
-+ download_items[0]->GetOriginalUrl());
-+
-+ // Check that the file contains the expected referrer.
-+ base::FilePath file(download_items[0]->GetTargetFilePath());
-+ std::string expected_contents = ssl_test_server.GetURL(std::string()).spec();
-+ EXPECT_TRUE(VerifyFile(file, expected_contents, expected_contents.length()));
-+}
-+
-+// This test ensures that the Referer header is properly sanitized when
-+// Save Image As is chosen from the context menu. The test succeeds if
-+// it doesn't crash.
-+IN_PROC_BROWSER_TEST_F(DownloadTest, SaveImageAsReferrerPolicyDefault) {
-+ // Do initial setup.
-+ ASSERT_TRUE(test_server()->Start());
-+ net::SpawnedTestServer ssl_test_server(
-+ net::SpawnedTestServer::TYPE_HTTPS,
-+ net::SpawnedTestServer::kLocalhost,
-+ base::FilePath(FILE_PATH_LITERAL("chrome/test/data/")));
-+ ASSERT_TRUE(ssl_test_server.Start());
-+ EnableFileChooser(true);
-+ std::vector<DownloadItem*> download_items;
-+ GetDownloads(browser(), &download_items);
-+ ASSERT_TRUE(download_items.empty());
-+
-+ GURL url = ssl_test_server.GetURL("files/title1.html");
-+ GURL img_url = test_server()->GetURL("files/downloads/image.jpg");
-+ ASSERT_TRUE(url.is_valid());
-+ ui_test_utils::NavigateToURL(browser(), url);
-+
-+ // Try to download an image via a context menu.
-+ scoped_ptr<content::DownloadTestObserver> waiter_context_menu(
-+ new content::DownloadTestObserverTerminal(
-+ DownloadManagerForBrowser(browser()), 1,
-+ content::DownloadTestObserver::ON_DANGEROUS_DOWNLOAD_FAIL));
-+ content::ContextMenuParams context_menu_params;
-+ context_menu_params.media_type = blink::WebContextMenuData::MediaTypeImage;
-+ context_menu_params.page_url = url;
-+ context_menu_params.src_url = img_url;
-+ TestRenderViewContextMenu menu(
-+ browser()->tab_strip_model()->GetActiveWebContents()->GetMainFrame(),
-+ context_menu_params);
-+ menu.Init();
-+ menu.ExecuteCommand(IDC_CONTENT_CONTEXT_SAVEIMAGEAS, 0);
-+ waiter_context_menu->WaitForFinished();
-+ EXPECT_EQ(
-+ 1u, waiter_context_menu->NumDownloadsSeenInState(DownloadItem::COMPLETE));
-+ CheckDownloadStates(1, DownloadItem::COMPLETE);
-+
-+ // Validate that the correct file was downloaded via the context menu.
-+ download_items.clear();
-+ GetDownloads(browser(), &download_items);
-+ EXPECT_TRUE(DidShowFileChooser());
-+ ASSERT_EQ(1u, download_items.size());
-+ ASSERT_EQ(img_url, download_items[0]->GetOriginalUrl());
-+}
-+
- IN_PROC_BROWSER_TEST_F(DownloadTest, HiddenDownload) {
- base::FilePath file(FILE_PATH_LITERAL("download-test1.lib"));
- GURL url(URLRequestMockHTTPJob::GetMockUrl(file));
-Index: chrome/browser/referrer_policy_browsertest.cc
-diff --git a/chrome/browser/referrer_policy_browsertest.cc b/chrome/browser/referrer_policy_browsertest.cc
-index 8c10e6d0fc3159d1d0c6c349f374a0dac82b7306..eb1dd5dcb0112dc68253a6045002b07a330bb1e7 100644
---- a/chrome/browser/referrer_policy_browsertest.cc
-+++ b/chrome/browser/referrer_policy_browsertest.cc
-@@ -109,7 +109,7 @@ class ReferrerPolicyTest : public InProcessBrowserTest {
-
- enum StartOnProtocol { START_ON_HTTP, START_ON_HTTPS, };
-
-- enum LinkType { REGULAR_LINK, LINk_WITH_TARGET_BLANK, };
-+ enum LinkType { REGULAR_LINK, LINK_WITH_TARGET_BLANK, };
-
- enum RedirectType { NO_REDIRECT, SERVER_REDIRECT, SERVER_REDIRECT_ON_HTTP, };
-
-@@ -159,7 +159,7 @@ class ReferrerPolicyTest : public InProcessBrowserTest {
- base::IntToString(ssl_test_server_->host_port_pair().port()) +
- "&redirect=" + RedirectTypeToString(redirect) + "&link=" +
- (button == blink::WebMouseEvent::ButtonNone ? "false" : "true") +
-- "&target=" + (link_type == LINk_WITH_TARGET_BLANK ? "_blank" : ""));
-+ "&target=" + (link_type == LINK_WITH_TARGET_BLANK ? "_blank" : ""));
-
- ui_test_utils::WindowedTabAddedNotificationObserver tab_added_observer(
- content::NotificationService::AllSources());
-@@ -288,7 +288,7 @@ IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, HttpsMiddleClickOrigin) {
- IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, TargetBlankOrigin) {
- RunReferrerTest(blink::WebReferrerPolicyOrigin,
- START_ON_HTTP,
-- LINk_WITH_TARGET_BLANK,
-+ LINK_WITH_TARGET_BLANK,
- NO_REDIRECT,
- NEW_FOREGROUND_TAB,
- blink::WebMouseEvent::ButtonLeft,
-@@ -299,7 +299,7 @@ IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, TargetBlankOrigin) {
- IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, HttpsTargetBlankOrigin) {
- RunReferrerTest(blink::WebReferrerPolicyOrigin,
- START_ON_HTTPS,
-- LINk_WITH_TARGET_BLANK,
-+ LINK_WITH_TARGET_BLANK,
- NO_REDIRECT,
- NEW_FOREGROUND_TAB,
- blink::WebMouseEvent::ButtonLeft,
-@@ -310,7 +310,7 @@ IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, HttpsTargetBlankOrigin) {
- IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, MiddleClickTargetBlankOrigin) {
- RunReferrerTest(blink::WebReferrerPolicyOrigin,
- START_ON_HTTP,
-- LINk_WITH_TARGET_BLANK,
-+ LINK_WITH_TARGET_BLANK,
- NO_REDIRECT,
- NEW_FOREGROUND_TAB,
- blink::WebMouseEvent::ButtonMiddle,
-@@ -321,7 +321,7 @@ IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, MiddleClickTargetBlankOrigin) {
- IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, HttpsMiddleClickTargetBlankOrigin) {
- RunReferrerTest(blink::WebReferrerPolicyOrigin,
- START_ON_HTTPS,
-- LINk_WITH_TARGET_BLANK,
-+ LINK_WITH_TARGET_BLANK,
- NO_REDIRECT,
- NEW_FOREGROUND_TAB,
- blink::WebMouseEvent::ButtonMiddle,
-@@ -427,7 +427,7 @@ IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, HttpsMiddleClickRedirect) {
- IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, TargetBlankRedirect) {
- RunReferrerTest(blink::WebReferrerPolicyOrigin,
- START_ON_HTTP,
-- LINk_WITH_TARGET_BLANK,
-+ LINK_WITH_TARGET_BLANK,
- SERVER_REDIRECT,
- NEW_FOREGROUND_TAB,
- blink::WebMouseEvent::ButtonLeft,
-@@ -439,7 +439,7 @@ IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, TargetBlankRedirect) {
- IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, HttpsTargetBlankRedirect) {
- RunReferrerTest(blink::WebReferrerPolicyOrigin,
- START_ON_HTTPS,
-- LINk_WITH_TARGET_BLANK,
-+ LINK_WITH_TARGET_BLANK,
- SERVER_REDIRECT,
- NEW_FOREGROUND_TAB,
- blink::WebMouseEvent::ButtonLeft,
-@@ -451,7 +451,7 @@ IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, HttpsTargetBlankRedirect) {
- IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest, MiddleClickTargetBlankRedirect) {
- RunReferrerTest(blink::WebReferrerPolicyOrigin,
- START_ON_HTTP,
-- LINk_WITH_TARGET_BLANK,
-+ LINK_WITH_TARGET_BLANK,
- SERVER_REDIRECT,
- NEW_FOREGROUND_TAB,
- blink::WebMouseEvent::ButtonMiddle,
-@@ -464,7 +464,7 @@ IN_PROC_BROWSER_TEST_F(ReferrerPolicyTest,
- HttpsMiddleClickTargetBlankRedirect) {
- RunReferrerTest(blink::WebReferrerPolicyOrigin,
- START_ON_HTTPS,
-- LINk_WITH_TARGET_BLANK,
-+ LINK_WITH_TARGET_BLANK,
- SERVER_REDIRECT,
- NEW_FOREGROUND_TAB,
- blink::WebMouseEvent::ButtonMiddle,
-Index: chrome/browser/renderer_context_menu/render_view_context_menu.cc
-diff --git a/chrome/browser/renderer_context_menu/render_view_context_menu.cc b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
-index 8b1f54547a36a5301418e68b6e521c204cc1aece..3758462437f8e8c920999054ad36e3200b8d906c 100644
---- a/chrome/browser/renderer_context_menu/render_view_context_menu.cc
-+++ b/chrome/browser/renderer_context_menu/render_view_context_menu.cc
-@@ -1534,14 +1534,17 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) {
-
- case IDC_CONTENT_CONTEXT_SAVELINKAS: {
- RecordDownloadSource(DOWNLOAD_INITIATED_BY_CONTEXT_MENU);
-- const GURL& referrer =
-- params_.frame_url.is_empty() ? params_.page_url : params_.frame_url;
- const GURL& url = params_.link_url;
-+ const GURL& referring_url =
-+ params_.frame_url.is_empty() ? params_.page_url : params_.frame_url;
-+ content::Referrer referrer = content::Referrer::SanitizeForRequest(
-+ url,
-+ content::Referrer(referring_url.GetAsReferrer(),
-+ params_.referrer_policy));
- DownloadManager* dlm = BrowserContext::GetDownloadManager(profile_);
- scoped_ptr<DownloadUrlParameters> dl_params(
- DownloadUrlParameters::FromWebContents(source_web_contents_, url));
-- dl_params->set_referrer(
-- content::Referrer(referrer, params_.referrer_policy));
-+ dl_params->set_referrer(referrer);
- dl_params->set_referrer_encoding(params_.frame_charset);
- dl_params->set_prompt(true);
- dlm->DownloadUrl(dl_params.Pass());
-@@ -1558,11 +1561,14 @@ void RenderViewContextMenu::ExecuteCommand(int id, int event_flags) {
- } else {
- // TODO(zino): We can use SaveImageAt() like a case of canvas.
- RecordDownloadSource(DOWNLOAD_INITIATED_BY_CONTEXT_MENU);
-- const GURL& referrer =
-- params_.frame_url.is_empty() ? params_.page_url : params_.frame_url;
- const GURL& url = params_.src_url;
-- source_web_contents_->SaveFrame(url, content::Referrer(
-- referrer, params_.referrer_policy));
-+ const GURL& referring_url =
-+ params_.frame_url.is_empty() ? params_.page_url : params_.frame_url;
-+ content::Referrer referrer = content::Referrer::SanitizeForRequest(
-+ url,
-+ content::Referrer(referring_url.GetAsReferrer(),
-+ params_.referrer_policy));
-+ source_web_contents_->SaveFrame(url, referrer);
- }
- break;
- }
-@@ -1974,8 +1980,10 @@ void RenderViewContextMenu::OpenURL(
- const GURL& url, const GURL& referring_url,
- WindowOpenDisposition disposition,
- content::PageTransition transition) {
-- content::Referrer referrer(referring_url.GetAsReferrer(),
-- params_.referrer_policy);
-+ content::Referrer referrer = content::Referrer::SanitizeForRequest(
-+ url,
-+ content::Referrer(referring_url.GetAsReferrer(),
-+ params_.referrer_policy));
-
- if (params_.link_url == url && disposition != OFF_THE_RECORD)
- params_.custom_context.link_followed = url;
-Index: components/sessions/serialized_navigation_entry.cc
-diff --git a/components/sessions/serialized_navigation_entry.cc b/components/sessions/serialized_navigation_entry.cc
-index c0ed8d2a835a7cc44ef29f8df0c6c7558e6dbd55..a5ba41c850fc508f0eff54380db43e606c71538d 100644
---- a/components/sessions/serialized_navigation_entry.cc
-+++ b/components/sessions/serialized_navigation_entry.cc
-@@ -512,32 +512,13 @@ std::vector<NavigationEntry*> SerializedNavigationEntry::ToNavigationEntries(
- }
-
- void SerializedNavigationEntry::Sanitize() {
-- // Store original referrer so we can later see whether it was actually
-- // changed during sanitization, and we need to strip the referrer from the
-- // page state as well.
-- content::Referrer old_referrer = referrer_;
-+ content::Referrer new_referrer =
-+ content::Referrer::SanitizeForRequest(virtual_url_, referrer_);
-
-- if (!referrer_.url.SchemeIsHTTPOrHTTPS())
-- referrer_ = content::Referrer();
-- switch (referrer_.policy) {
-- case blink::WebReferrerPolicyNever:
-- referrer_.url = GURL();
-- break;
-- case blink::WebReferrerPolicyAlways:
-- break;
-- case blink::WebReferrerPolicyOrigin:
-- referrer_.url = referrer_.url.GetWithEmptyPath();
-- break;
-- case blink::WebReferrerPolicyDefault:
-- // Fall through.
-- default:
-- referrer_.policy = blink::WebReferrerPolicyDefault;
-- if (referrer_.url.SchemeIsSecure() && !virtual_url_.SchemeIsSecure())
-- referrer_.url = GURL();
-- }
--
-- if (referrer_.url != old_referrer.url ||
-- referrer_.policy != old_referrer.policy) {
-+ // No need to compare the policy, as it doesn't change during
-+ // sanitization. If there has been a change, the referrer needs to be
-+ // stripped from the page state as well.
-+ if (referrer_.url != new_referrer.url) {
- referrer_ = content::Referrer();
- page_state_ = page_state_.RemoveReferrer();
- }
-Index: content/public/common/referrer.h
-diff --git a/content/public/common/referrer.h b/content/public/common/referrer.h
-index b10bfd6c28e6cd96f6e44a5a2070904693fae979..122c5ead79096c2fb148d11206e8071f48671074 100644
---- a/content/public/common/referrer.h
-+++ b/content/public/common/referrer.h
-@@ -5,6 +5,7 @@
- #ifndef CONTENT_PUBLIC_COMMON_REFERRER_H_
- #define CONTENT_PUBLIC_COMMON_REFERRER_H_
-
-+#include "base/logging.h"
- #include "content/common/content_export.h"
- #include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
- #include "url/gurl.h"
-@@ -23,6 +24,38 @@ struct CONTENT_EXPORT Referrer {
-
- GURL url;
- blink::WebReferrerPolicy policy;
-+
-+ static Referrer SanitizeForRequest(const GURL& request,
-+ const Referrer& referrer) {
-+ Referrer sanitized_referrer(referrer.url.GetAsReferrer(), referrer.policy);
-+
-+ if (!request.SchemeIsHTTPOrHTTPS() ||
-+ !sanitized_referrer.url.SchemeIsHTTPOrHTTPS()) {
-+ sanitized_referrer.url = GURL();
-+ return sanitized_referrer;
-+ }
-+
-+ switch (sanitized_referrer.policy) {
-+ case blink::WebReferrerPolicyDefault:
-+ if (sanitized_referrer.url.SchemeIsSecure() &&
-+ !request.SchemeIsSecure()) {
-+ sanitized_referrer.url = GURL();
-+ }
-+ break;
-+ case blink::WebReferrerPolicyAlways:
-+ break;
-+ case blink::WebReferrerPolicyNever:
-+ sanitized_referrer.url = GURL();
-+ break;
-+ case blink::WebReferrerPolicyOrigin:
-+ sanitized_referrer.url = sanitized_referrer.url.GetOrigin();
-+ break;
-+ default:
-+ NOTREACHED();
-+ break;
-+ }
-+ return sanitized_referrer;
-+ }
- };
-
- } // namespace content
Deleted: chromium-use-correct-referrer-policy.patch
===================================================================
--- chromium-use-correct-referrer-policy.patch 2014-10-08 20:14:26 UTC (rev 224124)
+++ chromium-use-correct-referrer-policy.patch 2014-10-08 21:10:49 UTC (rev 224125)
@@ -1,32 +0,0 @@
-Index: Source/core/loader/FrameFetchContext.cpp
-diff --git a/Source/core/loader/FrameFetchContext.cpp b/Source/core/loader/FrameFetchContext.cpp
-index 568016488c89ed1360a5158240120be5e958e963..5604f912d567f54875724432e5262c8748c5b749 100644
---- a/Source/core/loader/FrameFetchContext.cpp
-+++ b/Source/core/loader/FrameFetchContext.cpp
-@@ -61,20 +61,23 @@ void FrameFetchContext::addAdditionalRequestHeaders(Document* document, Resource
- bool isMainResource = type == FetchMainResource;
- if (!isMainResource) {
- String outgoingReferrer;
-+ ReferrerPolicy referrerPolicy;
- String outgoingOrigin;
- if (request.httpReferrer().isNull()) {
- outgoingReferrer = document->outgoingReferrer();
-+ referrerPolicy = document->referrerPolicy();
- outgoingOrigin = document->outgoingOrigin();
- } else {
- outgoingReferrer = request.httpReferrer();
-+ referrerPolicy = request.referrerPolicy();
- outgoingOrigin = SecurityOrigin::createFromString(outgoingReferrer)->toString();
- }
-
-- outgoingReferrer = SecurityPolicy::generateReferrerHeader(document->referrerPolicy(), request.url(), outgoingReferrer);
-+ outgoingReferrer = SecurityPolicy::generateReferrerHeader(referrerPolicy, request.url(), outgoingReferrer);
- if (outgoingReferrer.isEmpty())
- request.clearHTTPReferrer();
-- else if (!request.httpReferrer())
-- request.setHTTPReferrer(Referrer(outgoingReferrer, document->referrerPolicy()));
-+ else
-+ request.setHTTPReferrer(Referrer(outgoingReferrer, referrerPolicy));
-
- request.addHTTPOriginIfNeeded(AtomicString(outgoingOrigin));
- }
More information about the arch-commits
mailing list