diff --git a/www/chromium/Makefile b/www/chromium/Makefile index 40203745e68a..563907ae0d30 100644 --- a/www/chromium/Makefile +++ b/www/chromium/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= chromium -PORTVERSION= 39.0.2171.99 -PORTREVISION= 1 +PORTVERSION= 40.0.2214.93 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} @@ -42,7 +41,6 @@ LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ libjpeg.so:${PORTSDIR}/graphics/jpeg \ libjsoncpp.so:${PORTSDIR}/devel/jsoncpp \ libnspr4.so:${PORTSDIR}/devel/nspr \ - libprotobuf.so:${PORTSDIR}/devel/protobuf \ libpng.so:${PORTSDIR}/graphics/png \ libre2.so:${PORTSDIR}/devel/re2 \ libsnappy.so:${PORTSDIR}/archivers/snappy \ @@ -107,7 +105,7 @@ GYP_DEFINES+= \ use_system_libxml=1 \ use_system_libxslt=1 \ use_system_nspr=1 \ - use_system_protobuf=1 \ + use_system_protobuf=0 \ use_system_re2=1 \ use_system_snappy=1 \ use_system_speex=1 \ @@ -220,7 +218,7 @@ CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ pre-everything:: @${ECHO_MSG} - @${ECHO_MSG} "To build Chromium, you should have around 1 GB of memory" + @${ECHO_MSG} "To build Chromium, you should have around 2 GB of memory" .if ${PORT_OPTIONS:MDEBUG} @${ECHO_MSG} "and lots of free diskspace (~ 8.5GB)." .else @@ -275,6 +273,9 @@ pre-configure: 'third_party/gardiner_mod' \ 'third_party/fips181' \ 'third_party/flot' \ + 'third_party/google_input_tools' \ + 'third_party/google_input_tools/third_party/closure_library' \ + 'third_party/google_input_tools/third_party/closure_library/third_party/closure' \ 'third_party/hunspell' \ 'third_party/iccjpeg' \ 'third_party/icu/icu.isolate' \ @@ -299,12 +300,14 @@ pre-configure: 'third_party/modp_b64' \ 'third_party/mt19937ar' \ 'third_party/npapi' \ + 'third_party/openmax_dl' \ 'third_party/opus' \ 'third_party/ots' \ 'third_party/pdfium' \ 'third_party/pdfium/third_party' \ 'third_party/ply' \ 'third_party/polymer' \ + 'third_party/protobuf' \ 'third_party/pywebsocket' \ 'third_party/qcms' \ 'third_party/qunit' \ @@ -329,7 +332,7 @@ pre-configure: 'third_party/zlib' \ 'url/third_party/mozilla' \ 'v8/src/third_party/valgrind' \ - 'v8/third_party/fdlibm' \ + 'v8/src/third_party/fdlibm' \ --do-remove || ${FALSE} cd ${WRKSRC} && ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gyp_files.py \ diff --git a/www/chromium/distinfo b/www/chromium/distinfo index 9cc67473ae17..9365014abe89 100644 --- a/www/chromium/distinfo +++ b/www/chromium/distinfo @@ -1,4 +1,4 @@ -SHA256 (chromium-39.0.2171.99.tar.xz) = 6d527003a7dc3256a266d33fa42185c75934efd6de14f51cde345701ba2ae449 -SIZE (chromium-39.0.2171.99.tar.xz) = 253080280 -SHA256 (chromium-39.0.2171.99-testdata.tar.xz) = 2daf63226cfb78b7c67a1ddfd7d105e61392020f1b7484495174468e636275ae -SIZE (chromium-39.0.2171.99-testdata.tar.xz) = 115235592 +SHA256 (chromium-40.0.2214.93.tar.xz) = c4937596bc02d346a89543a6b5bd0fab9f45e34f3ce20dee94dc132a95c990de +SIZE (chromium-40.0.2214.93.tar.xz) = 284982688 +SHA256 (chromium-40.0.2214.93-testdata.tar.xz) = 883761dd8f559c849f0998fbf4144f2d35a171a8fff67dbc464e3bb8a5da552b +SIZE (chromium-40.0.2214.93-testdata.tar.xz) = 115343772 diff --git a/www/chromium/files/extra-patch-clang b/www/chromium/files/extra-patch-clang index a2f23b04f4ba..64a93adb8977 100644 --- a/www/chromium/files/extra-patch-clang +++ b/www/chromium/files/extra-patch-clang @@ -189,17 +189,17 @@ CMapFormat::kFormat4, cmap_id) { } ---- v8/src/runtime.cc.orig 2013-11-08 08:01:04.000000000 +0100 -+++ v8/src/runtime.cc 2013-11-15 13:17:39.000000000 +0100 -@@ -14043,7 +14043,7 @@ +--- v8/src/runtime/runtime-i18n.cc.orig 2015-01-25 15:08:31.732972197 +0100 ++++ v8/src/runtime/runtime-i18n.cc 2015-01-25 15:09:04.260951597 +0100 +@@ -626,7 +626,7 @@ local_object->SetInternalField(0, reinterpret_cast(break_iterator)); // Make sure that the pointer to adopted text is NULL. - local_object->SetInternalField(1, reinterpret_cast(NULL)); + local_object->SetInternalField(1, static_cast(NULL)); - RETURN_IF_EMPTY_HANDLE(isolate, - JSObject::SetLocalPropertyIgnoreAttributes( + Factory* factory = isolate->factory(); + Handle key = factory->NewStringFromStaticChars("breakIterator"); --- base/strings/safe_sprintf_unittest.cc.orig 2013-11-08 07:42:08.000000000 +0100 +++ base/strings/safe_sprintf_unittest.cc 2013-11-15 15:04:45.000000000 +0100 @@ -721,12 +721,14 @@ @@ -256,3 +256,34 @@ } static Unique CreateImmovable(Handle handle) { +--- third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc.orig 2015-01-25 14:52:44 UTC ++++ third_party/webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc +@@ -2072,7 +2072,7 @@ + + const AudioEncoder* AudioCodingImpl::GetSenderInfo() const { + FATAL() << "Not implemented yet."; +- return reinterpret_cast(NULL); ++ return static_cast(NULL); + } + + const CodecInst* AudioCodingImpl::GetSenderCodecInst() { +@@ -2091,7 +2091,7 @@ + + const ReceiverInfo* AudioCodingImpl::GetReceiverInfo() const { + FATAL() << "Not implemented yet."; +- return reinterpret_cast(NULL); ++ return static_cast(NULL); + } + + bool AudioCodingImpl::RegisterReceiveCodec(AudioDecoder* receive_codec) { +--- v8/src/debug.cc.orig 2015-01-25 14:39:37 UTC ++++ v8/src/debug.cc +@@ -565,7 +565,7 @@ + thread_local_.step_out_fp_ = 0; + // TODO(isolates): frames_are_dropped_? + base::NoBarrier_Store(&thread_local_.current_debug_scope_, +- static_cast(NULL)); ++ reinterpret_cast(NULL)); + thread_local_.restarter_frame_function_pointer_ = NULL; + } + diff --git a/www/chromium/files/extra-patch-gcc b/www/chromium/files/extra-patch-gcc index cd1038aeb1f9..b5d703e412d6 100644 --- a/www/chromium/files/extra-patch-gcc +++ b/www/chromium/files/extra-patch-gcc @@ -66,8 +66,8 @@ #include #elif defined(USE_LIBJPEG_TURBO) #include "third_party/libjpeg_turbo/jpeglib.h" ---- third_party/webrtc/common_audio/wav_writer.h.orig 2014-10-17 02:57:34.000000000 +0200 -+++ third_party/webrtc/common_audio/wav_writer.h 2014-10-18 12:04:03.000000000 +0200 +--- third_party/webrtc/common_audio/wav_file.h.orig 2014-10-17 02:57:34.000000000 +0200 ++++ third_party/webrtc/common_audio/wav_file.h 2014-10-18 12:04:03.000000000 +0200 @@ -14,6 +14,7 @@ #ifdef __cplusplus diff --git a/www/chromium/files/patch-cc__layers__layer_impl.cc b/www/chromium/files/patch-cc__layers__layer_impl.cc index a119a2c95bf7..f001be45176e 100644 --- a/www/chromium/files/patch-cc__layers__layer_impl.cc +++ b/www/chromium/files/patch-cc__layers__layer_impl.cc @@ -1,32 +1,32 @@ ---- cc/layers/layer_impl.cc.orig 2014-10-10 09:15:29 UTC +--- cc/layers/layer_impl.cc.orig 2015-01-20 21:28:14 UTC +++ cc/layers/layer_impl.cc -@@ -1202,21 +1202,23 @@ +@@ -1239,21 +1239,23 @@ scale_factor * scaled_scroll_bounds.height()); scaled_scroll_bounds = gfx::ToFlooredSize(scaled_scroll_bounds); -- gfx::Vector2dF max_offset( +- gfx::ScrollOffset max_offset( + // (rene) prevent name collision with /usr/include/vm/vm_map.h on FreeBSD + // which also defines max_offset -+ gfx::Vector2dF _max_offset( ++ gfx::ScrollOffset _max_offset( scaled_scroll_bounds.width() - scroll_clip_layer_->bounds().width(), scaled_scroll_bounds.height() - scroll_clip_layer_->bounds().height()); // We need the final scroll offset to be in CSS coords. - max_offset.Scale(1 / scale_factor); -- max_offset.SetToMax(gfx::Vector2dF()); -- return gfx::ToFlooredVector2d(max_offset); +- max_offset.SetToMax(gfx::ScrollOffset()); +- return max_offset; + _max_offset.Scale(1 / scale_factor); -+ _max_offset.SetToMax(gfx::Vector2dF()); -+ return gfx::ToFlooredVector2d(_max_offset); ++ _max_offset.SetToMax(gfx::ScrollOffset()); ++ return _max_offset; } gfx::Vector2dF LayerImpl::ClampScrollToMaxScrollOffset() { -- gfx::Vector2dF max_offset = MaxScrollOffset(); -+ gfx::Vector2dF _max_offset = MaxScrollOffset(); - gfx::Vector2dF old_offset = TotalScrollOffset(); - gfx::Vector2dF clamped_offset = old_offset; +- gfx::ScrollOffset max_offset = MaxScrollOffset(); ++ gfx::ScrollOffset _max_offset = MaxScrollOffset(); + gfx::ScrollOffset old_offset = TotalScrollOffset(); + gfx::ScrollOffset clamped_offset = old_offset; - clamped_offset.SetToMin(max_offset); + clamped_offset.SetToMin(_max_offset); - clamped_offset.SetToMax(gfx::Vector2d()); - gfx::Vector2dF delta = clamped_offset - old_offset; + clamped_offset.SetToMax(gfx::ScrollOffset()); + gfx::Vector2dF delta = clamped_offset.DeltaFrom(old_offset); if (!delta.IsZero()) diff --git a/www/chromium/files/patch-chrome__app__chrome_main_delegate.h b/www/chromium/files/patch-chrome__app__chrome_main_delegate.h index 88c7f7a84ee3..f13cce762932 100644 --- a/www/chromium/files/patch-chrome__app__chrome_main_delegate.h +++ b/www/chromium/files/patch-chrome__app__chrome_main_delegate.h @@ -1,11 +1,11 @@ ---- chrome/app/chrome_main_delegate.h.orig 2014-10-10 09:15:29 UTC +--- chrome/app/chrome_main_delegate.h.orig 2015-01-21 20:05:38 UTC +++ chrome/app/chrome_main_delegate.h -@@ -38,7 +38,7 @@ - virtual bool ShouldSendMachPort(const std::string& process_type) OVERRIDE; - virtual bool DelaySandboxInitialization( - const std::string& process_type) OVERRIDE; +@@ -37,7 +37,7 @@ + const std::string& process_type) override; + bool ShouldSendMachPort(const std::string& process_type) override; + bool DelaySandboxInitialization(const std::string& process_type) override; -#elif defined(OS_POSIX) && !defined(OS_ANDROID) +#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) - virtual void ZygoteStarting( - ScopedVector* delegates) OVERRIDE; - virtual void ZygoteForked() OVERRIDE; + void ZygoteStarting( + ScopedVector* delegates) override; + void ZygoteForked() override; diff --git a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h index 64c5e79358dc..541d3a7d2d55 100644 --- a/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h +++ b/www/chromium/files/patch-chrome__browser__chrome_content_browser_client.h @@ -1,11 +1,11 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2014-10-10 09:15:30 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2015-01-21 20:28:15 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -278,7 +278,7 @@ - virtual net::CookieStore* OverrideCookieStoreForRenderProcess( - int render_process_id) OVERRIDE; +@@ -262,7 +262,7 @@ + net::CookieStore* OverrideCookieStoreForRenderProcess( + int render_process_id) override; -#if defined(OS_POSIX) && !defined(OS_MACOSX) +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - virtual void GetAdditionalMappedFilesForChildProcess( + void GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, diff --git a/www/chromium/files/patch-chrome__browser__download__download_prefs.cc b/www/chromium/files/patch-chrome__browser__download__download_prefs.cc new file mode 100644 index 000000000000..4def71f899af --- /dev/null +++ b/www/chromium/files/patch-chrome__browser__download__download_prefs.cc @@ -0,0 +1,65 @@ +--- chrome/browser/download/download_prefs.cc.orig 2015-01-24 21:51:37 UTC ++++ chrome/browser/download/download_prefs.cc +@@ -51,7 +51,7 @@ + // Consider downloads 'dangerous' if they go to the home directory on Linux and + // to the desktop on any platform. + bool DownloadPathIsDangerous(const base::FilePath& download_path) { +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + base::FilePath home_dir = base::GetHomeDir(); + if (download_path == home_dir) { + return true; +@@ -131,7 +131,7 @@ + GetDefaultDownloadDirectoryForProfile())); + #endif // defined(OS_CHROMEOS) + +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + should_open_pdf_in_system_reader_ = + prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); +@@ -205,7 +205,7 @@ + prefs::kSaveFileDefaultDirectory, + default_download_path, + user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF); +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + registry->RegisterBooleanPref( + prefs::kOpenPdfDownloadInSystemReader, +@@ -286,7 +286,7 @@ + } + + bool DownloadPrefs::IsAutoOpenUsed() const { +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + if (ShouldOpenPdfInSystemReader()) + return true; +@@ -301,7 +301,7 @@ + return false; + DCHECK(extension[0] == base::FilePath::kExtensionSeparator); + extension.erase(0, 1); +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + if (extension == FILE_PATH_LITERAL("pdf") && ShouldOpenPdfInSystemReader()) + return true; +@@ -333,7 +333,7 @@ + SaveAutoOpenState(); + } + +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { + if (should_open_pdf_in_system_reader_ == should_open) +@@ -355,7 +355,7 @@ + #endif + + void DownloadPrefs::ResetAutoOpen() { +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + SetShouldOpenPdfInSystemReader(false); + #endif diff --git a/www/chromium/files/patch-chrome__browser__download__download_prefs.h b/www/chromium/files/patch-chrome__browser__download__download_prefs.h new file mode 100644 index 000000000000..5c7dffe4cc1b --- /dev/null +++ b/www/chromium/files/patch-chrome__browser__download__download_prefs.h @@ -0,0 +1,20 @@ +--- chrome/browser/download/download_prefs.h.orig 2015-01-24 21:53:47 UTC ++++ chrome/browser/download/download_prefs.h +@@ -73,7 +73,7 @@ + // Disables auto-open based on file extension. + void DisableAutoOpenBasedOnExtension(const base::FilePath& file_name); + +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + // Store the user preference to disk. If |should_open| is true, also disable + // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin. +@@ -105,7 +105,7 @@ + AutoOpenCompareFunctor> AutoOpenSet; + AutoOpenSet auto_open_; + +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + bool should_open_pdf_in_system_reader_; + #endif diff --git a/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc b/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc new file mode 100644 index 000000000000..85243a4a6a0f --- /dev/null +++ b/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.cc @@ -0,0 +1,46 @@ +--- chrome/browser/download/download_shelf_context_menu.cc.orig 2015-01-24 21:45:08 UTC ++++ chrome/browser/download/download_shelf_context_menu.cc +@@ -122,7 +122,7 @@ + return download_item_->GetOpenWhenComplete() || + download_crx_util::IsExtensionDownload(*download_item_); + case ALWAYS_OPEN_TYPE: +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + if (CanOpenPdfInSystemViewer()) { + DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( +@@ -162,7 +162,7 @@ + bool is_checked = IsCommandIdChecked(ALWAYS_OPEN_TYPE); + DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext( + download_item_->GetBrowserContext()); +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + if (CanOpenPdfInSystemViewer()) { + prefs->SetShouldOpenPdfInSystemReader(!is_checked); +@@ -390,14 +390,14 @@ + #if defined(OS_WIN) + if (CanOpenPdfInSystemViewer()) + return IDS_DOWNLOAD_MENU_ALWAYS_OPEN_PDF_IN_READER; +-#elif defined(OS_MACOSX) || defined(OS_LINUX) ++#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + if (CanOpenPdfInSystemViewer()) + return IDS_DOWNLOAD_MENU_PLATFORM_OPEN_ALWAYS; + #endif + return IDS_DOWNLOAD_MENU_ALWAYS_OPEN_TYPE; + } + +-#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) ++#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + bool DownloadShelfContextMenu::IsDownloadPdf() const { + base::FilePath path = download_item_->GetTargetFilePath(); + return path.MatchesExtension(FILE_PATH_LITERAL(".pdf")); +@@ -409,7 +409,7 @@ + return IsDownloadPdf() && + (IsAdobeReaderDefaultPDFViewer() ? is_adobe_pdf_reader_up_to_date_ : + true); +-#elif defined(OS_MACOSX) || defined(OS_LINUX) ++#elif defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_BSD) + return IsDownloadPdf(); + #endif + } diff --git a/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.h b/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.h new file mode 100644 index 000000000000..27e8d6f9dd65 --- /dev/null +++ b/www/chromium/files/patch-chrome__browser__download__download_shelf_context_menu.h @@ -0,0 +1,11 @@ +--- chrome/browser/download/download_shelf_context_menu.h.orig 2015-01-24 22:48:53 UTC ++++ chrome/browser/download/download_shelf_context_menu.h +@@ -75,7 +75,7 @@ + + int GetAlwaysOpenStringId() const; + +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + bool IsDownloadPdf() const; + bool CanOpenPdfInSystemViewer() const; diff --git a/www/chromium/files/patch-chrome__browser__process_singleton_posix.cc b/www/chromium/files/patch-chrome__browser__process_singleton_posix.cc new file mode 100644 index 000000000000..78cfdc3a40c2 --- /dev/null +++ b/www/chromium/files/patch-chrome__browser__process_singleton_posix.cc @@ -0,0 +1,34 @@ +--- chrome/browser/process_singleton_posix.cc.orig 2015-01-26 10:20:41 UTC ++++ chrome/browser/process_singleton_posix.cc +@@ -82,11 +82,11 @@ + #include "net/base/net_util.h" + #include "ui/base/l10n/l10n_util.h" + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + #include "chrome/browser/ui/process_singleton_dialog_linux.h" + #endif + +-#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + #include "ui/views/linux_ui/linux_ui.h" + #endif + +@@ -322,7 +322,7 @@ + if (g_disable_prompt) + return false; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + base::string16 relaunch_button_text = l10n_util::GetStringUTF16( + IDS_PROFILE_IN_USE_LINUX_RELAUNCH); + return ShowProcessSingletonDialog(error, relaunch_button_text); +@@ -880,7 +880,7 @@ + // The other process is shutting down, it's safe to start a new process. + return PROCESS_NONE; + } else if (strncmp(buf, kACKToken, arraysize(kACKToken) - 1) == 0) { +-#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // Likely NULL in unit tests. + views::LinuxUI* linux_ui = views::LinuxUI::instance(); + if (linux_ui) diff --git a/www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc b/www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc new file mode 100644 index 000000000000..ec8d55aab962 --- /dev/null +++ b/www/chromium/files/patch-chrome__browser__renderer_preferences_util.cc @@ -0,0 +1,38 @@ +--- chrome/browser/renderer_preferences_util.cc.orig 2015-01-26 10:24:50 UTC ++++ chrome/browser/renderer_preferences_util.cc +@@ -13,7 +13,7 @@ + #include "content/public/common/renderer_preferences.h" + #include "third_party/skia/include/core/SkColor.h" + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + #include "ui/gfx/font_render_params.h" + #endif + +@@ -25,7 +25,7 @@ + #include "ui/views/controls/textfield/textfield.h" + #endif + +-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + #include "chrome/browser/themes/theme_service.h" + #include "chrome/browser/themes/theme_service_factory.h" + #include "ui/views/linux_ui/linux_ui.h" +@@ -71,7 +71,7 @@ + prefs->caret_blink_interval = views::Textfield::GetCaretBlinkMs() / 1000.0; + #endif + +-#if defined(USE_AURA) && defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(USE_AURA) && (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + views::LinuxUI* linux_ui = views::LinuxUI::instance(); + if (linux_ui) { + if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { +@@ -93,7 +93,7 @@ + } + #endif + +-#if defined(OS_LINUX) || defined(OS_ANDROID) ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_BSD) + CR_DEFINE_STATIC_LOCAL(const gfx::FontRenderParams, params, + (gfx::GetFontRenderParams(gfx::FontRenderParamsQuery(true), NULL))); + prefs->should_antialias_text = params.antialiasing; diff --git a/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc b/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc index 0bb8ea5cfc7a..bce8d365d6e7 100644 --- a/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc +++ b/www/chromium/files/patch-chrome__browser__ssl__ssl_blocking_page.cc @@ -1,16 +1,16 @@ ---- chrome/browser/ssl/ssl_blocking_page.cc.orig 2014-10-10 09:15:30 UTC +--- chrome/browser/ssl/ssl_blocking_page.cc.orig 2015-01-21 20:28:15 UTC +++ chrome/browser/ssl/ssl_blocking_page.cc -@@ -234,7 +234,7 @@ - // settings. Weird. TODO(palmer): Do something more graceful than ignoring - // the user's click! crbug.com/394993 - return; +@@ -237,7 +237,7 @@ + #elif defined(OS_IOS) + // iOS does not have a way to launch the date and time settings. + NOTREACHED(); -#elif defined(OS_LINUX) +#elif defined(OS_LINUX) || defined(OS_BSD) struct ClockCommand { const char* pathname; const char* argument; -@@ -284,7 +284,7 @@ - #if !defined(OS_CHROMEOS) +@@ -289,7 +289,7 @@ + #if !defined(OS_CHROMEOS) && !defined(OS_ANDROID) base::LaunchOptions options; options.wait = false; -#if defined(OS_LINUX) diff --git a/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc b/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc new file mode 100644 index 000000000000..52566d5138d8 --- /dev/null +++ b/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc.orig 2015-01-26 10:30:44 ++++ chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc +@@ -128,7 +128,7 @@ + } + + void ChromeBrowserMainExtraPartsAura::PreProfileInit() { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // Now that we have some minimal ui initialized, check to see if we're + // running as root and bail if we are. + DetectRunningAsRoot(); +@@ -142,7 +142,7 @@ + // after the metrics service is deleted. + } + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + void ChromeBrowserMainExtraPartsAura::DetectRunningAsRoot() { + if (getuid() == 0) { + const CommandLine& command_line = *CommandLine::ForCurrentProcess(); diff --git a/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.h b/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.h new file mode 100644 index 000000000000..ca430f98618c --- /dev/null +++ b/www/chromium/files/patch-chrome__browser__ui__aura__chrome_browser_main_extra_parts_aura.h @@ -0,0 +1,11 @@ +--- chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h.orig 2015-01-26 10:33:29 ++++ chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h +@@ -25,7 +25,7 @@ + void PostMainMessageLoopRun() override; + + private: +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // On the Linux desktop, we want to prevent the user from logging in as root, + // so that we don't destroy the profile. + void DetectRunningAsRoot(); diff --git a/www/chromium/files/patch-chrome__browser__ui__browser_command_controller.cc b/www/chromium/files/patch-chrome__browser__ui__browser_command_controller.cc index 40b3ff25bcb5..d780be9b25aa 100644 --- a/www/chromium/files/patch-chrome__browser__ui__browser_command_controller.cc +++ b/www/chromium/files/patch-chrome__browser__ui__browser_command_controller.cc @@ -1,20 +1,38 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2014-10-14 21:32:48.000000000 +0200 -+++ chrome/browser/ui/browser_command_controller.cc 2014-10-14 21:22:15.000000000 +0200 -@@ -67,7 +67,7 @@ +--- chrome/browser/ui/browser_command_controller.cc.orig 2015-01-21 20:28:15 UTC ++++ chrome/browser/ui/browser_command_controller.cc +@@ -69,7 +69,7 @@ #include "chrome/browser/ui/browser_commands_chromeos.h" #endif -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h" #endif -@@ -279,7 +279,7 @@ +@@ -281,7 +281,7 @@ if (window()->IsFullscreen() && command_id == IDC_FULLSCREEN) return true; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) // If this key was registered by the user as a content editing hotkey, then // it is not reserved. ui::TextEditKeyBindingsDelegateAuraLinux* delegate = +@@ -469,7 +469,7 @@ + break; + #endif + +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + case IDC_USE_SYSTEM_TITLE_BAR: { + PrefService* prefs = browser_->profile()->GetPrefs(); + prefs->SetBoolean(prefs::kUseCustomChromeFrame, +@@ -898,7 +898,7 @@ + command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_2, true); + command_updater_.UpdateCommandEnabled(IDC_VISIT_DESKTOP_OF_LRU_USER_3, true); + #endif +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + command_updater_.UpdateCommandEnabled(IDC_USE_SYSTEM_TITLE_BAR, true); + #endif + diff --git a/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc b/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc index 587c93a80ec8..c91b5a3519ab 100644 --- a/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc +++ b/www/chromium/files/patch-chrome__browser__ui__startup__startup_browser_creator.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2014-10-10 09:15:30 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2015-01-21 20:28:16 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -80,7 +80,7 @@ +@@ -79,7 +79,7 @@ #include "components/user_manager/user_manager.h" #endif -#if defined(TOOLKIT_VIEWS) && defined(OS_LINUX) +#if defined(TOOLKIT_VIEWS) && (defined(OS_LINUX) || defined(OS_FREEBSD)) - #include "ui/events/x/touch_factory_x11.h" + #include "ui/events/devices/x11/touch_factory_x11.h" #endif diff --git a/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc b/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc new file mode 100644 index 000000000000..0285f4ce3c76 --- /dev/null +++ b/www/chromium/files/patch-chrome__browser__ui__view__tabs__tab_drag_controller.cc @@ -0,0 +1,29 @@ +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2015-01-26 10:43:43 UTC ++++ chrome/browser/ui/views/tabs/tab_drag_controller.cc +@@ -266,7 +266,7 @@ + // synchronous on desktop Linux, so use that. + // - Ash + // Releasing capture on Ash cancels gestures so avoid it. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + can_release_capture_ = false; + #else + can_release_capture_ = +@@ -621,7 +621,7 @@ + // that to effect the position of any windows. + SetWindowPositionManaged(browser_widget->GetNativeWindow(), false); + +-#if !defined(OS_LINUX) || defined(OS_CHROMEOS) ++#if (!defined(OS_LINUX) && !defined(OS_BSD)) || defined(OS_CHROMEOS) + // EndMoveLoop is going to snap the window back to its original location. + // Hide it so users don't see this. Hiding a window in Linux aura causes + // it to lose capture so skip it. +@@ -1791,7 +1791,7 @@ + if (dragged_window) + exclude.insert(dragged_window); + } +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS) + // Exclude windows which are pending deletion via Browser::TabStripEmpty(). + // These windows can be returned in the Linux Aura port because the browser + // window which was used for dragging is not hidden once all of its tabs are diff --git a/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h b/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h index 34680d06cf25..61e948926592 100644 --- a/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h +++ b/www/chromium/files/patch-chrome__browser__ui__views__chrome_views_delegate.h @@ -1,20 +1,20 @@ ---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2014-10-10 09:15:30 UTC +--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2015-01-21 20:28:16 UTC +++ chrome/browser/ui/views/chrome_views_delegate.h -@@ -36,7 +36,7 @@ +@@ -35,7 +35,7 @@ #if defined(OS_WIN) - virtual HICON GetDefaultWindowIcon() const OVERRIDE; - virtual bool IsWindowInMetro(gfx::NativeWindow window) const OVERRIDE; + virtual HICON GetDefaultWindowIcon() const override; + virtual bool IsWindowInMetro(gfx::NativeWindow window) const override; -#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) +#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) - virtual gfx::ImageSkia* GetDefaultWindowIcon() const OVERRIDE; + gfx::ImageSkia* GetDefaultWindowIcon() const override; #endif -@@ -49,7 +49,7 @@ - virtual void OnBeforeWidgetInit( +@@ -48,7 +48,7 @@ + void OnBeforeWidgetInit( views::Widget::InitParams* params, - views::internal::NativeWidgetDelegate* delegate) OVERRIDE; + views::internal::NativeWidgetDelegate* delegate) override; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) +#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) - virtual bool WindowManagerProvidesTitleBar(bool maximized) OVERRIDE; + bool WindowManagerProvidesTitleBar(bool maximized) override; #endif #if defined(USE_AURA) diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc b/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc index 4f2933506505..884167365ec1 100644 --- a/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc +++ b/www/chromium/files/patch-chrome__browser__ui__webui__chrome_web_ui_controller_factory.cc @@ -1,9 +1,9 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2014-10-10 09:15:30 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2015-01-21 20:28:16 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -508,7 +508,7 @@ - url.host() == chrome::kChromeUIMemoryRedirectHost || - url.host() == chrome::kChromeUIStatsHost || - url.host() == chrome::kChromeUITermsHost +@@ -511,7 +511,7 @@ + #if !defined(OS_ANDROID) + || url.host() == chrome::kChromeUITermsHost + #endif -#if defined(OS_LINUX) || defined(OS_OPENBSD) +#if defined(OS_LINUX) || defined(OS_BSD) || url.host() == chrome::kChromeUILinuxProxyConfigHost diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc index e95e0b929f8b..bb92265aed80 100644 --- a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc +++ b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.cc @@ -1,42 +1,38 @@ ---- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2014-10-10 08:54:11 UTC +--- chrome/browser/ui/webui/options/browser_options_handler.cc.orig 2015-01-21 20:28:16 UTC +++ chrome/browser/ui/webui/options/browser_options_handler.cc -@@ -344,7 +344,8 @@ +@@ -359,7 +359,7 @@ { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON }, { "translateEnableTranslate", IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE }, -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \ -+ !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_CHROMEOS) { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS }, { "themesNativeButton", IDS_THEMES_GTK_BUTTON }, { "themesSetClassic", IDS_THEMES_SET_CLASSIC }, -@@ -671,7 +672,8 @@ +@@ -692,7 +692,7 @@ "requestProfilesInfo", base::Bind(&BrowserOptionsHandler::HandleRequestProfilesInfo, base::Unretained(this))); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \ -+ !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_CHROMEOS) web_ui()->RegisterMessageCallback( "themesSetNative", base::Bind(&BrowserOptionsHandler::ThemesSetNative, -@@ -1310,7 +1312,8 @@ +@@ -1342,7 +1342,7 @@ ThemeService* theme_service = ThemeServiceFactory::GetForProfile(profile); bool is_system_theme = false; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \ -+ !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_CHROMEOS) bool profile_is_supervised = profile->IsSupervised(); is_system_theme = theme_service->UsingSystemTheme(); base::FundamentalValue native_theme_enabled(!is_system_theme && -@@ -1332,7 +1335,8 @@ +@@ -1364,7 +1364,7 @@ ThemeServiceFactory::GetForProfile(profile)->UseDefaultTheme(); } -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \ -+ !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_CHROMEOS) void BrowserOptionsHandler::ThemesSetNative(const base::ListValue* args) { content::RecordAction(UserMetricsAction("Options_GtkThemeSet")); Profile* profile = Profile::FromWebUI(web_ui()); diff --git a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h index 3776287a3ba4..3df67d5c7640 100644 --- a/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h +++ b/www/chromium/files/patch-chrome__browser__ui__webui__options__browser_options_handler.h @@ -1,12 +1,11 @@ ---- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2014-10-10 09:15:30 UTC +--- chrome/browser/ui/webui/options/browser_options_handler.h.orig 2015-01-21 20:28:16 UTC +++ chrome/browser/ui/webui/options/browser_options_handler.h -@@ -204,7 +204,8 @@ +@@ -210,7 +210,7 @@ void ObserveThemeChanged(); void ThemesReset(const base::ListValue* args); -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if defined(OS_POSIX) && !defined(OS_CHROMEOS) && !defined(OS_MACOSX) && \ -+ !defined(OS_ANDROID) ++#if defined(OS_POSIX) && !defined(OS_CHROMEOS) void ThemesSetNative(const base::ListValue* args); #endif diff --git a/www/chromium/files/patch-chrome__chrome_tests_unit.gypi b/www/chromium/files/patch-chrome__chrome_tests_unit.gypi deleted file mode 100644 index 1180ff3ec52e..000000000000 --- a/www/chromium/files/patch-chrome__chrome_tests_unit.gypi +++ /dev/null @@ -1,15 +0,0 @@ ---- chrome/chrome_tests_unit.gypi.orig 2014-10-23 01:54:54.000000000 +0200 -+++ chrome/chrome_tests_unit.gypi 2014-10-26 14:01:43.000000000 +0100 -@@ -1878,6 +1878,12 @@ - 'test/ppapi/ppapi_test.h', - ], - }], -+ ['OS=="freebsd"', { -+ 'sources!': [ -+ 'browser/media_galleries/linux/mtp_device_object_enumerator_unittest.cc', -+ 'browser/media_galleries/linux/mtp_device_object_enumerator.h', -+ ], -+ }], - ], - }, - { diff --git a/www/chromium/files/patch-chrome__common__pref_names.cc b/www/chromium/files/patch-chrome__common__pref_names.cc index 23b6abf75f24..89125844384a 100644 --- a/www/chromium/files/patch-chrome__common__pref_names.cc +++ b/www/chromium/files/patch-chrome__common__pref_names.cc @@ -1,11 +1,20 @@ ---- chrome/common/pref_names.cc.orig 2014-10-10 09:15:30 UTC +--- chrome/common/pref_names.cc.orig 2015-01-21 20:28:16 UTC +++ chrome/common/pref_names.cc -@@ -891,7 +891,7 @@ - // Boolean controlling whether SafeSearch is mandatory for Google Web Searches. - const char kForceSafeSearch[] = "settings.force_safesearch"; +@@ -895,7 +895,7 @@ + // supervised users. + const char kRecordHistory[] = "settings.history_recorded"; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) -+#if (defined(OS_LINUX) && !defined(OS_CHROMEOS)) || defined(OS_BSD) ++#if defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD) // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif +@@ -1425,7 +1425,7 @@ + // upgrade a unsafe location to a safe location. + const char kDownloadDirUpgraded[] = "download.directory_upgrade"; + +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + const char kOpenPdfDownloadInSystemReader[] = + "download.open_pdf_in_system_reader"; diff --git a/www/chromium/files/patch-chrome__common__pref_names.h b/www/chromium/files/patch-chrome__common__pref_names.h index 4fd4ed04cd9a..f9c4a959899a 100644 --- a/www/chromium/files/patch-chrome__common__pref_names.h +++ b/www/chromium/files/patch-chrome__common__pref_names.h @@ -1,7 +1,7 @@ ---- chrome/common/pref_names.h.orig 2014-10-10 09:15:30 UTC +--- chrome/common/pref_names.h.orig 2015-01-21 20:28:16 UTC +++ chrome/common/pref_names.h -@@ -289,7 +289,7 @@ - extern const char kForceSafeSearch[]; +@@ -291,7 +291,7 @@ + extern const char kRecordHistory[]; extern const char kDeleteTimePeriod[]; extern const char kLastClearBrowsingDataTime[]; -#if defined(OS_LINUX) && !defined(OS_CHROMEOS) @@ -9,3 +9,12 @@ extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; +@@ -486,7 +486,7 @@ + extern const char kDownloadDefaultDirectory[]; + extern const char kDownloadExtensionsToOpen[]; + extern const char kDownloadDirUpgraded[]; +-#if defined(OS_WIN) || defined(OS_LINUX) || \ ++#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD) || \ + (defined(OS_MACOSX) && !defined(OS_IOS)) + extern const char kOpenPdfDownloadInSystemReader[]; + #endif diff --git a/www/chromium/files/patch-chrome__test__base__testing_browser_process.h b/www/chromium/files/patch-chrome__test__base__testing_browser_process.h index 1a6fb164c5dd..8c6ba2fc9d11 100644 --- a/www/chromium/files/patch-chrome__test__base__testing_browser_process.h +++ b/www/chromium/files/patch-chrome__test__base__testing_browser_process.h @@ -1,13 +1,13 @@ ---- chrome/test/base/testing_browser_process.h.orig 2014-10-10 09:15:30 UTC +--- chrome/test/base/testing_browser_process.h.orig 2015-01-21 20:28:16 UTC +++ chrome/test/base/testing_browser_process.h -@@ -105,8 +105,8 @@ - virtual DownloadStatusUpdater* download_status_updater() OVERRIDE; - virtual DownloadRequestLimiter* download_request_limiter() OVERRIDE; +@@ -103,8 +103,8 @@ + DownloadStatusUpdater* download_status_updater() override; + DownloadRequestLimiter* download_request_limiter() override; -#if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) -- virtual void StartAutoupdateTimer() OVERRIDE {} +- void StartAutoupdateTimer() override {} +#if (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_FREEBSD)) && !defined(OS_CHROMEOS) -+ virtual void StartAutoupdateTimer() /*OVERRIDE*/ {} ++ void StartAutoupdateTimer() /*override*/ {} #endif - virtual ChromeNetLog* net_log() OVERRIDE; + ChromeNetLog* net_log() override; diff --git a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h b/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h index 9fccb9bb7518..891413ab946b 100644 --- a/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h +++ b/www/chromium/files/patch-components__storage_monitor__storage_monitor_freebsd.h @@ -1,4 +1,4 @@ ---- components/storage_monitor/storage_monitor_freebsd.h.orig 2014-10-13 17:11:08 UTC +--- components/storage_monitor/storage_monitor_freebsd.h.orig 2015-01-24 17:14:44 UTC +++ components/storage_monitor/storage_monitor_freebsd.h @@ -0,0 +1,47 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. @@ -36,11 +36,11 @@ + virtual ~StorageMonitorFreeBSD(); + + // Must be called for StorageMonitorFreeBSD to work. -+ virtual void Init() OVERRIDE; ++ virtual void Init() override; + private: + // StorageMonitor implementation. + virtual bool GetStorageInfoForPath(const base::FilePath& path, -+ StorageInfo* device_info) const OVERRIDE; ++ StorageInfo* device_info) const override; + + DISALLOW_COPY_AND_ASSIGN(StorageMonitorFreeBSD); +}; diff --git a/www/chromium/files/patch-content__browser__child_process_launcher.cc b/www/chromium/files/patch-content__browser__child_process_launcher.cc index feeffe620981..f7e92a845f26 100644 --- a/www/chromium/files/patch-content__browser__child_process_launcher.cc +++ b/www/chromium/files/patch-content__browser__child_process_launcher.cc @@ -1,6 +1,6 @@ ---- content/browser/child_process_launcher.cc.orig 2014-10-10 09:15:31 UTC +--- content/browser/child_process_launcher.cc.orig 2015-01-21 20:28:16 UTC +++ content/browser/child_process_launcher.cc -@@ -68,7 +68,7 @@ +@@ -69,7 +69,7 @@ #else terminate_child_on_shutdown_(true) #endif @@ -9,34 +9,42 @@ , zygote_(false) #endif { -@@ -234,7 +234,7 @@ +@@ -190,7 +190,7 @@ + bool launch_elevated = delegate->ShouldLaunchElevated(); + #elif defined(OS_ANDROID) + // Uses |ipcfd_| instead of |ipcfd| on Android. +-#elif defined(OS_MACOSX) ++#elif defined(OS_MACOSX) || defined(OS_BSD) + base::EnvironmentMap env = delegate->GetEnvironment(); + base::ScopedFD ipcfd = delegate->TakeIpcFd(); + #elif defined(OS_POSIX) +@@ -253,7 +253,7 @@ + // We need to close the client end of the IPC channel to reliably detect // child termination. - base::ScopedFD ipcfd_closer(ipcfd); -#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_BSD) - GetContentClient()->browser()-> - GetAdditionalMappedFilesForChildProcess(*cmd_line, child_process_id, - &files_to_register); -@@ -244,7 +244,7 @@ - process_type); + GetContentClient()->browser()->GetAdditionalMappedFilesForChildProcess( + *cmd_line, child_process_id, files_to_register.get()); + if (use_zygote) { +@@ -261,14 +261,14 @@ + cmd_line->argv(), files_to_register.Pass(), process_type); } else // Fall through to the normal posix case below when we're not zygoting. -#endif // !defined(OS_MACOSX) +#endif // !defined(OS_MACOSX) && !defined(OS_BSD) { // Convert FD mapping to FileHandleMappingVector - base::FileHandleMappingVector fds_to_map; -@@ -255,7 +255,7 @@ - base::GlobalDescriptors::kBaseDescriptor)); - } + base::FileHandleMappingVector fds_to_map = + files_to_register->GetMappingWithIDAdjustment( + base::GlobalDescriptors::kBaseDescriptor); -#if !defined(OS_MACOSX) +#if !defined(OS_MACOSX) && !defined(OS_BSD) if (process_type == switches::kRendererProcess) { const int sandbox_fd = RenderSandboxHostLinux::GetInstance()->GetRendererSocket(); -@@ -263,7 +263,7 @@ +@@ -276,7 +276,7 @@ sandbox_fd, GetSandboxFD())); } @@ -45,7 +53,7 @@ // Actually launch the app. base::LaunchOptions options; -@@ -322,7 +322,7 @@ +@@ -335,7 +335,7 @@ base::Bind( &Context::Notify, this_object.get(), @@ -53,8 +61,8 @@ +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) use_zygote, #endif - handle)); -@@ -330,7 +330,7 @@ + base::Passed(base::Process(handle)))); +@@ -343,7 +343,7 @@ } void Notify( @@ -62,9 +70,9 @@ +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) bool zygote, #endif - base::ProcessHandle handle) { -@@ -343,7 +343,7 @@ - if (!handle) + base::Process process) { +@@ -356,7 +356,7 @@ + if (!process_.IsValid()) LOG(ERROR) << "Failed to launch child process"; -#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) @@ -72,7 +80,7 @@ zygote_ = zygote; #endif if (client_) { -@@ -370,7 +370,7 @@ +@@ -383,7 +383,7 @@ BrowserThread::PROCESS_LAUNCHER, FROM_HERE, base::Bind( &Context::TerminateInternal, @@ -80,8 +88,8 @@ +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) zygote_, #endif - process_.handle())); -@@ -387,7 +387,7 @@ + base::Passed(&process_))); +@@ -398,7 +398,7 @@ } static void TerminateInternal( @@ -89,8 +97,8 @@ +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) bool zygote, #endif - base::ProcessHandle handle) { -@@ -401,13 +401,13 @@ + base::Process process) { +@@ -412,13 +412,13 @@ process.Terminate(RESULT_CODE_NORMAL_EXIT); // On POSIX, we must additionally reap the child. #if defined(OS_POSIX) @@ -99,23 +107,23 @@ if (zygote) { // If the renderer was created via a zygote, we have to proxy the reaping // through the zygote process. - ZygoteHostImpl::GetInstance()->EnsureProcessTerminated(handle); + ZygoteHostImpl::GetInstance()->EnsureProcessTerminated(process.Handle()); } else -#endif // !OS_MACOSX +#endif // !OS_MACOSX && !OS_BSD { - base::EnsureProcessTerminated(handle); + base::EnsureProcessTerminated(process.Handle()); } -@@ -428,7 +428,7 @@ +@@ -438,7 +438,7 @@ #if defined(OS_ANDROID) // The fd to close after creating the process. - int ipcfd_; + base::ScopedFD ipcfd_; -#elif defined(OS_POSIX) && !defined(OS_MACOSX) +#elif defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) bool zygote_; #endif }; -@@ -470,7 +470,7 @@ +@@ -479,7 +479,7 @@ *exit_code = context_->exit_code_; return context_->termination_status_; } @@ -123,4 +131,4 @@ +#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) if (context_->zygote_) { context_->termination_status_ = ZygoteHostImpl::GetInstance()-> - GetTerminationStatus(handle, known_dead, &context_->exit_code_); + GetTerminationStatus(context_->process_.Handle(), known_dead, diff --git a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h b/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h index 232b1607615a..3289f4140527 100644 --- a/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h +++ b/www/chromium/files/patch-content__browser__geolocation__wifi_data_provider_freebsd.h @@ -22,8 +22,8 @@ + virtual ~WifiDataProviderFreeBSD(); + + // WifiDataProviderCommon -+ virtual WlanApiInterface* NewWlanApi() OVERRIDE; -+ virtual WifiPollingPolicy* NewPollingPolicy() OVERRIDE; ++ virtual WlanApiInterface* NewWlanApi() override; ++ virtual WifiPollingPolicy* NewPollingPolicy() override; + + DISALLOW_COPY_AND_ASSIGN(WifiDataProviderFreeBSD); +}; diff --git a/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc b/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc index 4de93c357fe6..bf94565db748 100644 --- a/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc +++ b/www/chromium/files/patch-content__browser__renderer_host__render_widget_host_view_aura.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2014-10-02 19:39:47.000000000 +0200 -+++ content/browser/renderer_host/render_widget_host_view_aura.cc 2014-10-15 19:03:21.000000000 +0200 -@@ -88,7 +88,7 @@ +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2015-01-21 20:28:16 UTC ++++ content/browser/renderer_host/render_widget_host_view_aura.cc +@@ -89,7 +89,7 @@ #include "ui/gfx/win/dpi.h" #endif @@ -9,7 +9,7 @@ #include "content/common/input_messages.h" #include "ui/events/linux/text_edit_command_auralinux.h" #include "ui/events/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -653,7 +653,7 @@ +@@ -677,7 +677,7 @@ if (host) return reinterpret_cast(host->GetAcceleratedWidget()); #endif @@ -18,7 +18,16 @@ } gfx::NativeViewAccessible RenderWidgetHostViewAura::GetNativeViewAccessible() { -@@ -2418,7 +2418,7 @@ +@@ -2326,7 +2326,7 @@ + } + + bool RenderWidgetHostViewAura::NeedsMouseCapture() { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + return NeedsInputGrab(); + #endif + return false; +@@ -2542,7 +2542,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEvent( const NativeWebKeyboardEvent& event) { diff --git a/www/chromium/files/patch-content__gpu__gpu_main.cc b/www/chromium/files/patch-content__gpu__gpu_main.cc index 75d27c4c7033..8bf02344a167 100644 --- a/www/chromium/files/patch-content__gpu__gpu_main.cc +++ b/www/chromium/files/patch-content__gpu__gpu_main.cc @@ -1,6 +1,6 @@ ---- content/gpu/gpu_main.cc.orig 2014-10-10 08:54:14 UTC +--- content/gpu/gpu_main.cc.orig 2015-01-21 20:28:16 UTC +++ content/gpu/gpu_main.cc -@@ -72,7 +72,7 @@ +@@ -73,7 +73,7 @@ const CommandLine& command_line); bool WarmUpSandbox(const CommandLine& command_line); @@ -9,7 +9,32 @@ bool CollectGraphicsInfo(gpu::GPUInfo& gpu_info); #endif -@@ -268,7 +268,7 @@ +@@ -162,13 +162,13 @@ + message_loop_type = base::MessageLoop::TYPE_UI; + } + base::MessageLoop main_message_loop(message_loop_type); +-#elif defined(OS_LINUX) && defined(USE_X11) ++#elif (defined(OS_BSD) || defined(OS_LINUX)) && defined(USE_X11) + // We need a UI loop so that we can grab the Expose events. See GLSurfaceGLX + // and https://crbug.com/326995. + base::MessageLoop main_message_loop(base::MessageLoop::TYPE_UI); + scoped_ptr event_source = + ui::PlatformEventSource::CreateDefault(); +-#elif defined(OS_LINUX) ++#elif defined(OS_LINUX) || defined(OS_BSD) + base::MessageLoop main_message_loop(base::MessageLoop::TYPE_DEFAULT); + #elif defined(OS_MACOSX) + // This is necessary for CoreAnimation layers hosted in the GPU process to be +@@ -216,7 +216,7 @@ + // Temporarily disable DRI3 on desktop Linux. + // The GPU process is crashing on DRI3-enabled desktop Linux systems. + // TODO(jorgelo): remove this when crbug.com/415681 is fixed. +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if (defined(OS_BSD) || defined(OS_LINUX)) && !defined(OS_CHROMEOS) + { + scoped_ptr env(base::Environment::Create()); + env->SetVar("LIBGL_DRI3_DISABLE", "1"); +@@ -279,7 +279,7 @@ // and we already registered them through SetGpuInfo() above. base::TimeTicks before_collect_context_graphics_info = base::TimeTicks::Now(); @@ -18,7 +43,7 @@ if (!CollectGraphicsInfo(gpu_info)) dead_on_arrival = true; -@@ -401,7 +401,7 @@ +@@ -412,7 +412,7 @@ return true; } diff --git a/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc b/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc similarity index 71% rename from www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc rename to www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc index 7c869222a7d1..687d4165948b 100644 --- a/www/chromium/files/patch-content__renderer__renderer_webkitplatformsupport_impl.cc +++ b/www/chromium/files/patch-content__renderer__renderer_blink_platform_impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/renderer_webkitplatformsupport_impl.cc.orig 2014-10-10 09:15:31 UTC -+++ content/renderer/renderer_webkitplatformsupport_impl.cc -@@ -92,7 +92,7 @@ +--- content/renderer/renderer_blink_platform_impl.cc.orig 2015-01-21 20:28:17 UTC ++++ content/renderer/renderer_blink_platform_impl.cc +@@ -96,7 +96,7 @@ #if defined(OS_POSIX) #include "base/file_descriptor_posix.h" @@ -9,7 +9,7 @@ #include #include -@@ -184,7 +184,7 @@ +@@ -190,7 +190,7 @@ scoped_refptr thread_safe_sender_; }; @@ -17,17 +17,17 @@ +#if defined(OS_ANDROID) || defined(OS_BSD) // WebKit doesn't use WebSandboxSupport on android so we don't need to // implement anything here. - class RendererWebKitPlatformSupportImpl::SandboxSupport { -@@ -277,7 +277,7 @@ + class RendererBlinkPlatformImpl::SandboxSupport {}; +@@ -293,7 +293,7 @@ } - blink::WebSandboxSupport* RendererWebKitPlatformSupportImpl::sandboxSupport() { + blink::WebSandboxSupport* RendererBlinkPlatformImpl::sandboxSupport() { -#if defined(OS_ANDROID) +#if defined(OS_ANDROID) || defined(OS_BSD) // WebKit doesn't use WebSandboxSupport on android. return NULL; #else -@@ -573,7 +573,7 @@ +@@ -583,7 +583,7 @@ return FontLoader::CGFontRefFromBuffer(font_data, font_data_size, out); } diff --git a/www/chromium/files/patch-device__media_transfer_protocol__media_transfer_protocol_manager.h b/www/chromium/files/patch-device__media_transfer_protocol__media_transfer_protocol_manager.h deleted file mode 100644 index c5d7508273ce..000000000000 --- a/www/chromium/files/patch-device__media_transfer_protocol__media_transfer_protocol_manager.h +++ /dev/null @@ -1,13 +0,0 @@ ---- device/media_transfer_protocol/media_transfer_protocol_manager.h.orig 2014-10-23 00:53:03.000000000 +0200 -+++ device/media_transfer_protocol/media_transfer_protocol_manager.h 2014-10-26 11:53:02.000000000 +0100 -@@ -12,8 +12,8 @@ - #include "base/memory/ref_counted.h" - #include "build/build_config.h" - --#if !defined(OS_LINUX) --#error "Only used on Linux and ChromeOS" -+#if !defined(OS_LINUX) && !defined(OS_FREEBSD) -+#error "Only used on Linux and ChromeOS and FreeBSD" - #endif - - class MtpFileEntry; diff --git a/www/chromium/files/patch-device__serial__serial_service_impl.cc b/www/chromium/files/patch-device__serial__serial_service_impl.cc new file mode 100644 index 000000000000..371c04f21e81 --- /dev/null +++ b/www/chromium/files/patch-device__serial__serial_service_impl.cc @@ -0,0 +1,17 @@ +--- device/serial/serial_service_impl.cc.orig 2015-01-21 20:05:43 UTC ++++ device/serial/serial_service_impl.cc +@@ -72,9 +72,14 @@ + } + + SerialDeviceEnumerator* SerialServiceImpl::GetDeviceEnumerator() { ++#if defined(OS_BSD) ++ NOTIMPLEMENTED(); ++ return NULL; ++#else + if (!device_enumerator_) + device_enumerator_ = SerialDeviceEnumerator::Create(); + return device_enumerator_.get(); ++#endif + } + + bool SerialServiceImpl::IsValidPath(const mojo::String& path) { diff --git a/www/chromium/files/patch-net__base__net_util_posix.cc b/www/chromium/files/patch-net__base__net_util_posix.cc new file mode 100644 index 000000000000..64447830df31 --- /dev/null +++ b/www/chromium/files/patch-net__base__net_util_posix.cc @@ -0,0 +1,62 @@ +--- net/base/net_util_posix.cc.orig 2015-01-24 20:40:37.161729000 +0100 ++++ net/base/net_util_posix.cc 2015-01-24 20:41:01.962110000 +0100 +@@ -23,8 +23,10 @@ + #if defined(OS_MACOSX) + #include + #else ++#if !defined(OS_BSD) + #include "net/base/address_tracker_linux.h" + #include "net/base/net_util_posix.h" ++#endif + #endif // OS_MACOSX + #include + #include +@@ -40,6 +42,7 @@ + + namespace { + ++#if !defined(OS_BSD) + // The application layer can pass |policy| defined in net_util.h to + // request filtering out certain type of interfaces. + bool ShouldIgnoreInterface(const std::string& name, int policy) { +@@ -76,6 +79,7 @@ + } + return false; + } ++#endif + + #if defined(OS_MACOSX) + +@@ -147,7 +151,7 @@ + } + + #endif // !defined(OS_IOS) +-#elif !defined(OS_NACL) // OS_MACOSX ++#elif !defined(OS_NACL) && !defined(OS_BSD) // OS_MACOSX + + // Convert platform native IPv6 address attributes to net IP address + // attributes and drop ones that can't be used by the application +@@ -192,6 +196,7 @@ + #endif + } + ++#if !defined(OS_BSD) + bool GetNetworkListImpl( + NetworkInterfaceList* networks, + int policy, +@@ -265,13 +270,14 @@ + return true; + } + #endif ++#endif + + } // namespace internal + + bool GetNetworkList(NetworkInterfaceList* networks, int policy) { + if (networks == NULL) + return false; +-#if defined(OS_NACL) ++#if defined(OS_NACL) || defined(OS_BSD) + NOTIMPLEMENTED(); + return false; + #elif !defined(OS_MACOSX) diff --git a/www/chromium/files/patch-net__http__http_auth_gssapi_posix.h b/www/chromium/files/patch-net__http__http_auth_gssapi_posix.h deleted file mode 100644 index 05ce11b41ce5..000000000000 --- a/www/chromium/files/patch-net__http__http_auth_gssapi_posix.h +++ /dev/null @@ -1,12 +0,0 @@ ---- net/http/http_auth_gssapi_posix.h.orig 2014-10-10 09:15:31 UTC -+++ net/http/http_auth_gssapi_posix.h -@@ -16,6 +16,9 @@ - MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9 - // Including gssapi.h directly is deprecated in the 10.9 SDK. - #include -+#elif defined(OS_FREEBSD) -+// Including gssapi.h is deprecated since at least FreeBSD 9 -+#include - #else - #include - #endif diff --git a/www/chromium/files/patch-net__http__mock_gssapi_library_posix.h b/www/chromium/files/patch-net__http__mock_gssapi_library_posix.h deleted file mode 100644 index 36ac13cf06e6..000000000000 --- a/www/chromium/files/patch-net__http__mock_gssapi_library_posix.h +++ /dev/null @@ -1,12 +0,0 @@ ---- net/http/mock_gssapi_library_posix.h.orig 2014-10-10 09:15:31 UTC -+++ net/http/mock_gssapi_library_posix.h -@@ -15,6 +15,9 @@ - MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_9 - // Including gssapi.h directly is deprecated in the 10.9 SDK. - #include -+#elif defined(OS_FREEBSD) -+// Including gssapi.h is deprecated since at least FreeBSD 9 -+#include - #else - #include - #endif diff --git a/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc b/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc index e5531fb4b948..e245b09ccfe3 100644 --- a/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc +++ b/www/chromium/files/patch-net__proxy__proxy_config_service_linux.cc @@ -1,4 +1,4 @@ ---- net/proxy/proxy_config_service_linux.cc.orig 2014-10-10 09:15:31 UTC +--- net/proxy/proxy_config_service_linux.cc.orig 2015-01-21 20:05:44 UTC +++ net/proxy/proxy_config_service_linux.cc @@ -12,7 +12,13 @@ #include @@ -14,7 +14,7 @@ #include #include -@@ -858,9 +864,10 @@ +@@ -852,9 +858,10 @@ public base::MessagePumpLibevent::Watcher { public: explicit SettingGetterImplKDE(base::Environment* env_var_getter) @@ -28,7 +28,7 @@ // This has to be called on the UI thread (http://crbug.com/69057). base::ThreadRestrictions::ScopedAllowIO allow_io; -@@ -924,9 +931,10 @@ +@@ -918,9 +925,10 @@ // and pending tasks may then be deleted without being run. // Here in the KDE version, we can safely close the file descriptor // anyway. (Not that it really matters; the process is exiting.) @@ -39,8 +39,8 @@ + DCHECK(config_fd_ < 0); } - virtual bool Init( -@@ -936,11 +944,20 @@ + bool Init(const scoped_refptr& glib_task_runner, +@@ -929,11 +937,20 @@ // This has to be called on the UI thread (http://crbug.com/69057). base::ThreadRestrictions::ScopedAllowIO allow_io; DCHECK(inotify_fd_ < 0); @@ -61,7 +61,7 @@ int flags = fcntl(inotify_fd_, F_GETFL); if (fcntl(inotify_fd_, F_SETFL, flags | O_NONBLOCK) < 0) { PLOG(ERROR) << "fcntl failed"; -@@ -948,6 +965,7 @@ +@@ -941,6 +958,7 @@ inotify_fd_ = -1; return false; } @@ -69,7 +69,7 @@ file_task_runner_ = file_task_runner; // The initial read is done on the current thread, not // |file_task_runner_|, since we will need to have it for -@@ -963,21 +981,39 @@ +@@ -956,21 +974,39 @@ close(inotify_fd_); inotify_fd_ = -1; } @@ -79,8 +79,8 @@ + } } - virtual bool SetUpNotifications( - ProxyConfigServiceLinux::Delegate* delegate) OVERRIDE { + bool SetUpNotifications( + ProxyConfigServiceLinux::Delegate* delegate) override { DCHECK(inotify_fd_ >= 0); + DCHECK(config_fd_ >= 0); DCHECK(file_task_runner_->BelongsToCurrentThread()); @@ -109,8 +109,8 @@ notify_delegate_ = delegate; if (!base::MessageLoopForIO::current()->WatchFileDescriptor( inotify_fd_, true, base::MessageLoopForIO::WATCH_READ, -@@ -998,7 +1034,19 @@ - virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE { +@@ -991,7 +1027,19 @@ + void OnFileCanReadWithoutBlocking(int fd) override { DCHECK_EQ(fd, inotify_fd_); DCHECK(file_task_runner_->BelongsToCurrentThread()); +#if defined(OS_FREEBSD) @@ -127,9 +127,9 @@ OnChangeNotification(); +#endif } - virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE { - NOTREACHED(); -@@ -1277,8 +1325,11 @@ + void OnFileCanWriteWithoutBlocking(int fd) override { NOTREACHED(); } + +@@ -1264,8 +1312,11 @@ void OnChangeNotification() { DCHECK_GE(inotify_fd_, 0); DCHECK(file_task_runner_->BelongsToCurrentThread()); @@ -142,7 +142,7 @@ ssize_t r; while ((r = read(inotify_fd_, event_buf, sizeof(event_buf))) > 0) { // inotify returns variable-length structures, which is why we have -@@ -1315,6 +1366,7 @@ +@@ -1302,6 +1353,7 @@ inotify_fd_ = -1; } } @@ -150,7 +150,7 @@ if (kioslaverc_touched) { // We don't use Reset() because the timer may not yet be running. // (In that case Stop() is a no-op.) -@@ -1330,6 +1382,7 @@ +@@ -1317,6 +1369,7 @@ std::vector > strings_map_type; int inotify_fd_; diff --git a/www/chromium/files/patch-remoting__remoting_host.gypi b/www/chromium/files/patch-remoting__remoting_host.gypi index 4c07b7bfccaa..688369201f0e 100644 --- a/www/chromium/files/patch-remoting__remoting_host.gypi +++ b/www/chromium/files/patch-remoting__remoting_host.gypi @@ -1,4 +1,4 @@ ---- remoting/remoting_host.gypi.orig 2014-10-10 09:15:31 UTC +--- remoting/remoting_host.gypi.orig 2015-01-21 20:28:17 UTC +++ remoting/remoting_host.gypi @@ -12,7 +12,7 @@ 'variables': { @@ -9,21 +9,21 @@ 'enable_me2me_host': 1, 'enable_it2me_host': 1, 'enable_remoting_host': 1, -@@ -310,7 +310,7 @@ +@@ -317,7 +317,7 @@ ], }, }], -- ['OS=="linux" and chromeos==0', { -+ ['(OS=="linux" and chromeos==0) or os_bsd==1', { +- ['OS=="linux" and chromeos==0 and use_ozone==0', { ++ ['((OS=="linux" and chromeos==0) or os_bsd==1) and use_ozone==0', { 'dependencies' : [ # Always use GTK on Linux, even for Aura builds. '../build/linux/system.gyp:gtk', -@@ -872,7 +872,7 @@ +@@ -910,7 +910,7 @@ 'host/it2me/it2me_native_messaging_host_main.h', ], 'conditions': [ -- ['OS=="linux" and chromeos==0', { -+ ['(OS=="linux" and chromeos==0) or os_bsd==1', { +- ['OS=="linux" and chromeos==0 and use_ozone==0', { ++ ['((OS=="linux" and chromeos==0) or os_bsd==1) and use_ozone==0', { 'dependencies': [ # Always use GTK on Linux, even for Aura builds. '../build/linux/system.gyp:gtk', diff --git a/www/chromium/files/patch-skia__skia_chrome.gypi b/www/chromium/files/patch-skia__skia_chrome.gypi index 8c6ad7f6e758..8e88c67a0ba7 100644 --- a/www/chromium/files/patch-skia__skia_chrome.gypi +++ b/www/chromium/files/patch-skia__skia_chrome.gypi @@ -1,6 +1,6 @@ ---- skia/skia_chrome.gypi.orig 2014-10-10 09:15:32 UTC +--- skia/skia_chrome.gypi.orig 2015-01-21 20:28:18 UTC +++ skia/skia_chrome.gypi -@@ -89,6 +89,11 @@ +@@ -87,6 +87,11 @@ 'ext/vector_platform_device_skia.h', ], 'conditions': [ @@ -9,6 +9,6 @@ + '../build/linux/system.gyp:pangocairo', + ], + }], - [ 'OS == "android" and enable_printing == 0', { + [ 'OS == "android" and ' + 'enable_basic_printing==0 and enable_print_preview==0', { 'sources!': [ - 'ext/skia_utils_base.cc', diff --git a/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp b/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp index 4bc2153c8586..b7bcb5d6738a 100644 --- a/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp +++ b/www/chromium/files/patch-third_party__WebKit__Source__platform__blink_platform.gyp @@ -1,4 +1,4 @@ ---- third_party/WebKit/Source/platform/blink_platform.gyp.orig 2014-10-10 09:34:37 UTC +--- third_party/WebKit/Source/platform/blink_platform.gyp.orig 2015-01-21 20:48:07 UTC +++ third_party/WebKit/Source/platform/blink_platform.gyp @@ -38,6 +38,9 @@ 'targets': [{ @@ -18,18 +18,18 @@ + ['OS=="linux" or OS=="android" or OS=="win" or os_bsd==1', { 'sources/': [ # Cherry-pick files excluded by the broader regular expressions above. - ['include', 'fonts/harfbuzz/FontHarfBuzz\\.cpp$'], -@@ -267,7 +270,7 @@ - ['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'], + ['include', 'fonts/opentype/OpenTypeTypes\\.h$'], +@@ -259,7 +262,7 @@ ], - }], + }, + ], - ['OS=="linux" or OS=="android"', { + ['OS=="linux" or OS=="android" or os_bsd==1', { 'sources/': [ ['include', 'fonts/linux/FontPlatformDataLinux\\.cpp$'], ] -@@ -363,7 +366,7 @@ - ['exclude', 'fonts/harfbuzz/HarfBuzzFaceCoreText\\.cpp$'], +@@ -350,7 +353,7 @@ + ['exclude', 'scroll/ScrollbarThemeMac'], ], }], - ['OS != "linux" and OS != "mac" and OS != "win"', { @@ -37,7 +37,7 @@ 'sources/': [ ['exclude', 'VDMX[^/]+\\.(cpp|h)$'], ], -@@ -409,7 +412,7 @@ +@@ -395,7 +398,7 @@ ['exclude', 'Android\\.cpp$'], ], }], diff --git a/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp b/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp deleted file mode 100644 index e3efda10f173..000000000000 --- a/www/chromium/files/patch-third_party__WebKit__Source__platform__heap__ThreadState.cpp +++ /dev/null @@ -1,36 +0,0 @@ ---- third_party/WebKit/Source/platform/heap/ThreadState.cpp.orig 2014-10-10 09:34:37 UTC -+++ third_party/WebKit/Source/platform/heap/ThreadState.cpp -@@ -56,13 +56,22 @@ - #include - #endif - -+#if OS(FREEBSD) -+#include -+#endif -+ - namespace blink { - - static void* getStackStart() - { --#if defined(__GLIBC__) || OS(ANDROID) -+#if defined(__GLIBC__) || OS(ANDROID) || OS(FREEBSD) - pthread_attr_t attr; -+#if OS(FREEBSD) -+ pthread_attr_init(&attr); -+ if (!pthread_attr_get_np(pthread_self(), &attr)) { -+#else - if (!pthread_getattr_np(pthread_self(), &attr)) { -+#endif - void* base; - size_t size; - int error = pthread_attr_getstack(&attr, &base, &size); -@@ -70,6 +79,9 @@ - pthread_attr_destroy(&attr); - return reinterpret_cast
(base) + size; - } -+#if OS(FREEBSD) -+ pthread_attr_destroy(&attr); -+#endif - #if defined(__GLIBC__) - // pthread_getattr_np can fail for the main thread. In this case - // just like NaCl we rely on the __libc_stack_end to give us diff --git a/www/chromium/files/patch-third_party__sqlite__sqlite.gyp b/www/chromium/files/patch-third_party__sqlite__sqlite.gyp index 31dc7ea984be..af4f59421e4b 100644 --- a/www/chromium/files/patch-third_party__sqlite__sqlite.gyp +++ b/www/chromium/files/patch-third_party__sqlite__sqlite.gyp @@ -1,9 +1,9 @@ ---- third_party/sqlite/sqlite.gyp.orig 2014-10-10 09:15:32 UTC +--- third_party/sqlite/sqlite.gyp.orig 2015-01-21 20:28:18 UTC +++ third_party/sqlite/sqlite.gyp -@@ -105,6 +105,8 @@ +@@ -90,6 +90,8 @@ + + 'include_dirs': [ 'amalgamation', - # Needed for fts2 to build. - 'src/src', + # FreeBSD ... + '<(prefix_dir)/include', ], diff --git a/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc b/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc new file mode 100644 index 000000000000..a71a4bcfdfc0 --- /dev/null +++ b/www/chromium/files/patch-v8__src__base__platform__platform-posix.cc @@ -0,0 +1,11 @@ +--- v8/src/base/platform/platform-posix.cc.orig 2015-01-25 14:30:34 UTC ++++ v8/src/base/platform/platform-posix.cc +@@ -259,6 +259,8 @@ + return static_cast(syscall(__NR_gettid)); + #elif V8_OS_ANDROID + return static_cast(gettid()); ++#elif V8_OS_FREEBSD ++ return static_cast(pthread_getthreadid_np()); + #else + return static_cast(pthread_self()); + #endif diff --git a/www/chromium/pkg-plist b/www/chromium/pkg-plist index ed1f9de22841..afa68e1acc75 100644 --- a/www/chromium/pkg-plist +++ b/www/chromium/pkg-plist @@ -73,6 +73,9 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/Images/checker.png %%DATADIR%%/resources/inspector/Images/chromeDisabledSelect.png %%DATADIR%%/resources/inspector/Images/chromeDisabledSelect_2x.png +%%DATADIR%%/resources/inspector/Images/chromeLeft.png +%%DATADIR%%/resources/inspector/Images/chromeMiddle.png +%%DATADIR%%/resources/inspector/Images/chromeRight.png %%DATADIR%%/resources/inspector/Images/chromeSelect.png %%DATADIR%%/resources/inspector/Images/chromeSelect_2x.png %%DATADIR%%/resources/inspector/Images/cookie.png @@ -133,73 +136,31 @@ share/applications/chromium-browser.desktop %%DATADIR%%/resources/inspector/Images/transformControls.png %%DATADIR%%/resources/inspector/Images/transformControls_2x.png %%DATADIR%%/resources/inspector/InspectorBackendCommands.js -%%DATADIR%%/resources/inspector/Runtime.js %%DATADIR%%/resources/inspector/SupportedCSSProperties.js -%%DATADIR%%/resources/inspector/accelerometer.css -%%DATADIR%%/resources/inspector/auditsPanel.css %%DATADIR%%/resources/inspector/audits_module.js -%%DATADIR%%/resources/inspector/breakpointsList.css -%%DATADIR%%/resources/inspector/canvasProfiler.css -%%DATADIR%%/resources/inspector/cm/codemirror.css -%%DATADIR%%/resources/inspector/cmdevtools.css %%DATADIR%%/resources/inspector/console_module.js -%%DATADIR%%/resources/inspector/dataGrid.css -%%DATADIR%%/resources/inspector/devicesView.css %%DATADIR%%/resources/inspector/devices_module.js %%DATADIR%%/resources/inspector/devtools.css %%DATADIR%%/resources/inspector/devtools.html %%DATADIR%%/resources/inspector/devtools.js %%DATADIR%%/resources/inspector/devtools_extension_api.js -%%DATADIR%%/resources/inspector/documentationView.css %%DATADIR%%/resources/inspector/documentation_module.js -%%DATADIR%%/resources/inspector/elementsPanel.css %%DATADIR%%/resources/inspector/elements_module.js -%%DATADIR%%/resources/inspector/extensions_module.js -%%DATADIR%%/resources/inspector/filter.css -%%DATADIR%%/resources/inspector/filteredItemSelectionDialog.css -%%DATADIR%%/resources/inspector/flameChart.css -%%DATADIR%%/resources/inspector/heapProfiler.css %%DATADIR%%/resources/inspector/heap_snapshot_worker_module.js -%%DATADIR%%/resources/inspector/helpScreen.css -%%DATADIR%%/resources/inspector/indexedDBViews.css -%%DATADIR%%/resources/inspector/inspectorCommon.css -%%DATADIR%%/resources/inspector/inspectorSyntaxHighlight.css -%%DATADIR%%/resources/inspector/layersPanel.css %%DATADIR%%/resources/inspector/layers_module.js -%%DATADIR%%/resources/inspector/navigatorView.css -%%DATADIR%%/resources/inspector/networkLogView.css -%%DATADIR%%/resources/inspector/networkPanel.css %%DATADIR%%/resources/inspector/network_module.js -%%DATADIR%%/resources/inspector/overrides.css -%%DATADIR%%/resources/inspector/overviewGrid.css -%%DATADIR%%/resources/inspector/panelEnablerView.css -%%DATADIR%%/resources/inspector/pieChart.css %%DATADIR%%/resources/inspector/profiler_module.js -%%DATADIR%%/resources/inspector/profilesPanel.css -%%DATADIR%%/resources/inspector/promisesPanel.css %%DATADIR%%/resources/inspector/promises_module.js -%%DATADIR%%/resources/inspector/requestCookiesView.css -%%DATADIR%%/resources/inspector/requestHeadersView.css -%%DATADIR%%/resources/inspector/resourceView.css -%%DATADIR%%/resources/inspector/resourcesPanel.css %%DATADIR%%/resources/inspector/resources_module.js -%%DATADIR%%/resources/inspector/responsiveDesignView.css -%%DATADIR%%/resources/inspector/revisionHistory.css -%%DATADIR%%/resources/inspector/screencastView.css %%DATADIR%%/resources/inspector/script_formatter_worker_module.js %%DATADIR%%/resources/inspector/settings_module.js %%DATADIR%%/resources/inspector/source_frame_module.js -%%DATADIR%%/resources/inspector/sourcesPanel.css -%%DATADIR%%/resources/inspector/sourcesView.css %%DATADIR%%/resources/inspector/sources_module.js -%%DATADIR%%/resources/inspector/spectrum.css %%DATADIR%%/resources/inspector/temp_storage_shared_worker_module.js -%%DATADIR%%/resources/inspector/timelinePanel.css %%DATADIR%%/resources/inspector/timeline_module.js %%DATADIR%%/resources/inspector/toolbox.css %%DATADIR%%/resources/inspector/toolbox.html %%DATADIR%%/resources/inspector/toolbox.js -%%DATADIR%%/resources/inspector/webSocketFrameView.css share/icons/hicolor/128x128/apps/chrome.png share/icons/hicolor/22x22/apps/chrome.png share/icons/hicolor/24x24/apps/chrome.png @@ -210,7 +171,6 @@ share/icons/hicolor/64x64/apps/chrome.png @dir %%DATADIR%%/resources/extension/demo @dir %%DATADIR%%/resources/extension @dir %%DATADIR%%/resources/inspector/Images -@dir %%DATADIR%%/resources/inspector/cm @dir %%DATADIR%%/resources/inspector @dir %%DATADIR%%/resources @dir %%DATADIR%%