pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
delete chromium-browser and chromium
Module Name: pkgsrc-wip
Committed By: coypu <coypu%sdf.org@localhost>
Pushed By: coypu
Date: Sat Feb 18 09:56:40 2017 +0200
Changeset: b4c40e689cb5ed499c9bb7a2cac734677c5a4538
Removed Files:
chromium-browser/DESCR
chromium-browser/Makefile
chromium-browser/PLIST
chromium-browser/TODO
chromium-browser/distinfo
chromium-browser/patches/patch-base_BUILD.gn
chromium-browser/patches/patch-base_debug_debugger__posix.cc
chromium-browser/patches/patch-base_message__loop_message__loop.cc
chromium-browser/patches/patch-base_process_process__handle__netbsd.cc
chromium-browser/patches/patch-base_process_process__iterator.h
chromium-browser/patches/patch-base_process_process__iterator__netbsd.cc
chromium-browser/patches/patch-base_process_process__metrics__netbsd.cc
chromium-browser/patches/patch-base_process_process__metrics__posix.cc
chromium-browser/patches/patch-base_process_process__posix.cc
chromium-browser/patches/patch-base_sys__info__netbsd.cc
chromium-browser/patches/patch-base_third__party_libevent_event-config.h
chromium-browser/patches/patch-base_third__party_libevent_netbsd_config.h
chromium-browser/patches/patch-base_third__party_libevent_netbsd_event-config.h
chromium-browser/patches/patch-base_threading_platform__thread__netbsd.cc
chromium-browser/patches/patch-base_trace__event_malloc__dump__provider.cc
chromium-browser/patches/patch-base_trace__event_memory__dump__manager.cc
chromium-browser/patches/patch-base_trace__event_process__memory__dump.cc
chromium-browser/patches/patch-build_config_BUILDCONFIG.gn
chromium-browser/patches/patch-build_config_compiler_BUILD.gn
chromium-browser/patches/patch-build_toolchain_netbsd_BUILD.gn
chromium-browser/patches/patch-third__party_icu_android_patch__locale.sh
chromium-browser/patches/patch-third__party_icu_source_configure
chromium-browser/patches/patch-third__party_protobuf_post__process__dist.sh
chromium-browser/patches/patch-third__party_xdg-utils_scripts_xdg-terminal
chromium-browser/patches/patch-third__party_xdg-utils_scripts_xdg-terminal.in
chromium-browser/patches/patch-tools_battor__agent_BUILD.gn
chromium-browser/patches/patch-tools_gn_bootstrap_bootstrap.py
chromium-browser/patches/patch-tools_gn_setup.cc
chromium-browser/patches/patch-tools_gn_variables.cc
chromium-browser/patches/patch-v8_tools_run-llprof.sh
chromium/DESCR
chromium/Makefile
chromium/PLIST
chromium/TODO
chromium/distinfo
chromium/options.mk
chromium/patches/patch-app_app.gyp
chromium/patches/patch-app_app__base.gypi
chromium/patches/patch-app_gfx_gl_gl__bindings.h
chromium/patches/patch-app_gfx_gl_gl__context__egl.cc
chromium/patches/patch-app_gfx_gl_gl__implementation__linux.cc
chromium/patches/patch-app_resources_app__resources.grd
chromium/patches/patch-app_surface_transport__dib.h
chromium/patches/patch-app_surface_transport__dib__freebsd.cc
chromium/patches/patch-app_surface_transport__dib__openbsd.cc
chromium/patches/patch-base_allocator_allocator.gyp
chromium/patches/patch-base_atomicops.h
chromium/patches/patch-base_base.gyp
chromium/patches/patch-base_base.gypi
chromium/patches/patch-base_base__paths__linux.cc
chromium/patches/patch-base_debug_debugger__posix.cc
chromium/patches/patch-base_debug_stack__trace__posix.cc
chromium/patches/patch-base_debug_trace__event.cc
chromium/patches/patch-base_dir__reader__posix__unittest.cc
chromium/patches/patch-base_file__util__posix.cc
chromium/patches/patch-base_i18n_number__formatting.cc
chromium/patches/patch-base_i18n_number__formatting.h
chromium/patches/patch-base_linux__util.cc
chromium/patches/patch-base_logging.cc
chromium/patches/patch-base_logging.h
chromium/patches/patch-base_platform__file__posix.cc
chromium/patches/patch-base_process__util.h
chromium/patches/patch-base_process__util__dragonfly.cc
chromium/patches/patch-base_process__util__freebsd.cc
chromium/patches/patch-base_process__util__netbsd.cc
chromium/patches/patch-base_process__util__openbsd.cc
chromium/patches/patch-base_process__util__posix.cc
chromium/patches/patch-base_shared__memory__posix.cc
chromium/patches/patch-base_string__util__posix.h
chromium/patches/patch-base_sys__info__dragonfly.cc
chromium/patches/patch-base_sys__info__linux.cc
chromium/patches/patch-base_sys__info__netbsd.cc
chromium/patches/patch-base_sys__info__posix.cc
chromium/patches/patch-base_test_test__file__util__linux.cc
chromium/patches/patch-base_test_test__file__util__posix.cc
chromium/patches/patch-base_third__party_dmg__fp_dtoa.cc
chromium/patches/patch-base_third__party_nspr_prcpucfg.h
chromium/patches/patch-base_third__party_nspr_prcpucfg__netbsd.h
chromium/patches/patch-base_third__party_symbolize_utilities.h
chromium/patches/patch-base_threading_platform__thread__posix.cc
chromium/patches/patch-base_threading_worker__pool__posix.cc
chromium/patches/patch-base_time__posix.cc
chromium/patches/patch-build_all.gyp
chromium/patches/patch-build_build__config.h
chromium/patches/patch-build_common.gypi
chromium/patches/patch-build_features__override.gypi
chromium/patches/patch-build_linux_python__arch.sh
chromium/patches/patch-chrome_app_chrome__exe__main__gtk.cc
chromium/patches/patch-chrome_app_generated__resources.grd
chromium/patches/patch-chrome_app_resources_locale__settings.grd
chromium/patches/patch-chrome_browser_about__flags.cc
chromium/patches/patch-chrome_browser_browser__about__handler.cc
chromium/patches/patch-chrome_browser_browser__resources.grd
chromium/patches/patch-chrome_browser_geolocation_gateway__data__provider__bsd.cc
chromium/patches/patch-chrome_browser_geolocation_gateway__data__provider__bsd.h
chromium/patches/patch-chrome_browser_history_in__memory__url__index.cc
chromium/patches/patch-chrome_browser_memory__details.cc
chromium/patches/patch-chrome_browser_memory__purger.cc
chromium/patches/patch-chrome_browser_net_connection__tester.cc
chromium/patches/patch-chrome_browser_notifications_balloon__collection__impl.h
chromium/patches/patch-chrome_browser_process__singleton.h
chromium/patches/patch-chrome_browser_process__singleton__linux.cc
chromium/patches/patch-chrome_browser_renderer__host_browser__render__process__host.cc
chromium/patches/patch-chrome_browser_shell__integration__linux.cc
chromium/patches/patch-chrome_browser_shell__integration__unittest.cc
chromium/patches/patch-chrome_browser_sync_engine_syncer__thread.cc
chromium/patches/patch-chrome_browser_sync_engine_syncer__thread.h
chromium/patches/patch-chrome_browser_sync_glue_sync__backend__host.cc
chromium/patches/patch-chrome_browser_sync_syncable_directory__backing__store.cc
chromium/patches/patch-chrome_browser_task__manager_task__manager__resource__providers.cc
chromium/patches/patch-chrome_browser_ui_browser.cc
chromium/patches/patch-chrome_browser_ui_browser__list.cc
chromium/patches/patch-chrome_browser_ui_toolbar_wrench__menu__model.cc
chromium/patches/patch-chrome_browser_ui_views_create__application__shortcut__view.cc
chromium/patches/patch-chrome_browser_ui_views_dropdown__bar__host.cc
chromium/patches/patch-chrome_browser_ui_views_extensions_extension__popup.cc
chromium/patches/patch-chrome_browser_ui_views_extensions_extension__view.cc
chromium/patches/patch-chrome_browser_ui_views_find__bar__view.cc
chromium/patches/patch-chrome_browser_ui_views_find__bar__view.h
chromium/patches/patch-chrome_browser_ui_views_frame_app__panel__browser__frame__view.cc
chromium/patches/patch-chrome_browser_ui_views_frame_browser__view.cc
chromium/patches/patch-chrome_browser_ui_views_frame_browser__view__layout.cc
chromium/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
chromium/patches/patch-chrome_browser_ui_views_fullscreen__exit__bubble.cc
chromium/patches/patch-chrome_browser_ui_views_fullscreen__exit__bubble.h
chromium/patches/patch-chrome_browser_ui_views_info__bubble.cc
chromium/patches/patch-chrome_browser_ui_views_info__bubble.h
chromium/patches/patch-chrome_browser_ui_views_location__bar_location__bar__view.cc
chromium/patches/patch-chrome_browser_ui_views_location__bar_location__bar__view.h
chromium/patches/patch-chrome_browser_ui_views_notifications_balloon__view.cc
chromium/patches/patch-chrome_browser_ui_views_notifications_balloon__view__host.cc
chromium/patches/patch-chrome_browser_ui_views_tabs_dragged__tab__view.cc
chromium/patches/patch-chrome_browser_ui_views_tabs_dragged__tab__view.h
chromium/patches/patch-chrome_browser_ui_views_tabs_tab__strip.cc
chromium/patches/patch-chrome_browser_ui_views_tabs_tab__strip.h
chromium/patches/patch-chrome_browser_web__applications_web__app.cc
chromium/patches/patch-chrome_chrome.gyp
chromium/patches/patch-chrome_chrome__browser.gypi
chromium/patches/patch-chrome_chrome__common.gypi
chromium/patches/patch-chrome_chrome__exe.gypi
chromium/patches/patch-chrome_chrome__renderer.gypi
chromium/patches/patch-chrome_chrome__tests.gypi
chromium/patches/patch-chrome_common__constants.gypi
chromium/patches/patch-chrome_common_chrome__constants.cc
chromium/patches/patch-chrome_common_chrome__paths.cc
chromium/patches/patch-chrome_common_chrome__switches.cc
chromium/patches/patch-chrome_common_chrome__switches.h
chromium/patches/patch-chrome_common_multi__process__lock.h
chromium/patches/patch-chrome_common_native__web__keyboard__event.h
chromium/patches/patch-chrome_common_plugin__messages.cc
chromium/patches/patch-chrome_common_plugin__messages.h
chromium/patches/patch-chrome_common_render__messages__internal.h
chromium/patches/patch-chrome_common_service__process__util__posix.h
chromium/patches/patch-chrome_default__plugin_default__plugin.gyp
chromium/patches/patch-chrome_gpu_x__util.h
chromium/patches/patch-chrome_nacl_nacl__main.cc
chromium/patches/patch-chrome_plugin_plugin__main__linux.cc
chromium/patches/patch-chrome_plugin_plugin__thread.cc
chromium/patches/patch-chrome_plugin_webplugin__delegate__stub.cc
chromium/patches/patch-chrome_plugin_webplugin__proxy.cc
chromium/patches/patch-chrome_plugin_webplugin__proxy.h
chromium/patches/patch-chrome_renderer_nacl__desc__wrapper__chrome.cc
chromium/patches/patch-chrome_renderer_pepper__devices.cc
chromium/patches/patch-chrome_renderer_pepper__plugin__delegate__impl.cc
chromium/patches/patch-chrome_renderer_pepper__scrollbar__widget.h
chromium/patches/patch-chrome_renderer_render__process__impl.cc
chromium/patches/patch-chrome_renderer_render__thread.cc
chromium/patches/patch-chrome_renderer_render__view.h
chromium/patches/patch-chrome_renderer_render__widget.cc
chromium/patches/patch-chrome_renderer_renderer__glue.cc
chromium/patches/patch-chrome_renderer_renderer__main.cc
chromium/patches/patch-chrome_renderer_renderer__main__platform__delegate__linux.cc
chromium/patches/patch-chrome_renderer_renderer__webkitclient__impl.cc
chromium/patches/patch-chrome_renderer_webplugin__delegate__pepper.cc
chromium/patches/patch-chrome_renderer_webplugin__delegate__pepper.h
chromium/patches/patch-chrome_renderer_webplugin__delegate__proxy.cc
chromium/patches/patch-chrome_renderer_webplugin__delegate__proxy.h
chromium/patches/patch-chrome_test_automation_automation__proxy__uitest.cc
chromium/patches/patch-chrome_test_automation_proxy__launcher.cc
chromium/patches/patch-chrome_test_chrome__process__util.cc
chromium/patches/patch-chrome_test_gpu_gpu__pixel__browsertest.cc
chromium/patches/patch-chrome_test_in__process__browser__test.cc
chromium/patches/patch-chrome_test_page__cycler_page__cycler__test.cc
chromium/patches/patch-chrome_test_reliability_page__load__test.cc
chromium/patches/patch-chrome_test_startup_feature__startup__test.cc
chromium/patches/patch-chrome_test_testing__browser__process.cc
chromium/patches/patch-chrome_test_testing__browser__process.h
chromium/patches/patch-chrome_test_ui__test__utils.cc
chromium/patches/patch-chrome_test_ui_sunspider__uitest.cc
chromium/patches/patch-chrome_test_ui_ui__layout__test.cc
chromium/patches/patch-chrome_test_ui_ui__test.cc
chromium/patches/patch-chrome_test_ui_v8__benchmark__uitest.cc
chromium/patches/patch-chrome_test_url__fetch__test_url__fetch__test.cc
chromium/patches/patch-content_browser_browser__child__process__host.cc
chromium/patches/patch-content_browser_child__process__launcher.cc
chromium/patches/patch-content_browser_geolocation_empty__device__data__provider.cc
chromium/patches/patch-content_browser_geolocation_location__provider.cc
chromium/patches/patch-content_browser_renderer__host_backing__store__x.cc
chromium/patches/patch-content_browser_renderer__host_mock__render__process__host.cc
chromium/patches/patch-content_browser_renderer__host_p2p__socket__host__posix.cc
chromium/patches/patch-content_browser_renderer__host_render__message__filter.cc
chromium/patches/patch-content_browser_renderer__host_render__sandbox__host__linux.cc
chromium/patches/patch-content_browser_renderer__host_render__widget__helper.cc
chromium/patches/patch-content_browser_renderer__host_render__widget__helper.h
chromium/patches/patch-content_browser_renderer__host_render__widget__host__unittest.cc
chromium/patches/patch-content_browser_tab__contents_tab__contents.cc
chromium/patches/patch-content_browser_zygote__host__linux.cc
chromium/patches/patch-content_browser_zygote__host__linux.h
chromium/patches/patch-content_browser_zygote__main__linux.cc
chromium/patches/patch-content_common_file__path__watcher_file__path__watcher__stub.cc
chromium/patches/patch-content_content__browser.gypi
chromium/patches/patch-content_content__common.gypi
chromium/patches/patch-gpu_demos_demos.gyp
chromium/patches/patch-gpu_demos_framework_main__exe.cc
chromium/patches/patch-gpu_demos_framework_main__pepper.cc
chromium/patches/patch-gpu_gpu.gyp
chromium/patches/patch-ipc_ipc.gyp
chromium/patches/patch-ipc_ipc__channel__posix.cc
chromium/patches/patch-ipc_ipc__channel__posix.h
chromium/patches/patch-jingle_jingle.gyp
chromium/patches/patch-media_audio_openbsd_audio__manager__openbsd.cc
chromium/patches/patch-media_audio_openbsd_audio__manager__openbsd.h
chromium/patches/patch-media_base_media__switches.cc
chromium/patches/patch-media_base_media__switches.h
chromium/patches/patch-media_ffmpeg_file__protocol.cc
chromium/patches/patch-media_filters_ffmpeg__glue.cc
chromium/patches/patch-media_media.gyp
chromium/patches/patch-media_tools_shader__bench_shader__bench.cc
chromium/patches/patch-native__client_build_common.gypi
chromium/patches/patch-native__client_src_include_nacl__platform.h
chromium/patches/patch-native__client_src_shared_platform_linux_nacl__host__desc.c
chromium/patches/patch-native__client_src_shared_platform_linux_nacl__host__dir.c
chromium/patches/patch-native__client_src_shared_platform_linux_nacl__threads.c
chromium/patches/patch-native__client_src_shared_platform_nacl__host__desc.h
chromium/patches/patch-native__client_src_shared_platform_platform.gyp
chromium/patches/patch-native__client_src_trusted_debug__stub_debug__stub.gyp
chromium/patches/patch-native__client_src_trusted_debug__stub_posix_platform__impl.cc
chromium/patches/patch-native__client_src_trusted_debug__stub_transport__common.cc
chromium/patches/patch-native__client_src_trusted_plugin_nacl__entry__points.cc
chromium/patches/patch-native__client_src_trusted_service__runtime_arch_x86_sel__ldr__x86.h
chromium/patches/patch-native__client_src_trusted_service__runtime_service__runtime.gyp
chromium/patches/patch-net_base_dnsrr__resolver.cc
chromium/patches/patch-net_base_host__resolver__impl.cc
chromium/patches/patch-net_base_host__resolver__proc.cc
chromium/patches/patch-net_base_listen__socket.cc
chromium/patches/patch-net_base_listen__socket__unittest.cc
chromium/patches/patch-net_base_listen__socket__unittest.h
chromium/patches/patch-net_base_net__util.cc
chromium/patches/patch-net_base_net__util.h
chromium/patches/patch-net_base_network__change__notifier.cc
chromium/patches/patch-net_disk__cache_disk__format.h
chromium/patches/patch-net_net.gyp
chromium/patches/patch-net_proxy_proxy__config__service__linux.cc
chromium/patches/patch-net_proxy_proxy__service.cc
chromium/patches/patch-net_third__party_nss_ssl.gyp
chromium/patches/patch-ppapi_ppapi__tests.gypi
chromium/patches/patch-ppapi_proxy_ppb__image__data__proxy.cc
chromium/patches/patch-ppapi_proxy_serialized__structs.h
chromium/patches/patch-ppapi_proxy_serialized__var.cc
chromium/patches/patch-printing_printing.gyp
chromium/patches/patch-remoting_base_compound__buffer.cc
chromium/patches/patch-remoting_base_compound__buffer.h
chromium/patches/patch-remoting_remoting.gyp
chromium/patches/patch-remoting_tools_client__webserver_main.c
chromium/patches/patch-sandbox_sandbox.gyp
chromium/patches/patch-skia_ext_bitmap__platform__device.h
chromium/patches/patch-skia_ext_bitmap__platform__device__data.h
chromium/patches/patch-skia_ext_canvas__paint.h
chromium/patches/patch-skia_ext_platform__canvas.h
chromium/patches/patch-skia_ext_platform__device.h
chromium/patches/patch-skia_ext_vector__canvas.h
chromium/patches/patch-skia_ext_vector__platform__device.h
chromium/patches/patch-skia_skia.gyp
chromium/patches/patch-testing_gtest.gyp
chromium/patches/patch-testing_gtest_include_gtest_internal_gtest-port.h
chromium/patches/patch-testing_gtest_src_gtest-death-test.cc
chromium/patches/patch-testing_gtest_src_gtest.cc
chromium/patches/patch-third__party_WebKit_Source_JavaScriptCore_JavaScriptCore.gyp_JavaScriptCore.gyp
chromium/patches/patch-third__party_WebKit_Source_JavaScriptCore_config.h
chromium/patches/patch-third__party_WebKit_Source_JavaScriptCore_jit_JITStubs.cpp
chromium/patches/patch-third__party_WebKit_Source_JavaScriptCore_wtf_Platform.h
chromium/patches/patch-third__party_WebKit_Source_WebCore_WebCore.gyp_WebCore.gyp
chromium/patches/patch-third__party_WebKit_Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp
chromium/patches/patch-third__party_WebKit_Source_WebCore_bindings_v8_V8Proxy.cpp
chromium/patches/patch-third__party_WebKit_Source_WebCore_bindings_v8_custom_V8InspectorFrontendHostCustom.cpp
chromium/patches/patch-third__party_WebKit_Source_WebCore_dom_SelectElement.cpp
chromium/patches/patch-third__party_WebKit_Source_WebCore_loader_cache_CachedFont.cpp
chromium/patches/patch-third__party_WebKit_Source_WebCore_page_EventHandler.cpp
chromium/patches/patch-third__party_WebKit_Source_WebCore_page_chromium_EventHandlerChromium.cpp
chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_Scrollbar.cpp
chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_chromium_PlatformBridge.h
chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_graphics_chromium_FontPlatformData.h
chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_graphics_skia_FontCustomPlatformData.h
chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_image-decoders_png_PNGImageDecoder.cpp
chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_image-encoders_skia_PNGImageEncoder.cpp
chromium/patches/patch-third__party_WebKit_Source_WebCore_storage_IDBDatabaseBackendImpl.cpp
chromium/patches/patch-third__party_WebKit_Source_WebCore_websockets_WebSocketHandshake.cpp
chromium/patches/patch-third__party_WebKit_Source_WebKit_chromium_WebKit.gyp
chromium/patches/patch-third__party_WebKit_Source_WebKit_chromium_src_PlatformBridge.cpp
chromium/patches/patch-third__party_WebKit_Source_WebKit_chromium_src_WebFrameImpl.cpp
chromium/patches/patch-third__party_WebKit_Source_WebKit_chromium_src_WebViewImpl.cpp
chromium/patches/patch-third__party_angle_src_compiler_osinclude.h
chromium/patches/patch-third__party_cld_base_build__config.h
chromium/patches/patch-third__party_expat_expat.gyp
chromium/patches/patch-third__party_ffmpeg_ffmpeg.gyp
chromium/patches/patch-third__party_ffmpeg_patched-ffmpeg-mt_configure
chromium/patches/patch-third__party_icu_icu.gyp
chromium/patches/patch-third__party_icu_source_configure
chromium/patches/patch-third__party_libjingle_libjingle.gyp
chromium/patches/patch-third__party_libjingle_source_talk_base_nethelpers.cc
chromium/patches/patch-third__party_libjingle_source_talk_base_network.cc
chromium/patches/patch-third__party_libjingle_source_talk_base_socketaddress.cc
chromium/patches/patch-third__party_libsrtp_src_crypto_include_integers.h
chromium/patches/patch-third__party_libxml_libxml.gyp
chromium/patches/patch-third__party_libxslt_libxslt.gyp
chromium/patches/patch-third__party_mesa_MesaLib_src_mesa_main_imports.h
chromium/patches/patch-third__party_mesa_mesa.gyp
chromium/patches/patch-third__party_npapi_npapi.gyp
chromium/patches/patch-third__party_qcms_qcms.gyp
chromium/patches/patch-third__party_skia_include_core_SkPreConfig.h
chromium/patches/patch-third__party_sqlite_sqlite.gyp
chromium/patches/patch-third__party_yasm_source_patched-yasm_Makefile.in
chromium/patches/patch-third__party_yasm_yasm.gyp
chromium/patches/patch-tools_gyp_pylib_gyp_____init____.py
chromium/patches/patch-tools_gyp_test_additional-targets_src_dir1_actions.gyp
chromium/patches/patch-tools_gyp_test_library_src_library.gyp
chromium/patches/patch-ui_base_l10n_l10n__util.cc
chromium/patches/patch-ui_base_resource_resource__bundle.cc
chromium/patches/patch-ui_base_ui__base.gypi
chromium/patches/patch-ui_gfx_gfx.gyp
chromium/patches/patch-ui_gfx_gfx__resources.grd
chromium/patches/patch-ui_gfx_image.cc
chromium/patches/patch-ui_gfx_image.h
chromium/patches/patch-ui_gfx_native__widget__types.h
chromium/patches/patch-ui_ui.gyp
chromium/patches/patch-ui_views_events_accelerator.cc
chromium/patches/patch-ui_views_focus_accelerator__handler.h
chromium/patches/patch-ui_views_focus_focus__manager.cc
chromium/patches/patch-ui_views_views.gyp
chromium/patches/patch-v8_src_d8.gyp
chromium/patches/patch-v8_src_globals.h
chromium/patches/patch-v8_src_heap.cc
chromium/patches/patch-v8_src_platform-dragonfly.cc
chromium/patches/patch-v8_src_platform-netbsd.cc
chromium/patches/patch-v8_src_platform-openbsd.cc
chromium/patches/patch-v8_src_x64_code-stubs-x64.cc
chromium/patches/patch-v8_src_x64_codegen-x64.cc
chromium/patches/patch-v8_src_x64_full-codegen-x64.cc
chromium/patches/patch-v8_src_x64_lithium-codegen-x64.cc
chromium/patches/patch-v8_src_x64_macro-assembler-x64.cc
chromium/patches/patch-v8_src_x64_macro-assembler-x64.h
chromium/patches/patch-v8_tools_gyp_v8.gyp
chromium/patches/patch-views_views.gyp
chromium/patches/patch-webkit_glue_webkit__glue.gypi
chromium/patches/patch-webkit_glue_webkit__glue.h
chromium/patches/patch-webkit_glue_webkitclient__impl.cc
chromium/patches/patch-webkit_glue_webkitclient__impl.h
chromium/patches/patch-webkit_plugins_npapi_plugin__lib__posix.cc
chromium/patches/patch-webkit_plugins_ppapi_ppapi__plugin__instance.cc
chromium/patches/patch-webkit_plugins_ppapi_ppapi__plugin__instance.h
chromium/patches/patch-webkit_plugins_ppapi_ppb__file__system__impl.cc
chromium/patches/patch-webkit_plugins_ppapi_ppb__flash__impl.h
chromium/patches/patch-webkit_plugins_ppapi_ppb__pdf__impl.cc
chromium/patches/patch-webkit_support_webkit__support__glue.cc
chromium/patches/patch-webkit_tools_pepper__test__plugin_event__handler.cc
chromium/patches/patch-webkit_tools_pepper__test__plugin_pepper__test__plugin.gyp
chromium/patches/patch-webkit_tools_test__shell_test__shell.cc
chromium/patches/patch-webkit_tools_test__shell_test__shell.gypi
Log Message:
delete chromium-browser and chromium
(to be replaced by chromium-new which works)
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=b4c40e689cb5ed499c9bb7a2cac734677c5a4538
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
chromium-browser/DESCR | 2 -
chromium-browser/Makefile | 90 ---
chromium-browser/PLIST | 232 -------
chromium-browser/TODO | 20 -
chromium-browser/distinfo | 36 --
chromium-browser/patches/patch-base_BUILD.gn | 32 -
.../patches/patch-base_debug_debugger__posix.cc | 65 --
.../patch-base_message__loop_message__loop.cc | 13 -
.../patch-base_process_process__handle__netbsd.cc | 72 ---
.../patches/patch-base_process_process__iterator.h | 25 -
...patch-base_process_process__iterator__netbsd.cc | 150 -----
.../patch-base_process_process__metrics__netbsd.cc | 218 -------
.../patch-base_process_process__metrics__posix.cc | 13 -
.../patches/patch-base_process_process__posix.cc | 41 --
.../patches/patch-base_sys__info__netbsd.cc | 105 ----
...patch-base_third__party_libevent_event-config.h | 13 -
...atch-base_third__party_libevent_netbsd_config.h | 271 --------
...ase_third__party_libevent_netbsd_event-config.h | 289 ---------
...atch-base_threading_platform__thread__netbsd.cc | 102 ---
...tch-base_trace__event_malloc__dump__provider.cc | 44 --
...atch-base_trace__event_memory__dump__manager.cc | 13 -
...atch-base_trace__event_process__memory__dump.cc | 13 -
.../patches/patch-build_config_BUILDCONFIG.gn | 52 --
.../patches/patch-build_config_compiler_BUILD.gn | 15 -
.../patches/patch-build_toolchain_netbsd_BUILD.gn | 121 ----
...patch-third__party_icu_android_patch__locale.sh | 13 -
.../patch-third__party_icu_source_configure | 20 -
...ch-third__party_protobuf_post__process__dist.sh | 13 -
...tch-third__party_xdg-utils_scripts_xdg-terminal | 62 --
...-third__party_xdg-utils_scripts_xdg-terminal.in | 53 --
.../patches/patch-tools_battor__agent_BUILD.gn | 13 -
.../patches/patch-tools_gn_bootstrap_bootstrap.py | 68 --
chromium-browser/patches/patch-tools_gn_setup.cc | 13 -
.../patches/patch-tools_gn_variables.cc | 14 -
.../patches/patch-v8_tools_run-llprof.sh | 13 -
chromium/DESCR | 2 -
chromium/Makefile | 176 ------
chromium/PLIST | 232 -------
chromium/TODO | 20 -
chromium/distinfo | 337 ----------
chromium/options.mk | 42 --
chromium/patches/patch-app_app.gyp | 31 -
chromium/patches/patch-app_app__base.gypi | 65 --
chromium/patches/patch-app_gfx_gl_gl__bindings.h | 40 --
.../patches/patch-app_gfx_gl_gl__context__egl.cc | 13 -
.../patch-app_gfx_gl_gl__implementation__linux.cc | 13 -
.../patches/patch-app_resources_app__resources.grd | 40 --
.../patches/patch-app_surface_transport__dib.h | 37 --
.../patch-app_surface_transport__dib__freebsd.cc | 101 ---
.../patch-app_surface_transport__dib__openbsd.cc | 107 ----
.../patches/patch-base_allocator_allocator.gyp | 13 -
chromium/patches/patch-base_atomicops.h | 16 -
chromium/patches/patch-base_base.gyp | 49 --
chromium/patches/patch-base_base.gypi | 106 ----
chromium/patches/patch-base_base__paths__linux.cc | 41 --
.../patches/patch-base_debug_debugger__posix.cc | 72 ---
.../patch-base_debug_stack__trace__posix.cc | 34 -
chromium/patches/patch-base_debug_trace__event.cc | 13 -
.../patch-base_dir__reader__posix__unittest.cc | 16 -
chromium/patches/patch-base_file__util__posix.cc | 47 --
.../patches/patch-base_i18n_number__formatting.cc | 13 -
.../patches/patch-base_i18n_number__formatting.h | 13 -
chromium/patches/patch-base_linux__util.cc | 12 -
chromium/patches/patch-base_logging.cc | 13 -
chromium/patches/patch-base_logging.h | 41 --
.../patches/patch-base_platform__file__posix.cc | 13 -
chromium/patches/patch-base_process__util.h | 53 --
.../patches/patch-base_process__util__dragonfly.cc | 363 -----------
.../patches/patch-base_process__util__freebsd.cc | 312 ----------
.../patches/patch-base_process__util__netbsd.cc | 363 -----------
.../patches/patch-base_process__util__openbsd.cc | 354 -----------
.../patches/patch-base_process__util__posix.cc | 31 -
.../patches/patch-base_shared__memory__posix.cc | 13 -
chromium/patches/patch-base_string__util__posix.h | 17 -
.../patches/patch-base_sys__info__dragonfly.cc | 30 -
chromium/patches/patch-base_sys__info__linux.cc | 16 -
chromium/patches/patch-base_sys__info__netbsd.cc | 30 -
chromium/patches/patch-base_sys__info__posix.cc | 13 -
.../patch-base_test_test__file__util__linux.cc | 20 -
.../patch-base_test_test__file__util__posix.cc | 13 -
.../patch-base_third__party_dmg__fp_dtoa.cc | 31 -
.../patch-base_third__party_nspr_prcpucfg.h | 16 -
...patch-base_third__party_nspr_prcpucfg__netbsd.h | 388 ------------
.../patch-base_third__party_symbolize_utilities.h | 16 -
...patch-base_threading_platform__thread__posix.cc | 13 -
.../patch-base_threading_worker__pool__posix.cc | 13 -
chromium/patches/patch-base_time__posix.cc | 13 -
chromium/patches/patch-build_all.gyp | 13 -
chromium/patches/patch-build_build__config.h | 53 --
chromium/patches/patch-build_common.gypi | 76 ---
.../patches/patch-build_features__override.gypi | 13 -
chromium/patches/patch-build_linux_python__arch.sh | 13 -
.../patch-chrome_app_chrome__exe__main__gtk.cc | 36 --
.../patch-chrome_app_generated__resources.grd | 94 ---
...patch-chrome_app_resources_locale__settings.grd | 13 -
.../patches/patch-chrome_browser_about__flags.cc | 13 -
...patch-chrome_browser_browser__about__handler.cc | 49 --
.../patch-chrome_browser_browser__resources.grd | 20 -
...ser_geolocation_gateway__data__provider__bsd.cc | 193 ------
...wser_geolocation_gateway__data__provider__bsd.h | 27 -
...hrome_browser_history_in__memory__url__index.cc | 15 -
.../patch-chrome_browser_memory__details.cc | 31 -
.../patches/patch-chrome_browser_memory__purger.cc | 13 -
.../patch-chrome_browser_net_connection__tester.cc | 13 -
...owser_notifications_balloon__collection__impl.h | 13 -
.../patch-chrome_browser_process__singleton.h | 13 -
...tch-chrome_browser_process__singleton__linux.cc | 65 --
...enderer__host_browser__render__process__host.cc | 13 -
...tch-chrome_browser_shell__integration__linux.cc | 44 --
...-chrome_browser_shell__integration__unittest.cc | 21 -
...ch-chrome_browser_sync_engine_syncer__thread.cc | 31 -
...tch-chrome_browser_sync_engine_syncer__thread.h | 22 -
...chrome_browser_sync_glue_sync__backend__host.cc | 17 -
...wser_sync_syncable_directory__backing__store.cc | 20 -
...__manager_task__manager__resource__providers.cc | 13 -
.../patches/patch-chrome_browser_ui_browser.cc | 49 --
.../patch-chrome_browser_ui_browser__list.cc | 13 -
...hrome_browser_ui_toolbar_wrench__menu__model.cc | 31 -
...ui_views_create__application__shortcut__view.cc | 13 -
...-chrome_browser_ui_views_dropdown__bar__host.cc | 22 -
...browser_ui_views_extensions_extension__popup.cc | 22 -
..._browser_ui_views_extensions_extension__view.cc | 13 -
...atch-chrome_browser_ui_views_find__bar__view.cc | 36 --
...patch-chrome_browser_ui_views_find__bar__view.h | 13 -
...views_frame_app__panel__browser__frame__view.cc | 13 -
...-chrome_browser_ui_views_frame_browser__view.cc | 67 --
...browser_ui_views_frame_browser__view__layout.cc | 13 -
..._ui_views_frame_opaque__browser__frame__view.cc | 13 -
...me_browser_ui_views_fullscreen__exit__bubble.cc | 40 --
...ome_browser_ui_views_fullscreen__exit__bubble.h | 22 -
.../patch-chrome_browser_ui_views_info__bubble.cc | 49 --
.../patch-chrome_browser_ui_views_info__bubble.h | 40 --
...r_ui_views_location__bar_location__bar__view.cc | 13 -
...er_ui_views_location__bar_location__bar__view.h | 13 -
...browser_ui_views_notifications_balloon__view.cc | 13 -
...r_ui_views_notifications_balloon__view__host.cc | 31 -
...ome_browser_ui_views_tabs_dragged__tab__view.cc | 13 -
...rome_browser_ui_views_tabs_dragged__tab__view.h | 22 -
...atch-chrome_browser_ui_views_tabs_tab__strip.cc | 13 -
...patch-chrome_browser_ui_views_tabs_tab__strip.h | 13 -
...ch-chrome_browser_web__applications_web__app.cc | 25 -
chromium/patches/patch-chrome_chrome.gyp | 85 ---
chromium/patches/patch-chrome_chrome__browser.gypi | 64 --
chromium/patches/patch-chrome_chrome__common.gypi | 46 --
chromium/patches/patch-chrome_chrome__exe.gypi | 13 -
.../patches/patch-chrome_chrome__renderer.gypi | 21 -
chromium/patches/patch-chrome_chrome__tests.gypi | 255 --------
.../patches/patch-chrome_common__constants.gypi | 13 -
.../patch-chrome_common_chrome__constants.cc | 22 -
.../patches/patch-chrome_common_chrome__paths.cc | 13 -
.../patch-chrome_common_chrome__switches.cc | 13 -
.../patches/patch-chrome_common_chrome__switches.h | 13 -
.../patch-chrome_common_multi__process__lock.h | 13 -
...ch-chrome_common_native__web__keyboard__event.h | 13 -
.../patch-chrome_common_plugin__messages.cc | 40 --
.../patches/patch-chrome_common_plugin__messages.h | 13 -
...atch-chrome_common_render__messages__internal.h | 13 -
...h-chrome_common_service__process__util__posix.h | 22 -
...atch-chrome_default__plugin_default__plugin.gyp | 13 -
chromium/patches/patch-chrome_gpu_x__util.h | 21 -
chromium/patches/patch-chrome_nacl_nacl__main.cc | 13 -
.../patch-chrome_plugin_plugin__main__linux.cc | 20 -
.../patches/patch-chrome_plugin_plugin__thread.cc | 22 -
...atch-chrome_plugin_webplugin__delegate__stub.cc | 13 -
.../patch-chrome_plugin_webplugin__proxy.cc | 13 -
.../patches/patch-chrome_plugin_webplugin__proxy.h | 13 -
...-chrome_renderer_nacl__desc__wrapper__chrome.cc | 22 -
.../patch-chrome_renderer_pepper__devices.cc | 13 -
...rome_renderer_pepper__plugin__delegate__impl.cc | 40 --
...tch-chrome_renderer_pepper__scrollbar__widget.h | 13 -
.../patch-chrome_renderer_render__process__impl.cc | 31 -
.../patch-chrome_renderer_render__thread.cc | 22 -
.../patches/patch-chrome_renderer_render__view.h | 13 -
.../patch-chrome_renderer_render__widget.cc | 13 -
.../patch-chrome_renderer_renderer__glue.cc | 22 -
.../patch-chrome_renderer_renderer__main.cc | 22 -
...er_renderer__main__platform__delegate__linux.cc | 13 -
...chrome_renderer_renderer__webkitclient__impl.cc | 31 -
...-chrome_renderer_webplugin__delegate__pepper.cc | 94 ---
...h-chrome_renderer_webplugin__delegate__pepper.h | 22 -
...h-chrome_renderer_webplugin__delegate__proxy.cc | 64 --
...ch-chrome_renderer_webplugin__delegate__proxy.h | 22 -
...me_test_automation_automation__proxy__uitest.cc | 22 -
...patch-chrome_test_automation_proxy__launcher.cc | 15 -
.../patch-chrome_test_chrome__process__util.cc | 25 -
...atch-chrome_test_gpu_gpu__pixel__browsertest.cc | 13 -
...patch-chrome_test_in__process__browser__test.cc | 15 -
...-chrome_test_page__cycler_page__cycler__test.cc | 13 -
...tch-chrome_test_reliability_page__load__test.cc | 13 -
...h-chrome_test_startup_feature__startup__test.cc | 13 -
.../patch-chrome_test_testing__browser__process.cc | 13 -
.../patch-chrome_test_testing__browser__process.h | 13 -
.../patches/patch-chrome_test_ui__test__utils.cc | 13 -
.../patch-chrome_test_ui_sunspider__uitest.cc | 13 -
.../patch-chrome_test_ui_ui__layout__test.cc | 13 -
chromium/patches/patch-chrome_test_ui_ui__test.cc | 13 -
.../patch-chrome_test_ui_v8__benchmark__uitest.cc | 13 -
...hrome_test_url__fetch__test_url__fetch__test.cc | 13 -
...ontent_browser_browser__child__process__host.cc | 16 -
...tch-content_browser_child__process__launcher.cc | 109 ----
...er_geolocation_empty__device__data__provider.cc | 13 -
...ntent_browser_geolocation_location__provider.cc | 13 -
...ent_browser_renderer__host_backing__store__x.cc | 22 -
...r_renderer__host_mock__render__process__host.cc | 13 -
...wser_renderer__host_p2p__socket__host__posix.cc | 13 -
...owser_renderer__host_render__message__filter.cc | 22 -
..._renderer__host_render__sandbox__host__linux.cc | 26 -
...rowser_renderer__host_render__widget__helper.cc | 22 -
...browser_renderer__host_render__widget__helper.h | 31 -
...enderer__host_render__widget__host__unittest.cc | 13 -
...-content_browser_tab__contents_tab__contents.cc | 22 -
.../patch-content_browser_zygote__host__linux.cc | 70 ---
.../patch-content_browser_zygote__host__linux.h | 14 -
.../patch-content_browser_zygote__main__linux.cc | 60 --
...ile__path__watcher_file__path__watcher__stub.cc | 27 -
.../patches/patch-content_content__browser.gypi | 26 -
.../patches/patch-content_content__common.gypi | 13 -
chromium/patches/patch-gpu_demos_demos.gyp | 31 -
.../patches/patch-gpu_demos_framework_main__exe.cc | 28 -
.../patch-gpu_demos_framework_main__pepper.cc | 39 --
chromium/patches/patch-gpu_gpu.gyp | 13 -
chromium/patches/patch-ipc_ipc.gyp | 27 -
chromium/patches/patch-ipc_ipc__channel__posix.cc | 12 -
chromium/patches/patch-ipc_ipc__channel__posix.h | 13 -
chromium/patches/patch-jingle_jingle.gyp | 22 -
...-media_audio_openbsd_audio__manager__openbsd.cc | 31 -
...h-media_audio_openbsd_audio__manager__openbsd.h | 34 -
.../patches/patch-media_base_media__switches.cc | 13 -
.../patches/patch-media_base_media__switches.h | 13 -
.../patches/patch-media_ffmpeg_file__protocol.cc | 13 -
.../patches/patch-media_filters_ffmpeg__glue.cc | 13 -
chromium/patches/patch-media_media.gyp | 118 ----
...atch-media_tools_shader__bench_shader__bench.cc | 22 -
.../patches/patch-native__client_build_common.gypi | 49 --
...tch-native__client_src_include_nacl__platform.h | 19 -
...nt_src_shared_platform_linux_nacl__host__desc.c | 28 -
...ent_src_shared_platform_linux_nacl__host__dir.c | 20 -
...lient_src_shared_platform_linux_nacl__threads.c | 15 -
...__client_src_shared_platform_nacl__host__desc.h | 16 -
...native__client_src_shared_platform_platform.gyp | 25 -
..._client_src_trusted_debug__stub_debug__stub.gyp | 22 -
...src_trusted_debug__stub_posix_platform__impl.cc | 40 --
...nt_src_trusted_debug__stub_transport__common.cc | 12 -
...lient_src_trusted_plugin_nacl__entry__points.cc | 13 -
...usted_service__runtime_arch_x86_sel__ldr__x86.h | 14 -
...c_trusted_service__runtime_service__runtime.gyp | 31 -
chromium/patches/patch-net_base_dnsrr__resolver.cc | 37 --
.../patches/patch-net_base_host__resolver__impl.cc | 36 --
.../patches/patch-net_base_host__resolver__proc.cc | 44 --
chromium/patches/patch-net_base_listen__socket.cc | 12 -
.../patch-net_base_listen__socket__unittest.cc | 14 -
.../patch-net_base_listen__socket__unittest.h | 12 -
chromium/patches/patch-net_base_net__util.cc | 12 -
chromium/patches/patch-net_base_net__util.h | 12 -
.../patch-net_base_network__change__notifier.cc | 12 -
.../patches/patch-net_disk__cache_disk__format.h | 13 -
chromium/patches/patch-net_net.gyp | 75 ---
...atch-net_proxy_proxy__config__service__linux.cc | 194 ------
chromium/patches/patch-net_proxy_proxy__service.cc | 22 -
.../patches/patch-net_third__party_nss_ssl.gyp | 22 -
chromium/patches/patch-ppapi_ppapi__tests.gypi | 13 -
.../patch-ppapi_proxy_ppb__image__data__proxy.cc | 49 --
.../patch-ppapi_proxy_serialized__structs.h | 13 -
.../patches/patch-ppapi_proxy_serialized__var.cc | 13 -
chromium/patches/patch-printing_printing.gyp | 44 --
.../patch-remoting_base_compound__buffer.cc | 13 -
.../patches/patch-remoting_base_compound__buffer.h | 13 -
chromium/patches/patch-remoting_remoting.gyp | 89 ---
.../patch-remoting_tools_client__webserver_main.c | 13 -
chromium/patches/patch-sandbox_sandbox.gyp | 13 -
.../patch-skia_ext_bitmap__platform__device.h | 14 -
...patch-skia_ext_bitmap__platform__device__data.h | 52 --
chromium/patches/patch-skia_ext_canvas__paint.h | 14 -
chromium/patches/patch-skia_ext_platform__canvas.h | 26 -
chromium/patches/patch-skia_ext_platform__device.h | 15 -
chromium/patches/patch-skia_ext_vector__canvas.h | 34 -
.../patch-skia_ext_vector__platform__device.h | 14 -
chromium/patches/patch-skia_skia.gyp | 31 -
chromium/patches/patch-testing_gtest.gyp | 13 -
...sting_gtest_include_gtest_internal_gtest-port.h | 23 -
.../patch-testing_gtest_src_gtest-death-test.cc | 12 -
chromium/patches/patch-testing_gtest_src_gtest.cc | 21 -
...criptCore_JavaScriptCore.gyp_JavaScriptCore.gyp | 13 -
...rd__party_WebKit_Source_JavaScriptCore_config.h | 13 -
...y_WebKit_Source_JavaScriptCore_jit_JITStubs.cpp | 12 -
...rty_WebKit_Source_JavaScriptCore_wtf_Platform.h | 39 --
...y_WebKit_Source_WebCore_WebCore.gyp_WebCore.gyp | 61 --
...e_bindings_js_JSInspectorFrontendHostCustom.cpp | 19 -
...y_WebKit_Source_WebCore_bindings_v8_V8Proxy.cpp | 39 --
...ngs_v8_custom_V8InspectorFrontendHostCustom.cpp | 19 -
...rty_WebKit_Source_WebCore_dom_SelectElement.cpp | 13 -
...bKit_Source_WebCore_loader_cache_CachedFont.cpp | 13 -
...rty_WebKit_Source_WebCore_page_EventHandler.cpp | 13 -
..._WebCore_page_chromium_EventHandlerChromium.cpp | 13 -
...ty_WebKit_Source_WebCore_platform_Scrollbar.cpp | 13 -
...urce_WebCore_platform_chromium_PlatformBridge.h | 22 -
...e_platform_graphics_chromium_FontPlatformData.h | 13 -
...platform_graphics_skia_FontCustomPlatformData.h | 31 -
...platform_image-decoders_png_PNGImageDecoder.cpp | 91 ---
...latform_image-encoders_skia_PNGImageEncoder.cpp | 13 -
...urce_WebCore_storage_IDBDatabaseBackendImpl.cpp | 16 -
...ource_WebCore_websockets_WebSocketHandshake.cpp | 38 --
..._party_WebKit_Source_WebKit_chromium_WebKit.gyp | 49 --
...t_Source_WebKit_chromium_src_PlatformBridge.cpp | 31 -
...Kit_Source_WebKit_chromium_src_WebFrameImpl.cpp | 22 -
...bKit_Source_WebKit_chromium_src_WebViewImpl.cpp | 90 ---
...tch-third__party_angle_src_compiler_osinclude.h | 14 -
.../patch-third__party_cld_base_build__config.h | 39 --
.../patches/patch-third__party_expat_expat.gyp | 22 -
.../patches/patch-third__party_ffmpeg_ffmpeg.gyp | 31 -
...third__party_ffmpeg_patched-ffmpeg-mt_configure | 48 --
chromium/patches/patch-third__party_icu_icu.gyp | 31 -
.../patch-third__party_icu_source_configure | 13 -
.../patch-third__party_libjingle_libjingle.gyp | 43 --
..._party_libjingle_source_talk_base_nethelpers.cc | 13 -
...rd__party_libjingle_source_talk_base_network.cc | 13 -
...rty_libjingle_source_talk_base_socketaddress.cc | 12 -
...rd__party_libsrtp_src_crypto_include_integers.h | 13 -
.../patches/patch-third__party_libxml_libxml.gyp | 22 -
.../patches/patch-third__party_libxslt_libxslt.gyp | 22 -
...ird__party_mesa_MesaLib_src_mesa_main_imports.h | 12 -
chromium/patches/patch-third__party_mesa_mesa.gyp | 13 -
.../patches/patch-third__party_npapi_npapi.gyp | 13 -
chromium/patches/patch-third__party_qcms_qcms.gyp | 13 -
...ch-third__party_skia_include_core_SkPreConfig.h | 14 -
.../patches/patch-third__party_sqlite_sqlite.gyp | 31 -
...ird__party_yasm_source_patched-yasm_Makefile.in | 21 -
chromium/patches/patch-third__party_yasm_yasm.gyp | 20 -
.../patch-tools_gyp_pylib_gyp_____init____.py | 17 -
...yp_test_additional-targets_src_dir1_actions.gyp | 13 -
.../patch-tools_gyp_test_library_src_library.gyp | 13 -
chromium/patches/patch-ui_base_l10n_l10n__util.cc | 13 -
.../patch-ui_base_resource_resource__bundle.cc | 13 -
chromium/patches/patch-ui_base_ui__base.gypi | 22 -
chromium/patches/patch-ui_gfx_gfx.gyp | 22 -
chromium/patches/patch-ui_gfx_gfx__resources.grd | 13 -
chromium/patches/patch-ui_gfx_image.cc | 76 ---
chromium/patches/patch-ui_gfx_image.h | 22 -
.../patches/patch-ui_gfx_native__widget__types.h | 13 -
chromium/patches/patch-ui_ui.gyp | 13 -
.../patches/patch-ui_views_events_accelerator.cc | 22 -
.../patch-ui_views_focus_accelerator__handler.h | 13 -
.../patches/patch-ui_views_focus_focus__manager.cc | 13 -
chromium/patches/patch-ui_views_views.gyp | 31 -
chromium/patches/patch-v8_src_d8.gyp | 13 -
chromium/patches/patch-v8_src_globals.h | 14 -
chromium/patches/patch-v8_src_heap.cc | 14 -
.../patches/patch-v8_src_platform-dragonfly.cc | 691 ---------------------
chromium/patches/patch-v8_src_platform-netbsd.cc | 691 ---------------------
chromium/patches/patch-v8_src_platform-openbsd.cc | 129 ----
.../patches/patch-v8_src_x64_code-stubs-x64.cc | 99 ---
chromium/patches/patch-v8_src_x64_codegen-x64.cc | 165 -----
.../patches/patch-v8_src_x64_full-codegen-x64.cc | 44 --
.../patch-v8_src_x64_lithium-codegen-x64.cc | 13 -
.../patch-v8_src_x64_macro-assembler-x64.cc | 125 ----
.../patches/patch-v8_src_x64_macro-assembler-x64.h | 33 -
chromium/patches/patch-v8_tools_gyp_v8.gyp | 40 --
chromium/patches/patch-views_views.gyp | 49 --
.../patches/patch-webkit_glue_webkit__glue.gypi | 13 -
chromium/patches/patch-webkit_glue_webkit__glue.h | 13 -
.../patch-webkit_glue_webkitclient__impl.cc | 22 -
.../patches/patch-webkit_glue_webkitclient__impl.h | 22 -
...atch-webkit_plugins_npapi_plugin__lib__posix.cc | 14 -
...webkit_plugins_ppapi_ppapi__plugin__instance.cc | 67 --
...-webkit_plugins_ppapi_ppapi__plugin__instance.h | 13 -
...webkit_plugins_ppapi_ppb__file__system__impl.cc | 13 -
.../patch-webkit_plugins_ppapi_ppb__flash__impl.h | 13 -
.../patch-webkit_plugins_ppapi_ppb__pdf__impl.cc | 40 --
.../patch-webkit_support_webkit__support__glue.cc | 13 -
...it_tools_pepper__test__plugin_event__handler.cc | 13 -
...s_pepper__test__plugin_pepper__test__plugin.gyp | 18 -
.../patch-webkit_tools_test__shell_test__shell.cc | 13 -
...patch-webkit_tools_test__shell_test__shell.gypi | 83 ---
373 files changed, 15625 deletions(-)
diffs:
diff --git a/chromium-browser/DESCR b/chromium-browser/DESCR
deleted file mode 100644
index d5b7004f25..0000000000
--- a/chromium-browser/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Chromium is an open-source browser project that aims to build a safer,
-faster and more stable way for Internet users to experience the web.
diff --git a/chromium-browser/Makefile b/chromium-browser/Makefile
deleted file mode 100644
index 147713fbe4..0000000000
--- a/chromium-browser/Makefile
+++ /dev/null
@@ -1,90 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2012/09/24 18:26:53 asau Exp $
-
-DISTNAME= chromium-54.0.2823.2
-PKGNAME= ${DISTNAME:S/chromium-/chromium-browser-/}
-DIST_SUBDIR= ${PKGBASE}
-CATEGORIES= www
-MASTER_SITES= https://gsdview.appspot.com/chromium-browser-official/
-EXTRACT_SUFX= .tar.xz
-
-MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://dev.chromium.org/Home
-COMMENT= Open-source browser project
-LICENSE= modified-bsd
-
-USE_TOOLS+= bash bison flex gmake pax perl pkg-config
-USE_LANGUAGES= c c++
-
-BUILD_DEPENDS+= gperf-[0-9]*:../../devel/gperf
-BUILD_DEPENDS+= yasm-[0-9]*:../../devel/yasm
-
-ONLY_FOR_PLATFORM= *-*-arm *-*-i386 *-*-x86_64
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Linux" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "NetBSD"
-.include "../../audio/alsa-lib/buildlink3.mk"
-.endif
-
-REPLACE_PYTHON+= *.py
-REPLACE_PYTHON+= */*.py
-REPLACE_PYTHON+= */*/*.py
-REPLACE_PYTHON+= */*/*/*.py
-REPLACE_PYTHON+= */*/*/*/*.py
-REPLACE_PYTHON+= */*/*/*/*/*.py
-REPLACE_PYTHON+= */*/*/*/*/*/*.py
-REPLACE_PYTHON+= */*/*/*/*/*/*/*.py
-REPLACE_PYTHON+= */*/*/*/*/*/*/*/*.py
-REPLACE_PYTHON+= */*/*/*/*/*/*/*/*/*.py
-REPLACE_PYTHON+= */*/*/*/*/*/*/*/*/*/*.py
-
-SUBST_CLASSES+= python
-SUBST_MESSAGE.python= Fixing PYTHON path.
-SUBST_SED.python= -e "s|/usr/bin/python|${PYTHONBIN}|1"
-SUBST_FILES.python+= testing/chromoting/browser_test_commands_linux.txt
-SUBST_FILES.python+= testing/gtest/xcode/gtest.xcodeproj/project.pbxproj
-SUBST_FILES.python+= third_party/WebKit/LayoutTests/media/track/opera/track/webvtt/rendering/reftest/build-manifest.py
-SUBST_FILES.python+= third_party/WebKit/Tools/Scripts/generate-w3c-directory-owner-json
-SUBST_FILES.python+= third_party/WebKit/Tools/Scripts/print-json-test-results
-SUBST_FILES.python+= third_party/WebKit/Tools/Scripts/print-layout-test-times
-SUBST_FILES.python+= third_party/WebKit/Tools/Scripts/print-layout-test-types
-SUBST_FILES.python+= third_party/WebKit/Tools/Scripts/print-stale-test-expectations-entries
-SUBST_FILES.python+= third_party/WebKit/Tools/Scripts/print-test-ordering
-SUBST_FILES.python+= third_party/WebKit/Tools/Scripts/run-bindings-tests
-SUBST_FILES.python+= third_party/WebKit/Tools/Scripts/update-test-expectations
-SUBST_FILES.python+= third_party/WebKit/Tools/Scripts/update-w3c-deps
-SUBST_FILES.python+= third_party/WebKit/Tools/Scripts/webkitpy/common/system/executive_unittest.py
-SUBST_FILES.python+= third_party/libxslt/linux/Makefile
-SUBST_FILES.python+= third_party/libxslt/linux/config.log
-SUBST_FILES.python+= third_party/libxslt/linux/libexslt/Makefile
-SUBST_FILES.python+= third_party/libxslt/linux/libxslt/Makefile
-SUBST_FILES.python+= third_party/yasm/source/config/android/Makefile
-SUBST_FILES.python+= third_party/yasm/source/config/ios/Makefile
-SUBST_FILES.python+= third_party/yasm/source/config/linux/Makefile
-SUBST_FILES.python+= third_party/yasm/source/config/mac/Makefile
-SUBST_FILES.python+= third_party/yasm/source/config/openbsd/Makefile
-SUBST_FILES.python+= third_party/yasm/source/config/win/Makefile
-SUBST_FILES.python+= tools/gn/ninja_action_target_writer_unittest.cc
-SUBST_FILES.python+= tools/mb/mb_unittest.py
-SUBST_FILES.python+= tools/memory_inspector/memory_inspector_cli
-SUBST_FILES.python+= tools/usb_gadget/server.py
-SUBST_STAGE.python= pre-build
-
-do-build:
- ${RUN} cd ${WRKSRC} && ${PKGSRC_SETENV} ${MAKE_ENV} ${PYTHONBIN} ./tools/gn/bootstrap/bootstrap.py
-
-.include "../../devel/GConf/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libevent/buildlink3.mk"
-.include "../../devel/nss/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../lang/python/pyversion.mk"
-.include "../../lang/python/application.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../multimedia/libvpx/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libXScrnSaver/buildlink3.mk"
-.include "../../x11/libXtst/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/chromium-browser/PLIST b/chromium-browser/PLIST
deleted file mode 100644
index 30b7082bb7..0000000000
--- a/chromium-browser/PLIST
+++ /dev/null
@@ -1,232 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2011/04/28 03:09:01 rxg Exp $
-bin/chrome
-man/man1/chrome.1
-share/chromium/chrome
-share/chromium/chrome-wrapper
-share/chromium/chrome.pak
-share/chromium/ffmpegsumo_nolink
-share/chromium/libffmpegsumo.so
-share/chromium/locales/am.pak
-share/chromium/locales/ar.pak
-share/chromium/locales/bg.pak
-share/chromium/locales/bn.pak
-share/chromium/locales/ca.pak
-share/chromium/locales/cs.pak
-share/chromium/locales/da.pak
-share/chromium/locales/de.pak
-share/chromium/locales/el.pak
-share/chromium/locales/en-GB.pak
-share/chromium/locales/en-US.pak
-share/chromium/locales/es-419.pak
-share/chromium/locales/es.pak
-share/chromium/locales/et.pak
-share/chromium/locales/fa.pak
-share/chromium/locales/fi.pak
-share/chromium/locales/fil.pak
-share/chromium/locales/fr.pak
-share/chromium/locales/gu.pak
-share/chromium/locales/he.pak
-share/chromium/locales/hi.pak
-share/chromium/locales/hr.pak
-share/chromium/locales/hu.pak
-share/chromium/locales/id.pak
-share/chromium/locales/it.pak
-share/chromium/locales/ja.pak
-share/chromium/locales/kn.pak
-share/chromium/locales/ko.pak
-share/chromium/locales/lt.pak
-share/chromium/locales/lv.pak
-share/chromium/locales/ml.pak
-share/chromium/locales/mr.pak
-share/chromium/locales/nb.pak
-share/chromium/locales/nl.pak
-share/chromium/locales/pl.pak
-share/chromium/locales/pt-BR.pak
-share/chromium/locales/pt-PT.pak
-share/chromium/locales/ro.pak
-share/chromium/locales/ru.pak
-share/chromium/locales/sk.pak
-share/chromium/locales/sl.pak
-share/chromium/locales/sr.pak
-share/chromium/locales/sv.pak
-share/chromium/locales/sw.pak
-share/chromium/locales/ta.pak
-share/chromium/locales/te.pak
-share/chromium/locales/th.pak
-share/chromium/locales/tr.pak
-share/chromium/locales/uk.pak
-share/chromium/locales/vi.pak
-share/chromium/locales/zh-CN.pak
-share/chromium/locales/zh-TW.pak
-share/chromium/mksnapshot
-share/chromium/product_logo_48.png
-share/chromium/protoc
-share/chromium/resources.pak
-share/chromium/resources/inspector/DevTools.js
-share/chromium/resources/inspector/Images/applicationCache.png
-share/chromium/resources/inspector/Images/auditsIcon.png
-share/chromium/resources/inspector/Images/back.png
-share/chromium/resources/inspector/Images/breakpointBorder.png
-share/chromium/resources/inspector/Images/breakpointConditionalBorder.png
-share/chromium/resources/inspector/Images/breakpointConditionalCounterBorder.png
-share/chromium/resources/inspector/Images/breakpointCounterBorder.png
-share/chromium/resources/inspector/Images/breakpointsActivateButtonGlyph.png
-share/chromium/resources/inspector/Images/breakpointsDeactivateButtonGlyph.png
-share/chromium/resources/inspector/Images/checker.png
-share/chromium/resources/inspector/Images/clearConsoleButtonGlyph.png
-share/chromium/resources/inspector/Images/closeButtons.png
-share/chromium/resources/inspector/Images/consoleButtonGlyph.png
-share/chromium/resources/inspector/Images/consoleIcon.png
-share/chromium/resources/inspector/Images/cookie.png
-share/chromium/resources/inspector/Images/database.png
-share/chromium/resources/inspector/Images/databaseTable.png
-share/chromium/resources/inspector/Images/debuggerContinue.png
-share/chromium/resources/inspector/Images/debuggerPause.png
-share/chromium/resources/inspector/Images/debuggerStepInto.png
-share/chromium/resources/inspector/Images/debuggerStepOut.png
-share/chromium/resources/inspector/Images/debuggerStepOver.png
-share/chromium/resources/inspector/Images/disclosureTriangleSmallDown.png
-share/chromium/resources/inspector/Images/disclosureTriangleSmallDownBlack.png
-share/chromium/resources/inspector/Images/disclosureTriangleSmallDownWhite.png
-share/chromium/resources/inspector/Images/disclosureTriangleSmallRight.png
-share/chromium/resources/inspector/Images/disclosureTriangleSmallRightBlack.png
-share/chromium/resources/inspector/Images/disclosureTriangleSmallRightDown.png
-share/chromium/resources/inspector/Images/disclosureTriangleSmallRightDownBlack.png
-share/chromium/resources/inspector/Images/disclosureTriangleSmallRightDownWhite.png
-share/chromium/resources/inspector/Images/disclosureTriangleSmallRightWhite.png
-share/chromium/resources/inspector/Images/dockButtonGlyph.png
-share/chromium/resources/inspector/Images/elementsIcon.png
-share/chromium/resources/inspector/Images/enableOutlineButtonGlyph.png
-share/chromium/resources/inspector/Images/enableSolidButtonGlyph.png
-share/chromium/resources/inspector/Images/errorIcon.png
-share/chromium/resources/inspector/Images/errorMediumIcon.png
-share/chromium/resources/inspector/Images/errorRedDot.png
-share/chromium/resources/inspector/Images/excludeButtonGlyph.png
-share/chromium/resources/inspector/Images/focusButtonGlyph.png
-share/chromium/resources/inspector/Images/forward.png
-share/chromium/resources/inspector/Images/frame.png
-share/chromium/resources/inspector/Images/gearButtonGlyph.png
-share/chromium/resources/inspector/Images/glossyHeader.png
-share/chromium/resources/inspector/Images/glossyHeaderPressed.png
-share/chromium/resources/inspector/Images/glossyHeaderSelected.png
-share/chromium/resources/inspector/Images/glossyHeaderSelectedPressed.png
-share/chromium/resources/inspector/Images/goArrow.png
-share/chromium/resources/inspector/Images/graphLabelCalloutLeft.png
-share/chromium/resources/inspector/Images/graphLabelCalloutRight.png
-share/chromium/resources/inspector/Images/largerResourcesButtonGlyph.png
-share/chromium/resources/inspector/Images/localStorage.png
-share/chromium/resources/inspector/Images/networkIcon.png
-share/chromium/resources/inspector/Images/nodeSearchButtonGlyph.png
-share/chromium/resources/inspector/Images/paneAddButtons.png
-share/chromium/resources/inspector/Images/paneBottomGrow.png
-share/chromium/resources/inspector/Images/paneBottomGrowActive.png
-share/chromium/resources/inspector/Images/paneGrowHandleLine.png
-share/chromium/resources/inspector/Images/paneSettingsButtons.png
-share/chromium/resources/inspector/Images/pauseOnExceptionButtonGlyph.png
-share/chromium/resources/inspector/Images/percentButtonGlyph.png
-share/chromium/resources/inspector/Images/popoverArrows.png
-share/chromium/resources/inspector/Images/popoverBackground.png
-share/chromium/resources/inspector/Images/profileGroupIcon.png
-share/chromium/resources/inspector/Images/profileIcon.png
-share/chromium/resources/inspector/Images/profileSmallIcon.png
-share/chromium/resources/inspector/Images/profilesIcon.png
-share/chromium/resources/inspector/Images/profilesSilhouette.png
-share/chromium/resources/inspector/Images/programCounterBorder.png
-share/chromium/resources/inspector/Images/radioDot.png
-share/chromium/resources/inspector/Images/recordButtonGlyph.png
-share/chromium/resources/inspector/Images/recordToggledButtonGlyph.png
-share/chromium/resources/inspector/Images/reloadButtonGlyph.png
-share/chromium/resources/inspector/Images/resourceCSSIcon.png
-share/chromium/resources/inspector/Images/resourceDocumentIcon.png
-share/chromium/resources/inspector/Images/resourceDocumentIconSmall.png
-share/chromium/resources/inspector/Images/resourceJSIcon.png
-share/chromium/resources/inspector/Images/resourcePlainIcon.png
-share/chromium/resources/inspector/Images/resourcePlainIconSmall.png
-share/chromium/resources/inspector/Images/resourcesIcon.png
-share/chromium/resources/inspector/Images/resourcesSizeGraphIcon.png
-share/chromium/resources/inspector/Images/resourcesTimeGraphIcon.png
-share/chromium/resources/inspector/Images/scriptsIcon.png
-share/chromium/resources/inspector/Images/scriptsSilhouette.png
-share/chromium/resources/inspector/Images/searchSmallBlue.png
-share/chromium/resources/inspector/Images/searchSmallBrightBlue.png
-share/chromium/resources/inspector/Images/searchSmallGray.png
-share/chromium/resources/inspector/Images/searchSmallWhite.png
-share/chromium/resources/inspector/Images/segment.png
-share/chromium/resources/inspector/Images/segmentChromium.png
-share/chromium/resources/inspector/Images/segmentEnd.png
-share/chromium/resources/inspector/Images/segmentHover.png
-share/chromium/resources/inspector/Images/segmentHoverChromium.png
-share/chromium/resources/inspector/Images/segmentHoverEnd.png
-share/chromium/resources/inspector/Images/segmentHoverEndChromium.png
-share/chromium/resources/inspector/Images/segmentSelected.png
-share/chromium/resources/inspector/Images/segmentSelectedChromium.png
-share/chromium/resources/inspector/Images/segmentSelectedEnd.png
-share/chromium/resources/inspector/Images/segmentSelectedEndChromium.png
-share/chromium/resources/inspector/Images/sessionStorage.png
-share/chromium/resources/inspector/Images/spinner.gif
-share/chromium/resources/inspector/Images/splitviewDimple.png
-share/chromium/resources/inspector/Images/splitviewDividerBackground.png
-share/chromium/resources/inspector/Images/statusbarBackground.png
-share/chromium/resources/inspector/Images/statusbarBackgroundChromium.png
-share/chromium/resources/inspector/Images/statusbarBottomBackground.png
-share/chromium/resources/inspector/Images/statusbarBottomBackgroundChromium.png
-share/chromium/resources/inspector/Images/statusbarButtons.png
-share/chromium/resources/inspector/Images/statusbarButtonsChromium.png
-share/chromium/resources/inspector/Images/statusbarMenuButton.png
-share/chromium/resources/inspector/Images/statusbarMenuButtonChromium.png
-share/chromium/resources/inspector/Images/statusbarMenuButtonSelected.png
-share/chromium/resources/inspector/Images/statusbarMenuButtonSelectedChromium.png
-share/chromium/resources/inspector/Images/statusbarResizerHorizontal.png
-share/chromium/resources/inspector/Images/statusbarResizerVertical.png
-share/chromium/resources/inspector/Images/successGreenDot.png
-share/chromium/resources/inspector/Images/thumbActiveHoriz.png
-share/chromium/resources/inspector/Images/thumbActiveVert.png
-share/chromium/resources/inspector/Images/thumbHoriz.png
-share/chromium/resources/inspector/Images/thumbHoverHoriz.png
-share/chromium/resources/inspector/Images/thumbHoverVert.png
-share/chromium/resources/inspector/Images/thumbVert.png
-share/chromium/resources/inspector/Images/timelineBarBlue.png
-share/chromium/resources/inspector/Images/timelineBarGray.png
-share/chromium/resources/inspector/Images/timelineBarGreen.png
-share/chromium/resources/inspector/Images/timelineBarOrange.png
-share/chromium/resources/inspector/Images/timelineBarPurple.png
-share/chromium/resources/inspector/Images/timelineBarRed.png
-share/chromium/resources/inspector/Images/timelineBarYellow.png
-share/chromium/resources/inspector/Images/timelineCheckmarks.png
-share/chromium/resources/inspector/Images/timelineDots.png
-share/chromium/resources/inspector/Images/timelineHollowPillBlue.png
-share/chromium/resources/inspector/Images/timelineHollowPillGray.png
-share/chromium/resources/inspector/Images/timelineHollowPillGreen.png
-share/chromium/resources/inspector/Images/timelineHollowPillOrange.png
-share/chromium/resources/inspector/Images/timelineHollowPillPurple.png
-share/chromium/resources/inspector/Images/timelineHollowPillRed.png
-share/chromium/resources/inspector/Images/timelineHollowPillYellow.png
-share/chromium/resources/inspector/Images/timelineIcon.png
-share/chromium/resources/inspector/Images/timelinePillBlue.png
-share/chromium/resources/inspector/Images/timelinePillGray.png
-share/chromium/resources/inspector/Images/timelinePillGreen.png
-share/chromium/resources/inspector/Images/timelinePillOrange.png
-share/chromium/resources/inspector/Images/timelinePillPurple.png
-share/chromium/resources/inspector/Images/timelinePillRed.png
-share/chromium/resources/inspector/Images/timelinePillYellow.png
-share/chromium/resources/inspector/Images/toolbarItemSelected.png
-share/chromium/resources/inspector/Images/trackHoriz.png
-share/chromium/resources/inspector/Images/trackVert.png
-share/chromium/resources/inspector/Images/treeDownTriangleBlack.png
-share/chromium/resources/inspector/Images/treeDownTriangleWhite.png
-share/chromium/resources/inspector/Images/treeRightTriangleBlack.png
-share/chromium/resources/inspector/Images/treeRightTriangleWhite.png
-share/chromium/resources/inspector/Images/treeUpTriangleBlack.png
-share/chromium/resources/inspector/Images/treeUpTriangleWhite.png
-share/chromium/resources/inspector/Images/undockButtonGlyph.png
-share/chromium/resources/inspector/Images/userInputIcon.png
-share/chromium/resources/inspector/Images/userInputPreviousIcon.png
-share/chromium/resources/inspector/Images/userInputResultIcon.png
-share/chromium/resources/inspector/Images/warningIcon.png
-share/chromium/resources/inspector/Images/warningMediumIcon.png
-share/chromium/resources/inspector/Images/warningOrangeDot.png
-share/chromium/resources/inspector/Images/warningsErrors.png
-share/chromium/resources/inspector/devTools.css
-share/chromium/resources/inspector/devtools.html
-share/chromium/xdg-mime
-share/chromium/xdg-settings
diff --git a/chromium-browser/TODO b/chromium-browser/TODO
deleted file mode 100644
index e5bc23d9aa..0000000000
--- a/chromium-browser/TODO
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: TODO,v 1.12 2015/09/14 22:26:13 venture37 Exp $
-
-* debug
-* test on Linux/FreeBSD/OpenBSD
-* use libtool
-
-When updating this package, please have a look at:
-- http://secunia.com/advisories/46636/
-- http://secunia.com/advisories/47694/
-- http://www.secunia.com/advisories/62964/
-- http://secunia.com/advisories/63496/
-- http://googlechromereleases.blogspot.com/2015/04/stable-channel-update_28.html
-- http://googlechromereleases.blogspot.com/2015/09/stable-channel-update.html
-- https://www.debian.org/security/2015/dsa-3376
-- https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-6792
-- https://www.debian.org/security/2015/dsa-3418
-- http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-8664
-- http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-1643
-- http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-1644
-- http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-1645
diff --git a/chromium-browser/distinfo b/chromium-browser/distinfo
deleted file mode 100644
index 5c8dec94de..0000000000
--- a/chromium-browser/distinfo
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: distinfo,v 1.11 2012/11/17 02:57:11 gduzan Exp $
-
-SHA1 (chromium-browser/chromium-54.0.2823.2.tar.xz) = 376d0423d71bd975bd3ed36d5afb5913a6ac9076
-RMD160 (chromium-browser/chromium-54.0.2823.2.tar.xz) = 3ed9aa58b22677850bd447f6f215da3c373da7bb
-SHA512 (chromium-browser/chromium-54.0.2823.2.tar.xz) = f07d0410018cc243bb640f4b30234f081e1b9453088bb236acc6a837c40c084e98fe87c229b4ad3b96f64ca0bd307cdc8af166aad62d152b657c64b4964df7d3
-Size (chromium-browser/chromium-54.0.2823.2.tar.xz) = 459527568 bytes
-SHA1 (patch-base_BUILD.gn) = 86e371e11400408bb00efa0cd9950c3661a75241
-SHA1 (patch-base_debug_debugger__posix.cc) = d8e481b42d981d6a69c7bd4f48fc2b3a0e5fca3f
-SHA1 (patch-base_message__loop_message__loop.cc) = 134ab83da65cdba2bee7ea0f8aba58a9ae2a2934
-SHA1 (patch-base_process_process__handle__netbsd.cc) = ab7cfee4e3107edc8759fc8645570c9cbbe2f82b
-SHA1 (patch-base_process_process__iterator.h) = 5fd886e1cb2e514949a36d60bae7f81747199de2
-SHA1 (patch-base_process_process__iterator__netbsd.cc) = 3be0f12a62474bed005bda39b2516f51f24d6045
-SHA1 (patch-base_process_process__metrics__netbsd.cc) = a73867fbda45c71096de8c62db5717e2c1f96089
-SHA1 (patch-base_process_process__metrics__posix.cc) = 28a2984b0031cedffd5bf9f2ea1077d7db32a0dd
-SHA1 (patch-base_process_process__posix.cc) = 9c7b8b7a521a37bf4a82b23d5aca2a6600b40ad6
-SHA1 (patch-base_sys__info__netbsd.cc) = 3ec352d89cff08c54d64ba8f7cc55edd272a7b31
-SHA1 (patch-base_third__party_libevent_event-config.h) = 33db5372673f795e15bb05fae2ad20042dd08e0a
-SHA1 (patch-base_third__party_libevent_netbsd_config.h) = 24ac9717d058c80e11731fd8d537c0389f2df64e
-SHA1 (patch-base_third__party_libevent_netbsd_event-config.h) = 4bc1854a493403ebc893d5dddf74cd6ae666871e
-SHA1 (patch-base_threading_platform__thread__netbsd.cc) = d0b3d77d70431a89b2086400512ce4f8dea3b153
-SHA1 (patch-base_trace__event_malloc__dump__provider.cc) = ad65236630afb07a6c5e5826b61a62bc3a6b3e87
-SHA1 (patch-base_trace__event_memory__dump__manager.cc) = 417cb36c46c8a6c61129865b3d03196c12960ae8
-SHA1 (patch-base_trace__event_process__memory__dump.cc) = 93f2cbf50de0101fb96e682ba8bbaa4e8672129e
-SHA1 (patch-build_config_BUILDCONFIG.gn) = 8c4b8fc0ecb1f85a4fa496dc571c268a0dc0ce83
-SHA1 (patch-build_config_compiler_BUILD.gn) = 1fed5346671a1217fdcf24bfaa07dfee123ac5e1
-SHA1 (patch-build_toolchain_netbsd_BUILD.gn) = a725cd331e1da37a14f9d907ead139129fb096a8
-SHA1 (patch-third__party_icu_android_patch__locale.sh) = 136608a43c01d456f80e094c7d79a90dd5e35b76
-SHA1 (patch-third__party_icu_source_configure) = 288bb5fb8e0ad5320b1dd40463148b36943576a1
-SHA1 (patch-third__party_protobuf_post__process__dist.sh) = 37b9e9d045488d4363b004ac7622fc16ea1da377
-SHA1 (patch-third__party_xdg-utils_scripts_xdg-terminal) = 8ee475f349c0493f524cae151c8919739b558b78
-SHA1 (patch-third__party_xdg-utils_scripts_xdg-terminal.in) = cbfe88e4e7aa33a3f63b963ec19154148b8e6638
-SHA1 (patch-tools_battor__agent_BUILD.gn) = 957316e0916dfc4063d6cea68a96d3154d0ade2a
-SHA1 (patch-tools_gn_bootstrap_bootstrap.py) = 5868d6842def588c3eaef5d69473543d8eff40d0
-SHA1 (patch-tools_gn_setup.cc) = aaa675ca5d96d981c6264e8332b26fc560d3101a
-SHA1 (patch-tools_gn_variables.cc) = f5b38601e616696f370e0a22b3dbbff7abb628f6
-SHA1 (patch-v8_tools_run-llprof.sh) = 8ea2932981ce8d89f0cc2cd8979bd5e07870645e
diff --git a/chromium-browser/patches/patch-base_BUILD.gn b/chromium-browser/patches/patch-base_BUILD.gn
deleted file mode 100644
index 2c89d39d09..0000000000
--- a/chromium-browser/patches/patch-base_BUILD.gn
+++ /dev/null
@@ -1,32 +0,0 @@
-$NetBSD$
-
---- base/BUILD.gn.orig 2016-08-05 17:13:37.000000000 +0000
-+++ base/BUILD.gn
-@@ -636,16 +636,19 @@ component("base") {
- "process/process_iterator.h",
-
- #"process/process_iterator_freebsd.cc", # Unused in Chromium build.
-+ "process/process_iterator_netbsd.cc",
- "process/process_iterator_linux.cc",
- "process/process_iterator_mac.cc",
-
- #"process/process_iterator_openbsd.cc", # Unused in Chromium build.
-+ "process/process_iterator_netbsd.cc",
- "process/process_iterator_win.cc",
- "process/process_linux.cc",
- "process/process_metrics.cc",
- "process/process_metrics.h",
-
- #"process/process_metrics_freebsd.cc", # Unused in Chromium build.
-+ "process/process_metrics_netbsd.cc",
- "process/process_metrics_ios.cc",
- "process/process_metrics_linux.cc",
- "process/process_metrics_mac.cc",
-@@ -759,6 +762,7 @@ component("base") {
- "sys_info_chromeos.cc",
-
- #"sys_info_freebsd.cc", # Unused in Chromium build.
-+ "sys_info_netbsd.cc", # Unused in Chromium build.
- "sys_info_ios.mm",
- "sys_info_linux.cc",
- "sys_info_mac.mm",
diff --git a/chromium-browser/patches/patch-base_debug_debugger__posix.cc b/chromium-browser/patches/patch-base_debug_debugger__posix.cc
deleted file mode 100644
index 3a3ffd326c..0000000000
--- a/chromium-browser/patches/patch-base_debug_debugger__posix.cc
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD$
-
---- base/debug/debugger_posix.cc.orig 2016-08-05 17:13:37.000000000 +0000
-+++ base/debug/debugger_posix.cc
-@@ -54,7 +54,47 @@
- namespace base {
- namespace debug {
-
--#if defined(OS_MACOSX) || defined(OS_BSD)
-+#if defined(OS_NETBSD)
-+bool BeingDebugged() {
-+ static bool is_set = false;
-+ static bool being_debugged = false;
-+ int ret;
-+
-+ if (is_set)
-+ return being_debugged;
-+
-+ int mib[6];
-+ size_t size;
-+ struct kinfo_proc2 kproc;
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC2;
-+ mib[2] = KERN_PROC_PID;
-+ mib[3] = getpid();
-+ mib[4] = sizeof(kinfo_proc2);
-+ mib[5] = 1;
-+
-+ ret = sysctl((int *)mib, 6, NULL, &size, NULL, 0);
-+ if (ret == -1) {
-+ return -1;
-+ }
-+
-+ mib[5] = (size / sizeof(kinfo_proc2));
-+
-+ ret = sysctl((int *)mib, 6, &kproc, &size, NULL, 0);
-+ if (ret == -1) {
-+ return -1;
-+ is_set = true;
-+ being_debugged = false;
-+ return being_debugged;
-+ }
-+
-+ is_set = true;
-+ being_debugged = (kproc.p_flag & P_TRACED) != 0;
-+ return being_debugged;
-+
-+}
-+#elif defined(OS_MACOSX) || defined(OS_BSD)
-
- // Based on Apple's recommended method as described in
- // http://developer.apple.com/qa/qa2004/qa1361.html
-@@ -90,7 +130,11 @@ bool BeingDebugged() {
-
- // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and
- // binary interfaces may change.
-+#if defined(OS_NETBSD)
-+ struct kinfo_proc2 info;
-+#else
- struct kinfo_proc info;
-+#endif
- size_t info_size = sizeof(info);
-
- #if defined(OS_OPENBSD)
diff --git a/chromium-browser/patches/patch-base_message__loop_message__loop.cc b/chromium-browser/patches/patch-base_message__loop_message__loop.cc
deleted file mode 100644
index 63b1615458..0000000000
--- a/chromium-browser/patches/patch-base_message__loop_message__loop.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- base/message_loop/message_loop.cc.orig 2016-08-05 17:13:37.000000000 +0000
-+++ base/message_loop/message_loop.cc
-@@ -214,7 +214,7 @@ std::unique_ptr<MessagePump> MessageLoop
- // TODO(rvargas): Get rid of the OS guards.
- #if defined(USE_GLIB) && !defined(OS_NACL)
- typedef MessagePumpGlib MessagePumpForUI;
--#elif defined(OS_LINUX) && !defined(OS_NACL)
-+#elif (defined(OS_LINUX) && !defined(OS_NACL)) || defined(OS_BSD)
- typedef MessagePumpLibevent MessagePumpForUI;
- #endif
-
diff --git a/chromium-browser/patches/patch-base_process_process__handle__netbsd.cc b/chromium-browser/patches/patch-base_process_process__handle__netbsd.cc
deleted file mode 100644
index 2eade4eb35..0000000000
--- a/chromium-browser/patches/patch-base_process_process__handle__netbsd.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD$
-
---- base/process/process_handle_netbsd.cc.orig 2016-08-05 20:43:29.878159383 +0000
-+++ base/process/process_handle_netbsd.cc
-@@ -0,0 +1,67 @@
-+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "base/macros.h"
-+#include "base/process/process_handle.h"
-+
-+#include <stddef.h>
-+#include <sys/sysctl.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-+
-+namespace base {
-+
-+ProcessId GetParentProcessId(ProcessHandle process) {
-+ struct kinfo_proc2 info;
-+ size_t info_size = sizeof(struct kinfo_proc2);
-+ int mib[6];
-+ int ret;
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC2;
-+ mib[2] = KERN_PROC_PID;
-+ mib[3] = process;
-+ mib[4] = info_size;
-+ mib[5] = 1;
-+
-+ ret = sysctl(mib, 6, &info, &info_size, NULL, 0);
-+ if (ret == -1) {
-+ return -1;
-+ }
-+ if (info_size == 0) {
-+ return -1;
-+ }
-+
-+ return info.p_ppid;
-+}
-+
-+FilePath GetProcessExecutablePath(ProcessHandle process) {
-+ struct kinfo_proc2 info;
-+ size_t size = sizeof(struct kinfo_proc2);
-+ int mib[4];
-+ int ret;
-+ char pathname[MAXPATHLEN];
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC_ARGS;
-+ mib[2] = process;
-+ mib[3] = KERN_PROC_PATHNAME;
-+
-+ ret = sysctl(mib, 4, NULL, &size, NULL, 0);
-+ if (ret == -1) {
-+ return FilePath();
-+ }
-+
-+ ret = sysctl(mib, 4, pathname, &size, NULL, 0);
-+ if (ret == -1) {
-+ return FilePath();
-+ }
-+ if (size == 0 || strlen(pathname) == 0) {
-+ return FilePath();
-+ }
-+
-+ return FilePath(pathname);
-+}
-+
-+} // namespace base
diff --git a/chromium-browser/patches/patch-base_process_process__iterator.h b/chromium-browser/patches/patch-base_process_process__iterator.h
deleted file mode 100644
index 97430b632c..0000000000
--- a/chromium-browser/patches/patch-base_process_process__iterator.h
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD$
-
---- base/process/process_iterator.h.orig 2016-08-05 17:13:37.000000000 +0000
-+++ base/process/process_iterator.h
-@@ -22,7 +22,7 @@
- #if defined(OS_WIN)
- #include <windows.h>
- #include <tlhelp32.h>
--#elif defined(OS_MACOSX) || defined(OS_OPENBSD)
-+#elif defined(OS_MACOSX) || defined(OS_NETBSD) || defined(OS_OPENBSD)
- #include <sys/sysctl.h>
- #elif defined(OS_FREEBSD)
- #include <sys/user.h>
-@@ -110,7 +110,11 @@ class BASE_EXPORT ProcessIterator {
- HANDLE snapshot_;
- bool started_iteration_;
- #elif defined(OS_MACOSX) || defined(OS_BSD)
-+#if defined(OS_NETBSD)
-+ std::vector<kinfo_proc2> kinfo_procs_;
-+#else
- std::vector<kinfo_proc> kinfo_procs_;
-+#endif
- size_t index_of_kinfo_proc_;
- #elif defined(OS_POSIX)
- DIR* procfs_dir_;
diff --git a/chromium-browser/patches/patch-base_process_process__iterator__netbsd.cc b/chromium-browser/patches/patch-base_process_process__iterator__netbsd.cc
deleted file mode 100644
index 0d5cdf9437..0000000000
--- a/chromium-browser/patches/patch-base_process_process__iterator__netbsd.cc
+++ /dev/null
@@ -1,150 +0,0 @@
-$NetBSD$
-
---- base/process/process_iterator_netbsd.cc.orig 2016-08-05 20:43:29.887677322 +0000
-+++ base/process/process_iterator_netbsd.cc
-@@ -0,0 +1,145 @@
-+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "base/process/process_iterator.h"
-+
-+#include <errno.h>
-+#include <sys/types.h>
-+#include <stddef.h>
-+#include <sys/sysctl.h>
-+#include <unistd.h>
-+
-+/* getuid() */
-+#include <unistd.h>
-+#include <sys/types.h>
-+
-+#include "base/logging.h"
-+#include "base/macros.h"
-+#include "base/strings/string_split.h"
-+#include "base/strings/string_util.h"
-+
-+namespace base {
-+
-+ProcessIterator::ProcessIterator(const ProcessFilter* filter)
-+ : index_of_kinfo_proc_(),
-+ filter_(filter) {
-+
-+ int mib[6];
-+
-+ printf("%s\n", __PRETTY_FUNCTION__);
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC2;
-+ mib[2] = KERN_PROC_UID;
-+ mib[3] = getuid();
-+ mib[4] = sizeof(struct kinfo_proc2);
-+ mib[5] = 0;
-+
-+ bool done = false;
-+ int try_num = 1;
-+ const int max_tries = 10;
-+
-+ do {
-+ size_t len = 0;
-+ if (sysctl(mib, 6, NULL, &len, NULL, 0) <0 ){
-+ LOG(ERROR) << "failed to get the size needed for the process list";
-+ kinfo_procs_.resize(0);
-+ done = true;
-+ } else {
-+ size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc2);
-+ // Leave some spare room for process table growth (more could show up
-+ // between when we check and now)
-+ num_of_kinfo_proc += 16;
-+ kinfo_procs_.resize(num_of_kinfo_proc);
-+ len = num_of_kinfo_proc * sizeof(struct kinfo_proc2);
-+ if (sysctl(mib, 6, &kinfo_procs_[0], &len, NULL, 0) <0) {
-+ // If we get a mem error, it just means we need a bigger buffer, so
-+ // loop around again. Anything else is a real error and give up.
-+ if (errno != ENOMEM) {
-+ LOG(ERROR) << "failed to get the process list";
-+ kinfo_procs_.resize(0);
-+ done = true;
-+ }
-+ } else {
-+ // Got the list, just make sure we're sized exactly right
-+ size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc2);
-+ kinfo_procs_.resize(num_of_kinfo_proc);
-+ done = true;
-+ }
-+ }
-+ } while (!done && (try_num++ < max_tries));
-+
-+ if (!done) {
-+ LOG(ERROR) << "failed to collect the process list in a few tries";
-+ kinfo_procs_.resize(0);
-+ }
-+}
-+
-+ProcessIterator::~ProcessIterator() {
-+}
-+
-+bool ProcessIterator::CheckForNextProcess() {
-+ std::string data;
-+ for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) {
-+ kinfo_proc2& kinfo = kinfo_procs_[index_of_kinfo_proc_];
-+
-+ // Skip processes just awaiting collection
-+ if ((kinfo.p_pid > 0) && (kinfo.p_stat == SZOMB))
-+ continue;
-+
-+ int mib[] = { CTL_KERN, KERN_PROC_ARGS, kinfo.p_pid };
-+
-+ // Find out what size buffer we need.
-+ size_t data_len = 0;
-+ if (sysctl(mib, arraysize(mib), NULL, &data_len, NULL, 0) < 0) {
-+ DVPLOG(1) << "failed to figure out the buffer size for a commandline";
-+ continue;
-+ }
-+
-+ data.resize(data_len);
-+ if (sysctl(mib, arraysize(mib), &data[0], &data_len, NULL, 0) < 0) {
-+ DVPLOG(1) << "failed to fetch a commandline";
-+ continue;
-+ }
-+ // |data| contains all the command line parameters of the process, separated
-+ // by blocks of one or more null characters. We tokenize |data| into a
-+ // vector of strings using '\0' as a delimiter and populate
-+ // |entry_.cmd_line_args_|.
-+ std::string delimiters;
-+ delimiters.push_back('\0');
-+ entry_.cmd_line_args_ = SplitString(data, delimiters, KEEP_WHITESPACE,
-+ SPLIT_WANT_NONEMPTY);
-+
-+ // |data| starts with the full executable path followed by a null character.
-+ // We search for the first instance of '\0' and extract everything before it
-+ // to populate |entry_.exe_file_|.
-+ size_t exec_name_end = data.find('\0');
-+ if (exec_name_end == std::string::npos) {
-+ DLOG(ERROR) << "command line data didn't match expected format";
-+ continue;
-+ }
-+
-+ entry_.pid_ = kinfo.p_pid;
-+ entry_.ppid_ = kinfo.p_ppid;
-+ entry_.gid_ = kinfo.p__pgid;
-+ size_t last_slash = data.rfind('/', exec_name_end);
-+ if (last_slash == std::string::npos)
-+ entry_.exe_file_.assign(data, 0, exec_name_end);
-+ else
-+ entry_.exe_file_.assign(data, last_slash + 1,
-+ exec_name_end - last_slash - 1);
-+ // Start w/ the next entry next time through
-+ ++index_of_kinfo_proc_;
-+ // Done
-+ return true;
-+ }
-+ return false;
-+}
-+
-+bool NamedProcessIterator::IncludeEntry() {
-+ return (executable_name_ == entry().exe_file() &&
-+ ProcessIterator::IncludeEntry());
-+}
-+
-+} // namespace base
diff --git a/chromium-browser/patches/patch-base_process_process__metrics__netbsd.cc b/chromium-browser/patches/patch-base_process_process__metrics__netbsd.cc
deleted file mode 100644
index 521ed350e4..0000000000
--- a/chromium-browser/patches/patch-base_process_process__metrics__netbsd.cc
+++ /dev/null
@@ -1,218 +0,0 @@
-$NetBSD$
-
---- base/process/process_metrics_netbsd.cc.orig 2016-08-05 20:43:29.892467804 +0000
-+++ base/process/process_metrics_netbsd.cc
-@@ -0,0 +1,213 @@
-+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "base/process/process_metrics.h"
-+
-+#include <stddef.h>
-+#include <sys/sysctl.h>
-+#include <sys/user.h>
-+#include <unistd.h>
-+
-+#include "base/macros.h"
-+#include "base/sys_info.h"
-+
-+#include <unistd.h> /* getpagesize() */
-+#include <fcntl.h> /* O_RDONLY */
-+
-+#include <uvm/uvm_extern.h> /* struct vmtotal */
-+
-+#include "base/files/dir_reader_posix.h"
-+#include "base/files/file_util.h"
-+#include "base/logging.h"
-+#include "base/memory/ptr_util.h"
-+#include "base/strings/string_number_conversions.h"
-+#include "base/strings/string_split.h"
-+#include "base/strings/string_tokenizer.h"
-+#include "base/strings/string_util.h"
-+#include "base/sys_info.h"
-+#include "base/threading/thread_restrictions.h"
-+#include "build/build_config.h"
-+
-+namespace base {
-+
-+ProcessMetrics::ProcessMetrics(ProcessHandle process)
-+ : process_(process),
-+ last_system_time_(0),
-+ last_cpu_(0) {
-+ processor_count_ = base::SysInfo::NumberOfProcessors();
-+}
-+
-+// static
-+std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics(ProcessHandle process) {
-+ return WrapUnique(new ProcessMetrics(process));
-+}
-+
-+size_t ProcessMetrics::GetPagefileUsage() const {
-+ struct kinfo_proc2 info;
-+ int mib[6];
-+ size_t info_size = sizeof(info);
-+ int ret;
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC2;
-+ mib[2] = KERN_PROC_PID;
-+ mib[3] = process_;
-+ mib[4] = info_size;
-+ mib[5] = 1;
-+
-+ ret = sysctl(mib, 6, &info, &info_size, NULL, 0);
-+ if (ret == -1) {
-+ return 0;
-+ }
-+
-+ if (info_size == 0) {
-+ return 0;
-+ }
-+
-+ return (info.p_vm_tsize + info.p_vm_dsize + info.p_vm_ssize);
-+}
-+
-+size_t ProcessMetrics::GetPeakPagefileUsage() const {
-+ printf("%s\n", __PRETTY_FUNCTION__);
-+ return 0;
-+}
-+
-+size_t ProcessMetrics::GetWorkingSetSize() const {
-+ struct kinfo_proc2 info;
-+ int mib[6];
-+ size_t info_size = sizeof(info);
-+ int ret;
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC2;
-+ mib[2] = KERN_PROC_PID;
-+ mib[3] = process_;
-+ mib[4] = info_size;
-+ mib[5] = 1;
-+
-+ ret = sysctl(mib, 6, &info, &info_size, NULL, 0);
-+ if (ret == -1) {
-+ return 0;
-+ }
-+
-+ if (info_size == 0) {
-+ return 0;
-+ }
-+
-+ return info.p_vm_rssize * getpagesize();
-+}
-+
-+size_t ProcessMetrics::GetPeakWorkingSetSize() const {
-+ return 0;
-+}
-+
-+bool ProcessMetrics::GetMemoryBytes(size_t* private_bytes,
-+ size_t* shared_bytes) {
-+ WorkingSetKBytes ws_usage;
-+ if (!GetWorkingSetKBytes(&ws_usage))
-+ return false;
-+
-+ if (private_bytes)
-+ *private_bytes = ws_usage.priv << 10;
-+
-+ if (shared_bytes)
-+ *shared_bytes = ws_usage.shared * 1024;
-+
-+ return true;
-+}
-+
-+bool ProcessMetrics::GetWorkingSetKBytes(WorkingSetKBytes* ws_usage) const {
-+// TODO(bapt) be sure we can't be precise
-+ size_t priv = GetWorkingSetSize();
-+ if (!priv)
-+ return false;
-+ ws_usage->priv = priv / 1024;
-+ ws_usage->shareable = 0;
-+ ws_usage->shared = 0;
-+
-+ return true;
-+}
-+
-+double ProcessMetrics::GetCPUUsage() {
-+ struct kinfo_proc2 info;
-+ int mib[6];
-+ size_t info_size = sizeof(info);
-+ int ret;
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC2;
-+ mib[2] = KERN_PROC_PID;
-+ mib[3] = process_;
-+ mib[4] = info_size;
-+ mib[5] = 1;
-+
-+ ret = sysctl(mib, 6, &info, &info_size, NULL, 0);
-+ if (ret == -1) {
-+ return 0;
-+ }
-+
-+ if (info_size == 0) {
-+ return 0;
-+ }
-+
-+ return (info.p_pctcpu / FSCALE) * 100.0;
-+}
-+
-+bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const {
-+/* ryoon: should be written */
-+ return false;
-+}
-+
-+size_t GetSystemCommitCharge() {
-+ int mib[2], pagesize;
-+ struct vmtotal vmtotal;
-+ unsigned long mem_total, mem_free, mem_inactive;
-+ size_t len = sizeof(vmtotal);
-+ int ret;
-+
-+ printf("%s\n", __PRETTY_FUNCTION__);
-+
-+ mib[0] = CTL_VM;
-+ mib[1] = VM_METER;
-+
-+ ret = sysctl(mib, 2, &vmtotal, &len, NULL, 0);
-+ if (ret == -1) {
-+ return 0;
-+ }
-+
-+ mem_total = vmtotal.t_vm;
-+ mem_free = vmtotal.t_free;
-+ mem_inactive = vmtotal.t_vm - vmtotal.t_avm;
-+
-+ pagesize = getpagesize();
-+
-+ return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
-+}
-+
-+int GetNumberOfThreads(ProcessHandle process) {
-+ int ret;
-+ int mib[6];
-+ struct kinfo_proc2 info;
-+ size_t info_size = sizeof(info);
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC2;
-+ mib[2] = KERN_PROC_PID;
-+ mib[3] = process;
-+ mib[4] = info_size;
-+ mib[5] = 1;
-+
-+ ret = sysctl(mib, 6, &info, &info_size, NULL, 0);
-+ if (ret == -1) {
-+ return 0;
-+ }
-+
-+ if (info_size == 0) {
-+ return 0;
-+ }
-+
-+ return info.p_nlwps;
-+}
-+
-+} // namespace base
diff --git a/chromium-browser/patches/patch-base_process_process__metrics__posix.cc b/chromium-browser/patches/patch-base_process_process__metrics__posix.cc
deleted file mode 100644
index 276f301641..0000000000
--- a/chromium-browser/patches/patch-base_process_process__metrics__posix.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- base/process/process_metrics_posix.cc.orig 2016-08-05 17:13:37.000000000 +0000
-+++ base/process/process_metrics_posix.cc
-@@ -33,6 +33,8 @@ static const rlim_t kSystemDefaultMaxFds
- static const rlim_t kSystemDefaultMaxFds = 8192;
- #elif defined(OS_FREEBSD)
- static const rlim_t kSystemDefaultMaxFds = 8192;
-+#elif defined(OS_NETBSD)
-+static const rlim_t kSystemDefaultMaxFds = 1024;
- #elif defined(OS_OPENBSD)
- static const rlim_t kSystemDefaultMaxFds = 256;
- #elif defined(OS_ANDROID)
diff --git a/chromium-browser/patches/patch-base_process_process__posix.cc b/chromium-browser/patches/patch-base_process_process__posix.cc
deleted file mode 100644
index 000445a5d1..0000000000
--- a/chromium-browser/patches/patch-base_process_process__posix.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD$
-
---- base/process/process_posix.cc.orig 2016-08-05 17:13:37.000000000 +0000
-+++ base/process/process_posix.cc
-@@ -8,6 +8,9 @@
- #include <stdint.h>
- #include <sys/resource.h>
- #include <sys/wait.h>
-+#if defined(OS_POSIX)
-+#include <signal.h>
-+#endif
-
- #include "base/files/scoped_file.h"
- #include "base/logging.h"
-@@ -16,7 +19,7 @@
- #include "base/third_party/dynamic_annotations/dynamic_annotations.h"
- #include "build/build_config.h"
-
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- #include <sys/event.h>
- #endif
-
-@@ -86,7 +89,7 @@ bool WaitpidWithTimeout(base::ProcessHan
- return ret_pid > 0;
- }
-
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- // Using kqueue on Mac so that we can wait on non-child processes.
- // We can't use kqueues on child processes because we need to reap
- // our own children using wait.
-@@ -183,7 +186,7 @@ bool WaitForExitWithTimeoutImpl(base::Pr
- base::ProcessHandle parent_pid = base::GetParentProcessId(handle);
- base::ProcessHandle our_pid = base::GetCurrentProcessHandle();
- if (parent_pid != our_pid) {
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- // On Mac we can wait on non child processes.
- return WaitForSingleNonChildProcess(handle, timeout);
- #else
diff --git a/chromium-browser/patches/patch-base_sys__info__netbsd.cc b/chromium-browser/patches/patch-base_sys__info__netbsd.cc
deleted file mode 100644
index 17a13642a3..0000000000
--- a/chromium-browser/patches/patch-base_sys__info__netbsd.cc
+++ /dev/null
@@ -1,105 +0,0 @@
-$NetBSD$
-
---- base/sys_info_netbsd.cc.orig 2016-08-05 20:43:29.897148024 +0000
-+++ base/sys_info_netbsd.cc
-@@ -0,0 +1,100 @@
-+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "base/sys_info.h"
-+
-+#include <stddef.h>
-+#include <stdint.h>
-+#include <sys/param.h>
-+#include <sys/shm.h>
-+#include <sys/sysctl.h>
-+
-+#include "base/logging.h"
-+#include "base/macros.h"
-+
-+namespace {
-+
-+int64_t AmountOfMemory(int pages_name) {
-+ long pages = sysconf(pages_name);
-+ long page_size = sysconf(_SC_PAGESIZE);
-+ if (pages == -1 || page_size == -1) {
-+ NOTREACHED();
-+ return 0;
-+ }
-+ return static_cast<int64_t>(pages) * page_size;
-+}
-+
-+} // namespace
-+
-+namespace base {
-+
-+// static
-+int SysInfo::NumberOfProcessors() {
-+ int mib[] = { CTL_HW, HW_NCPU };
-+ int ncpu;
-+ size_t size = sizeof(ncpu);
-+ if (sysctl(mib, arraysize(mib), &ncpu, &size, NULL, 0) < 0) {
-+ NOTREACHED();
-+ return 1;
-+ }
-+ return ncpu;
-+}
-+
-+// static
-+int64_t SysInfo::AmountOfPhysicalMemory() {
-+ return AmountOfMemory(_SC_PHYS_PAGES);
-+}
-+
-+// static
-+int64_t SysInfo::AmountOfAvailablePhysicalMemory() {
-+ int ret;
-+ int mib[2];
-+ int64_t memsize;
-+ unsigned long size = sizeof(memsize);
-+
-+ mib[0] = CTL_HW;
-+ mib[1] = HW_PHYSMEM64;
-+
-+ ret = sysctl(mib, 2, &memsize, &size, NULL, 0);
-+ if (ret == -1) {
-+ return 0;
-+ }
-+
-+ return memsize;
-+}
-+
-+#if 0
-+// static
-+uint64_t SysInfo::MaxSharedMemorySize() {
-+ int mib[3];
-+ size_t limit;
-+ size_t size = sizeof(limit);
-+ int ret;
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_SYSVIPC;
-+ mib[2] = KERN_SYSVIPC_SHMMAX;
-+
-+ ret = sysctl(mib, 3, &limit, &size, NULL, 0);
-+ if (ret == -1) {
-+ return 0;
-+ }
-+
-+ return static_cast<uint64_t>(limit);
-+}
-+#endif
-+
-+// static
-+std::string SysInfo::CPUModelName() {
-+ int mib[] = { CTL_HW, HW_MODEL };
-+ char name[256];
-+ size_t len = arraysize(name);
-+ if (sysctl(mib, arraysize(mib), name, &len, NULL, 0) < 0) {
-+ NOTREACHED();
-+ return std::string();
-+ }
-+ return name;
-+}
-+
-+} // namespace base
diff --git a/chromium-browser/patches/patch-base_third__party_libevent_event-config.h b/chromium-browser/patches/patch-base_third__party_libevent_event-config.h
deleted file mode 100644
index 84067f5cbc..0000000000
--- a/chromium-browser/patches/patch-base_third__party_libevent_event-config.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- base/third_party/libevent/event-config.h.orig 2016-08-05 17:13:37.000000000 +0000
-+++ base/third_party/libevent/event-config.h
-@@ -15,6 +15,8 @@
- #include "base/third_party/libevent/linux/event-config.h"
- #elif defined(__FreeBSD__)
- #include "base/third_party/libevent/freebsd/event-config.h"
-+#elif defined(__NetBSD__)
-+#include "base/third_party/libevent/netbsd/event-config.h"
- #elif defined(__sun)
- #include "base/third_party/libevent/solaris/event-config.h"
- #else
diff --git a/chromium-browser/patches/patch-base_third__party_libevent_netbsd_config.h b/chromium-browser/patches/patch-base_third__party_libevent_netbsd_config.h
deleted file mode 100644
index def46366ff..0000000000
--- a/chromium-browser/patches/patch-base_third__party_libevent_netbsd_config.h
+++ /dev/null
@@ -1,271 +0,0 @@
-$NetBSD$
-
---- base/third_party/libevent/netbsd/config.h.orig 2016-08-05 20:46:52.478304126 +0000
-+++ base/third_party/libevent/netbsd/config.h
-@@ -0,0 +1,266 @@
-+/* config.h. Generated from config.h.in by configure. */
-+/* config.h.in. Generated from configure.in by autoheader. */
-+
-+/* Define if clock_gettime is available in libc */
-+#define DNS_USE_CPU_CLOCK_FOR_ID 1
-+
-+/* Define is no secure id variant is available */
-+/* #undef DNS_USE_GETTIMEOFDAY_FOR_ID */
-+
-+/* Define to 1 if you have the `clock_gettime' function. */
-+#define HAVE_CLOCK_GETTIME 1
-+
-+/* Define if /dev/poll is available */
-+/* #undef HAVE_DEVPOLL */
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+#define HAVE_DLFCN_H 1
-+
-+/* Define if your system supports the epoll system calls */
-+/* #undef HAVE_EPOLL */
-+
-+/* Define to 1 if you have the `epoll_ctl' function. */
-+/* #undef HAVE_EPOLL_CTL */
-+
-+/* Define if your system supports event ports */
-+/* #undef HAVE_EVENT_PORTS */
-+
-+/* Define to 1 if you have the `fcntl' function. */
-+#define HAVE_FCNTL 1
-+
-+/* Define to 1 if you have the <fcntl.h> header file. */
-+#define HAVE_FCNTL_H 1
-+
-+/* Define to 1 if the system has the type `fd_mask'. */
-+#define HAVE_FD_MASK 1
-+
-+/* Define to 1 if you have the `getaddrinfo' function. */
-+#define HAVE_GETADDRINFO 1
-+
-+/* Define to 1 if you have the `getegid' function. */
-+#define HAVE_GETEGID 1
-+
-+/* Define to 1 if you have the `geteuid' function. */
-+#define HAVE_GETEUID 1
-+
-+/* Define to 1 if you have the `getnameinfo' function. */
-+#define HAVE_GETNAMEINFO 1
-+
-+/* Define to 1 if you have the `gettimeofday' function. */
-+#define HAVE_GETTIMEOFDAY 1
-+
-+/* Define to 1 if you have the `inet_ntop' function. */
-+#define HAVE_INET_NTOP 1
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#define HAVE_INTTYPES_H 1
-+
-+/* Define to 1 if you have the `issetugid' function. */
-+#define HAVE_ISSETUGID 1
-+
-+/* Define to 1 if you have the `kqueue' function. */
-+#define HAVE_KQUEUE 1
-+
-+/* Define to 1 if you have the `nsl' library (-lnsl). */
-+/* #undef HAVE_LIBNSL */
-+
-+/* Define to 1 if you have the `resolv' library (-lresolv). */
-+/* #undef HAVE_LIBRESOLV */
-+
-+/* Define to 1 if you have the `rt' library (-lrt). */
-+#define HAVE_LIBRT 1
-+
-+/* Define to 1 if you have the `socket' library (-lsocket). */
-+/* #undef HAVE_LIBSOCKET */
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#define HAVE_MEMORY_H 1
-+
-+/* Define to 1 if you have the <netinet/in6.h> header file. */
-+/* #undef HAVE_NETINET_IN6_H */
-+
-+/* Define to 1 if you have the `poll' function. */
-+#define HAVE_POLL 1
-+
-+/* Define to 1 if you have the <poll.h> header file. */
-+#define HAVE_POLL_H 1
-+
-+/* Define to 1 if you have the `port_create' function. */
-+/* #undef HAVE_PORT_CREATE */
-+
-+/* Define to 1 if you have the <port.h> header file. */
-+/* #undef HAVE_PORT_H */
-+
-+/* Define to 1 if you have the `select' function. */
-+#define HAVE_SELECT 1
-+
-+/* Define if F_SETFD is defined in <fcntl.h> */
-+#define HAVE_SETFD 1
-+
-+/* Define to 1 if you have the `sigaction' function. */
-+#define HAVE_SIGACTION 1
-+
-+/* Define to 1 if you have the `signal' function. */
-+#define HAVE_SIGNAL 1
-+
-+/* Define to 1 if you have the <signal.h> header file. */
-+#define HAVE_SIGNAL_H 1
-+
-+/* Define to 1 if you have the <stdarg.h> header file. */
-+#define HAVE_STDARG_H 1
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#define HAVE_STDINT_H 1
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#define HAVE_STDLIB_H 1
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#define HAVE_STRINGS_H 1
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#define HAVE_STRING_H 1
-+
-+/* Define to 1 if you have the `strlcpy' function. */
-+#define HAVE_STRLCPY 1
-+
-+/* Define to 1 if you have the `strsep' function. */
-+#define HAVE_STRSEP 1
-+
-+/* Define to 1 if you have the `strtok_r' function. */
-+#define HAVE_STRTOK_R 1
-+
-+/* Define to 1 if you have the `strtoll' function. */
-+#define HAVE_STRTOLL 1
-+
-+/* Define to 1 if the system has the type `struct in6_addr'. */
-+#define HAVE_STRUCT_IN6_ADDR 1
-+
-+/* Define to 1 if you have the <sys/devpoll.h> header file. */
-+/* #undef HAVE_SYS_DEVPOLL_H */
-+
-+/* Define to 1 if you have the <sys/epoll.h> header file. */
-+/* #undef HAVE_SYS_EPOLL_H */
-+
-+/* Define to 1 if you have the <sys/event.h> header file. */
-+#define HAVE_SYS_EVENT_H 1
-+
-+/* Define to 1 if you have the <sys/ioctl.h> header file. */
-+#define HAVE_SYS_IOCTL_H 1
-+
-+/* Define to 1 if you have the <sys/param.h> header file. */
-+#define HAVE_SYS_PARAM_H 1
-+
-+/* Define to 1 if you have the <sys/queue.h> header file. */
-+#define HAVE_SYS_QUEUE_H 1
-+
-+/* Define to 1 if you have the <sys/select.h> header file. */
-+#define HAVE_SYS_SELECT_H 1
-+
-+/* Define to 1 if you have the <sys/socket.h> header file. */
-+#define HAVE_SYS_SOCKET_H 1
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#define HAVE_SYS_STAT_H 1
-+
-+/* Define to 1 if you have the <sys/time.h> header file. */
-+#define HAVE_SYS_TIME_H 1
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#define HAVE_SYS_TYPES_H 1
-+
-+/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */
-+#define HAVE_TAILQFOREACH 1
-+
-+/* Define if timeradd is defined in <sys/time.h> */
-+#define HAVE_TIMERADD 1
-+
-+/* Define if timerclear is defined in <sys/time.h> */
-+#define HAVE_TIMERCLEAR 1
-+
-+/* Define if timercmp is defined in <sys/time.h> */
-+#define HAVE_TIMERCMP 1
-+
-+/* Define if timerisset is defined in <sys/time.h> */
-+#define HAVE_TIMERISSET 1
-+
-+/* Define to 1 if the system has the type `uint16_t'. */
-+#define HAVE_UINT16_T 1
-+
-+/* Define to 1 if the system has the type `uint32_t'. */
-+#define HAVE_UINT32_T 1
-+
-+/* Define to 1 if the system has the type `uint64_t'. */
-+#define HAVE_UINT64_T 1
-+
-+/* Define to 1 if the system has the type `uint8_t'. */
-+#define HAVE_UINT8_T 1
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#define HAVE_UNISTD_H 1
-+
-+/* Define to 1 if you have the `vasprintf' function. */
-+#define HAVE_VASPRINTF 1
-+
-+/* Define if kqueue works correctly with pipes */
-+#define HAVE_WORKING_KQUEUE 1
-+
-+/* Name of package */
-+#define PACKAGE "libevent"
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#define PACKAGE_BUGREPORT ""
-+
-+/* Define to the full name of this package. */
-+#define PACKAGE_NAME ""
-+
-+/* Define to the full name and version of this package. */
-+#define PACKAGE_STRING ""
-+
-+/* Define to the one symbol short name of this package. */
-+#define PACKAGE_TARNAME ""
-+
-+/* Define to the version of this package. */
-+#define PACKAGE_VERSION ""
-+
-+/* The size of `int', as computed by sizeof. */
-+#define SIZEOF_INT 4
-+
-+/* The size of `long', as computed by sizeof. */
-+#define SIZEOF_LONG 8
-+
-+/* The size of `long long', as computed by sizeof. */
-+#define SIZEOF_LONG_LONG 8
-+
-+/* The size of `short', as computed by sizeof. */
-+#define SIZEOF_SHORT 2
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#define STDC_HEADERS 1
-+
-+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-+#define TIME_WITH_SYS_TIME 1
-+
-+/* Version number of package */
-+#define VERSION "1.4.13-stable"
-+
-+/* Define to appropriate substitue if compiler doesnt have __func__ */
-+/* #undef __func__ */
-+
-+/* Define to empty if `const' does not conform to ANSI C. */
-+/* #undef const */
-+
-+/* Define to `__inline__' or `__inline' if that's what the C compiler
-+ calls it, or to nothing if 'inline' is not supported under any name. */
-+#ifndef __cplusplus
-+/* #undef inline */
-+#endif
-+
-+/* Define to `int' if <sys/types.h> does not define. */
-+/* #undef pid_t */
-+
-+/* Define to `unsigned int' if <sys/types.h> does not define. */
-+/* #undef size_t */
-+
-+/* Define to unsigned int if you dont have it */
-+/* #undef socklen_t */
diff --git a/chromium-browser/patches/patch-base_third__party_libevent_netbsd_event-config.h b/chromium-browser/patches/patch-base_third__party_libevent_netbsd_event-config.h
deleted file mode 100644
index 4655c46ca8..0000000000
--- a/chromium-browser/patches/patch-base_third__party_libevent_netbsd_event-config.h
+++ /dev/null
@@ -1,289 +0,0 @@
-$NetBSD$
-
---- base/third_party/libevent/netbsd/event-config.h.orig 2016-08-05 20:46:55.312962384 +0000
-+++ base/third_party/libevent/netbsd/event-config.h
-@@ -0,0 +1,284 @@
-+/* event-config.h
-+ * Generated by autoconf; post-processed by libevent.
-+ * Do not edit this file.
-+ * Do not rely on macros in this file existing in later versions.
-+ */
-+#ifndef _EVENT_CONFIG_H_
-+#define _EVENT_CONFIG_H_
-+/* config.h. Generated from config.h.in by configure. */
-+/* config.h.in. Generated from configure.in by autoheader. */
-+
-+/* Define if clock_gettime is available in libc */
-+#define _EVENT_DNS_USE_CPU_CLOCK_FOR_ID 1
-+
-+/* Define is no secure id variant is available */
-+/* #undef _EVENT_DNS_USE_GETTIMEOFDAY_FOR_ID */
-+
-+/* Define to 1 if you have the `clock_gettime' function. */
-+#define _EVENT_HAVE_CLOCK_GETTIME 1
-+
-+/* Define if /dev/poll is available */
-+/* #undef _EVENT_HAVE_DEVPOLL */
-+
-+/* Define to 1 if you have the <dlfcn.h> header file. */
-+#define _EVENT_HAVE_DLFCN_H 1
-+
-+/* Define if your system supports the epoll system calls */
-+/* #undef _EVENT_HAVE_EPOLL */
-+
-+/* Define to 1 if you have the `epoll_ctl' function. */
-+/* #undef _EVENT_HAVE_EPOLL_CTL */
-+
-+/* Define if your system supports event ports */
-+/* #undef _EVENT_HAVE_EVENT_PORTS */
-+
-+/* Define to 1 if you have the `fcntl' function. */
-+#define _EVENT_HAVE_FCNTL 1
-+
-+/* Define to 1 if you have the <fcntl.h> header file. */
-+#define _EVENT_HAVE_FCNTL_H 1
-+
-+/* Define to 1 if the system has the type `fd_mask'. */
-+#define _EVENT_HAVE_FD_MASK 1
-+
-+/* Define to 1 if you have the `getaddrinfo' function. */
-+#define _EVENT_HAVE_GETADDRINFO 1
-+
-+/* Define to 1 if you have the `getegid' function. */
-+#define _EVENT_HAVE_GETEGID 1
-+
-+/* Define to 1 if you have the `geteuid' function. */
-+#define _EVENT_HAVE_GETEUID 1
-+
-+/* Define to 1 if you have the `getnameinfo' function. */
-+#define _EVENT_HAVE_GETNAMEINFO 1
-+
-+/* Define to 1 if you have the `gettimeofday' function. */
-+#define _EVENT_HAVE_GETTIMEOFDAY 1
-+
-+/* Define to 1 if you have the `inet_ntop' function. */
-+#define _EVENT_HAVE_INET_NTOP 1
-+
-+/* Define to 1 if you have the <inttypes.h> header file. */
-+#define _EVENT_HAVE_INTTYPES_H 1
-+
-+/* Define to 1 if you have the `issetugid' function. */
-+#define _EVENT_HAVE_ISSETUGID 1
-+
-+/* Define to 1 if you have the `kqueue' function. */
-+#define _EVENT_HAVE_KQUEUE 1
-+
-+/* Define to 1 if you have the `nsl' library (-lnsl). */
-+/* #undef _EVENT_HAVE_LIBNSL */
-+
-+/* Define to 1 if you have the `resolv' library (-lresolv). */
-+/* #undef _EVENT_HAVE_LIBRESOLV */
-+
-+/* Define to 1 if you have the `rt' library (-lrt). */
-+#define _EVENT_HAVE_LIBRT 1
-+
-+/* Define to 1 if you have the `socket' library (-lsocket). */
-+/* #undef _EVENT_HAVE_LIBSOCKET */
-+
-+/* Define to 1 if you have the <memory.h> header file. */
-+#define _EVENT_HAVE_MEMORY_H 1
-+
-+/* Define to 1 if you have the <netinet/in6.h> header file. */
-+/* #undef _EVENT_HAVE_NETINET_IN6_H */
-+
-+/* Define to 1 if you have the `poll' function. */
-+#define _EVENT_HAVE_POLL 1
-+
-+/* Define to 1 if you have the <poll.h> header file. */
-+#define _EVENT_HAVE_POLL_H 1
-+
-+/* Define to 1 if you have the `port_create' function. */
-+/* #undef _EVENT_HAVE_PORT_CREATE */
-+
-+/* Define to 1 if you have the <port.h> header file. */
-+/* #undef _EVENT_HAVE_PORT_H */
-+
-+/* Define to 1 if you have the `select' function. */
-+#define _EVENT_HAVE_SELECT 1
-+
-+/* Define if F_SETFD is defined in <fcntl.h> */
-+#define _EVENT_HAVE_SETFD 1
-+
-+/* Define to 1 if you have the `sigaction' function. */
-+#define _EVENT_HAVE_SIGACTION 1
-+
-+/* Define to 1 if you have the `signal' function. */
-+#define _EVENT_HAVE_SIGNAL 1
-+
-+/* Define to 1 if you have the <signal.h> header file. */
-+#define _EVENT_HAVE_SIGNAL_H 1
-+
-+/* Define to 1 if you have the <stdarg.h> header file. */
-+#define _EVENT_HAVE_STDARG_H 1
-+
-+/* Define to 1 if you have the <stdint.h> header file. */
-+#define _EVENT_HAVE_STDINT_H 1
-+
-+/* Define to 1 if you have the <stdlib.h> header file. */
-+#define _EVENT_HAVE_STDLIB_H 1
-+
-+/* Define to 1 if you have the <strings.h> header file. */
-+#define _EVENT_HAVE_STRINGS_H 1
-+
-+/* Define to 1 if you have the <string.h> header file. */
-+#define _EVENT_HAVE_STRING_H 1
-+
-+/* Define to 1 if you have the `strlcpy' function. */
-+#define _EVENT_HAVE_STRLCPY 1
-+
-+/* Define to 1 if you have the `strsep' function. */
-+#define _EVENT_HAVE_STRSEP 1
-+
-+/* Define to 1 if you have the `strtok_r' function. */
-+#define _EVENT_HAVE_STRTOK_R 1
-+
-+/* Define to 1 if you have the `strtoll' function. */
-+#define _EVENT_HAVE_STRTOLL 1
-+
-+/* Define to 1 if the system has the type `struct in6_addr'. */
-+#define _EVENT_HAVE_STRUCT_IN6_ADDR 1
-+
-+/* Define to 1 if you have the <sys/devpoll.h> header file. */
-+/* #undef _EVENT_HAVE_SYS_DEVPOLL_H */
-+
-+/* Define to 1 if you have the <sys/epoll.h> header file. */
-+/* #undef _EVENT_HAVE_SYS_EPOLL_H */
-+
-+/* Define to 1 if you have the <sys/event.h> header file. */
-+#define _EVENT_HAVE_SYS_EVENT_H 1
-+
-+/* Define to 1 if you have the <sys/ioctl.h> header file. */
-+#define _EVENT_HAVE_SYS_IOCTL_H 1
-+
-+/* Define to 1 if you have the <sys/param.h> header file. */
-+#define _EVENT_HAVE_SYS_PARAM_H 1
-+
-+/* Define to 1 if you have the <sys/queue.h> header file. */
-+#define _EVENT_HAVE_SYS_QUEUE_H 1
-+
-+/* Define to 1 if you have the <sys/select.h> header file. */
-+#define _EVENT_HAVE_SYS_SELECT_H 1
-+
-+/* Define to 1 if you have the <sys/socket.h> header file. */
-+#define _EVENT_HAVE_SYS_SOCKET_H 1
-+
-+/* Define to 1 if you have the <sys/stat.h> header file. */
-+#define _EVENT_HAVE_SYS_STAT_H 1
-+
-+/* Define to 1 if you have the <sys/time.h> header file. */
-+#define _EVENT_HAVE_SYS_TIME_H 1
-+
-+/* Define to 1 if you have the <sys/types.h> header file. */
-+#define _EVENT_HAVE_SYS_TYPES_H 1
-+
-+/* Define if TAILQ_FOREACH is defined in <sys/queue.h> */
-+#define _EVENT_HAVE_TAILQFOREACH 1
-+
-+/* Define if timeradd is defined in <sys/time.h> */
-+#define _EVENT_HAVE_TIMERADD 1
-+
-+/* Define if timerclear is defined in <sys/time.h> */
-+#define _EVENT_HAVE_TIMERCLEAR 1
-+
-+/* Define if timercmp is defined in <sys/time.h> */
-+#define _EVENT_HAVE_TIMERCMP 1
-+
-+/* Define if timerisset is defined in <sys/time.h> */
-+#define _EVENT_HAVE_TIMERISSET 1
-+
-+/* Define to 1 if the system has the type `uint16_t'. */
-+#define _EVENT_HAVE_UINT16_T 1
-+
-+/* Define to 1 if the system has the type `uint32_t'. */
-+#define _EVENT_HAVE_UINT32_T 1
-+
-+/* Define to 1 if the system has the type `uint64_t'. */
-+#define _EVENT_HAVE_UINT64_T 1
-+
-+/* Define to 1 if the system has the type `uint8_t'. */
-+#define _EVENT_HAVE_UINT8_T 1
-+
-+/* Define to 1 if you have the <unistd.h> header file. */
-+#define _EVENT_HAVE_UNISTD_H 1
-+
-+/* Define to 1 if you have the `vasprintf' function. */
-+#define _EVENT_HAVE_VASPRINTF 1
-+
-+/* Define if kqueue works correctly with pipes */
-+#define _EVENT_HAVE_WORKING_KQUEUE 1
-+
-+/* Define to the sub-directory in which libtool stores uninstalled libraries.
-+ */
-+#define _EVENT_LT_OBJDIR ".libs/"
-+
-+/* Numeric representation of the version */
-+#define _EVENT_NUMERIC_VERSION 0x01040f00
-+
-+/* Name of package */
-+#define _EVENT_PACKAGE "libevent"
-+
-+/* Define to the address where bug reports for this package should be sent. */
-+#define _EVENT_PACKAGE_BUGREPORT ""
-+
-+/* Define to the full name of this package. */
-+#define _EVENT_PACKAGE_NAME ""
-+
-+/* Define to the full name and version of this package. */
-+#define _EVENT_PACKAGE_STRING ""
-+
-+/* Define to the one symbol short name of this package. */
-+#define _EVENT_PACKAGE_TARNAME ""
-+
-+/* Define to the home page for this package. */
-+#define _EVENT_PACKAGE_URL ""
-+
-+/* Define to the version of this package. */
-+#define _EVENT_PACKAGE_VERSION ""
-+
-+/* The size of `int', as computed by sizeof. */
-+#define _EVENT_SIZEOF_INT 4
-+
-+/* The size of `long', as computed by sizeof. */
-+#define _EVENT_SIZEOF_LONG 8
-+
-+/* The size of `long long', as computed by sizeof. */
-+#define _EVENT_SIZEOF_LONG_LONG 8
-+
-+/* The size of `short', as computed by sizeof. */
-+#define _EVENT_SIZEOF_SHORT 2
-+
-+/* Define to 1 if you have the ANSI C header files. */
-+#define _EVENT_STDC_HEADERS 1
-+
-+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-+#define _EVENT_TIME_WITH_SYS_TIME 1
-+
-+/* Version number of package */
-+#define _EVENT_VERSION "1.4.15"
-+
-+/* Define to appropriate substitue if compiler doesnt have __func__ */
-+/* #undef _EVENT___func__ */
-+
-+/* Define to empty if `const' does not conform to ANSI C. */
-+/* #undef _EVENT_const */
-+
-+/* Define to `__inline__' or `__inline' if that's what the C compiler
-+ calls it, or to nothing if 'inline' is not supported under any name. */
-+#ifndef _EVENT___cplusplus
-+/* #undef _EVENT_inline */
-+#endif
-+
-+/* Define to `int' if <sys/types.h> does not define. */
-+/* #undef _EVENT_pid_t */
-+
-+/* Define to `unsigned int' if <sys/types.h> does not define. */
-+/* #undef _EVENT_size_t */
-+
-+/* Define to unsigned int if you dont have it */
-+/* #undef _EVENT_socklen_t */
-+#endif
diff --git a/chromium-browser/patches/patch-base_threading_platform__thread__netbsd.cc b/chromium-browser/patches/patch-base_threading_platform__thread__netbsd.cc
deleted file mode 100644
index 1ed4545b28..0000000000
--- a/chromium-browser/patches/patch-base_threading_platform__thread__netbsd.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-$NetBSD$
-
---- base/threading/platform_thread_netbsd.cc.orig 2016-08-05 20:43:29.901953051 +0000
-+++ base/threading/platform_thread_netbsd.cc
-@@ -0,0 +1,97 @@
-+// Copyright 2014 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "base/threading/platform_thread.h"
-+
-+#include <errno.h>
-+#include <sched.h>
-+#include <stddef.h>
-+
-+#include "base/lazy_instance.h"
-+#include "base/logging.h"
-+#include "base/threading/platform_thread_internal_posix.h"
-+#include "base/threading/thread_id_name_manager.h"
-+#include "base/tracked_objects.h"
-+#include "build/build_config.h"
-+
-+#if !defined(OS_NACL)
-+#include <pthread.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-+#endif
-+
-+namespace base {
-+
-+namespace internal {
-+
-+namespace {
-+#if !defined(OS_NACL)
-+const struct sched_param kRealTimePrio = {8};
-+#endif
-+} // namespace
-+
-+const ThreadPriorityToNiceValuePair kThreadPriorityToNiceValueMap[4] = {
-+ {ThreadPriority::BACKGROUND, 10},
-+ {ThreadPriority::NORMAL, 0},
-+ {ThreadPriority::DISPLAY, -6},
-+ {ThreadPriority::REALTIME_AUDIO, -10},
-+};
-+
-+bool SetCurrentThreadPriorityForPlatform(ThreadPriority priority) {
-+#if !defined(OS_NACL)
-+ return priority == ThreadPriority::REALTIME_AUDIO &&
-+ pthread_setschedparam(pthread_self(), SCHED_RR, &kRealTimePrio) == 0;
-+#else
-+ return false;
-+#endif
-+}
-+
-+bool GetCurrentThreadPriorityForPlatform(ThreadPriority* priority) {
-+#if !defined(OS_NACL)
-+ int maybe_sched_rr = 0;
-+ struct sched_param maybe_realtime_prio = {0};
-+ if (pthread_getschedparam(pthread_self(), &maybe_sched_rr,
-+ &maybe_realtime_prio) == 0 &&
-+ maybe_sched_rr == SCHED_RR &&
-+ maybe_realtime_prio.sched_priority == kRealTimePrio.sched_priority) {
-+ *priority = ThreadPriority::REALTIME_AUDIO;
-+ return true;
-+ }
-+#endif
-+ return false;
-+}
-+
-+} // namespace internal
-+
-+// static
-+void PlatformThread::SetName(const std::string& name) {
-+ ThreadIdNameManager::GetInstance()->SetName(CurrentId(), name);
-+ tracked_objects::ThreadData::InitializeThreadContext(name);
-+
-+#if !defined(OS_NACL)
-+ // On FreeBSD we can get the thread names to show up in the debugger by
-+ // setting the process name for the LWP. We don't want to do this for the
-+ // main thread because that would rename the process, causing tools like
-+ // killall to stop working.
-+ if (PlatformThread::CurrentId() == getpid())
-+ return;
-+ setproctitle("%s", name.c_str());
-+#endif // !defined(OS_NACL)
-+}
-+
-+void InitThreading() {}
-+
-+void TerminateOnThread() {}
-+
-+size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) {
-+#if !defined(THREAD_SANITIZER)
-+ return 0;
-+#else
-+ // ThreadSanitizer bloats the stack heavily. Evidence has been that the
-+ // default stack size isn't enough for some browser tests.
-+ return 2 * (1 << 23); // 2 times 8192K (the default stack size on Linux).
-+#endif
-+}
-+
-+} // namespace base
diff --git a/chromium-browser/patches/patch-base_trace__event_malloc__dump__provider.cc b/chromium-browser/patches/patch-base_trace__event_malloc__dump__provider.cc
deleted file mode 100644
index 84e827604b..0000000000
--- a/chromium-browser/patches/patch-base_trace__event_malloc__dump__provider.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD$
-
---- base/trace_event/malloc_dump_provider.cc.orig 2016-08-05 17:13:37.000000000 +0000
-+++ base/trace_event/malloc_dump_provider.cc
-@@ -19,6 +19,8 @@
-
- #if defined(OS_MACOSX)
- #include <malloc/malloc.h>
-+#elif defined(OS_NETBSD)
-+#include <stdlib.h>
- #else
- #include <malloc.h>
- #endif
-@@ -26,7 +28,7 @@
- namespace base {
- namespace trace_event {
-
--#if BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
-+#if 0 // BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
- namespace {
-
- using allocator::AllocatorDispatch;
-@@ -103,6 +105,8 @@ MallocDumpProvider::~MallocDumpProvider(
- // the current process.
- bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args,
- ProcessMemoryDump* pmd) {
-+ return 0;
-+#if 0
- size_t total_virtual_size = 0;
- size_t resident_size = 0;
- size_t allocated_objects_size = 0;
-@@ -197,10 +201,11 @@ bool MallocDumpProvider::OnMemoryDump(co
- tid_dumping_heap_ = kInvalidThreadId;
-
- return true;
-+#endif
- }
-
- void MallocDumpProvider::OnHeapProfilingEnabled(bool enabled) {
--#if BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
-+#if 0 // BUILDFLAG(USE_EXPERIMENTAL_ALLOCATOR_SHIM)
- if (enabled) {
- {
- AutoLock lock(allocation_register_lock_);
diff --git a/chromium-browser/patches/patch-base_trace__event_memory__dump__manager.cc b/chromium-browser/patches/patch-base_trace__event_memory__dump__manager.cc
deleted file mode 100644
index 4d154def00..0000000000
--- a/chromium-browser/patches/patch-base_trace__event_memory__dump__manager.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- base/trace_event/memory_dump_manager.cc.orig 2016-08-05 17:13:37.000000000 +0000
-+++ base/trace_event/memory_dump_manager.cc
-@@ -165,7 +165,7 @@ void MemoryDumpManager::EnableHeapProfil
- }
- else if (profiling_mode == switches::kEnableHeapProfilingModeNative) {
- #if HAVE_TRACE_STACK_FRAME_POINTERS && \
-- (BUILDFLAG(ENABLE_PROFILING) || !defined(NDEBUG))
-+ (!defined(NDEBUG))
- // We need frame pointers for native tracing to work, and they are
- // enabled in profiling and debug builds.
- AllocationContextTracker::SetCaptureMode(
diff --git a/chromium-browser/patches/patch-base_trace__event_process__memory__dump.cc b/chromium-browser/patches/patch-base_trace__event_process__memory__dump.cc
deleted file mode 100644
index d823e7f41a..0000000000
--- a/chromium-browser/patches/patch-base_trace__event_process__memory__dump.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- base/trace_event/process_memory_dump.cc.orig 2016-08-05 17:13:37.000000000 +0000
-+++ base/trace_event/process_memory_dump.cc
-@@ -89,7 +89,7 @@ size_t ProcessMemoryDump::CountResidentB
- const size_t kMaxChunkSize = 8 * 1024 * 1024;
- size_t max_vec_size =
- GetSystemPageCount(std::min(mapped_size, kMaxChunkSize), page_size);
--#if defined(OS_MACOSX) || defined(OS_IOS)
-+#if defined(OS_MACOSX) || defined(OS_IOS) || defined(OS_NETBSD)
- std::unique_ptr<char[]> vec(new char[max_vec_size]);
- #elif defined(OS_WIN)
- std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec(
diff --git a/chromium-browser/patches/patch-build_config_BUILDCONFIG.gn b/chromium-browser/patches/patch-build_config_BUILDCONFIG.gn
deleted file mode 100644
index 9b9ff24f1b..0000000000
--- a/chromium-browser/patches/patch-build_config_BUILDCONFIG.gn
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD$
-
---- build/config/BUILDCONFIG.gn.orig 2016-08-05 17:13:38.000000000 +0000
-+++ build/config/BUILDCONFIG.gn
-@@ -193,6 +193,18 @@ if (host_toolchain == "") {
- } else {
- host_toolchain = "//build/toolchain/win:$target_cpu"
- }
-+ } else if (host_os == "netbsd") {
-+ if (target_os != "netbsd") {
-+ # TODO(dpranke) - is_clang normally applies only to the target
-+ # build, and there is no way to indicate that you want to override
-+ # it for both the target build *and* the host build. Do we need to
-+ # support this?
-+ host_toolchain = "//build/toolchain/netbsd:clang_$host_cpu"
-+ } else if (is_clang) {
-+ host_toolchain = "//build/toolchain/netbsd:clang_$host_cpu"
-+ } else {
-+ host_toolchain = "//build/toolchain/netbsd:$host_cpu"
-+ }
- } else {
- assert(false, "Unsupported host_os: $host_os")
- }
-@@ -231,6 +243,12 @@ if (target_os == "android") {
- } else if (target_os == "winrt_81" || target_os == "winrt_81_phone" ||
- target_os == "winrt_10") {
- _default_toolchain = "//build/toolchain/win:winrt_$target_cpu"
-+} else if (target_os == "netbsd") {
-+ if (is_clang) {
-+ _default_toolchain = "//build/toolchain/netbsd:clang_$target_cpu"
-+ } else {
-+ _default_toolchain = "//build/toolchain/netbsd:$target_cpu"
-+ }
- } else {
- assert(false, "Unsupported target_os: $target_os")
- }
-@@ -328,6 +346,15 @@ if (current_os == "win" || current_os ==
- is_nacl = false
- is_posix = true
- is_win = false
-+} else if (current_os == "netbsd") {
-+ is_android = false
-+ is_chromeos = false
-+ is_ios = false
-+ is_linux = false
-+ is_mac = false
-+ is_nacl = false
-+ is_posix = true
-+ is_win = false
- }
-
- # =============================================================================
diff --git a/chromium-browser/patches/patch-build_config_compiler_BUILD.gn b/chromium-browser/patches/patch-build_config_compiler_BUILD.gn
deleted file mode 100644
index 129fcce7e8..0000000000
--- a/chromium-browser/patches/patch-build_config_compiler_BUILD.gn
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
---- build/config/compiler/BUILD.gn.orig 2016-08-05 17:13:38.000000000 +0000
-+++ build/config/compiler/BUILD.gn
-@@ -437,8 +437,8 @@ config("compiler") {
- # TODO(pcc): Make this conditional on is_official_build rather than on gn
- # flags for specific features.
- if (!is_debug && (allow_posix_link_time_opt || is_cfi) && !is_nacl) {
-- cflags += [ "-flto" ]
-- ldflags += [ "-flto" ]
-+# cflags += [ "-flto" ]
-+# ldflags += [ "-flto" ]
-
- # Apply a lower LTO optimization level as the default is too slow.
- if (is_linux) {
diff --git a/chromium-browser/patches/patch-build_toolchain_netbsd_BUILD.gn b/chromium-browser/patches/patch-build_toolchain_netbsd_BUILD.gn
deleted file mode 100644
index 85c814db9d..0000000000
--- a/chromium-browser/patches/patch-build_toolchain_netbsd_BUILD.gn
+++ /dev/null
@@ -1,121 +0,0 @@
-$NetBSD$
-
---- build/toolchain/netbsd/BUILD.gn.orig 2016-08-05 22:49:56.586392139 +0000
-+++ build/toolchain/netbsd/BUILD.gn
-@@ -0,0 +1,116 @@
-+# Copyright 2013 The Chromium Authors. All rights reserved.
-+# Use of this source code is governed by a BSD-style license that can be
-+# found in the LICENSE file.
-+
-+import("//build/config/sysroot.gni")
-+import("//build/toolchain/gcc_toolchain.gni")
-+
-+clang_toolchain("clang_arm") {
-+ toolchain_cpu = "arm"
-+ toolchain_os = "netbsd"
-+ toolprefix = "arm-netbsd-gnueabihf-"
-+}
-+
-+clang_toolchain("clang_arm64") {
-+ toolchain_cpu = "arm64"
-+ toolchain_os = "netbsd"
-+ toolprefix = "aarch64-netbsd-gnu-"
-+}
-+
-+gcc_toolchain("arm") {
-+ toolprefix = "arm-netbsd-gnueabihf-"
-+
-+ cc = "${toolprefix}gcc"
-+ cxx = "${toolprefix}g++"
-+
-+ ar = "${toolprefix}ar"
-+ ld = cxx
-+ readelf = "${toolprefix}readelf"
-+ nm = "${toolprefix}nm"
-+
-+ toolchain_cpu = "arm"
-+ toolchain_os = "netbsd"
-+ is_clang = false
-+}
-+
-+clang_toolchain("clang_x86") {
-+ toolchain_cpu = "x86"
-+ toolchain_os = "netbsd"
-+}
-+
-+clang_toolchain("clang_x86_v8_arm") {
-+ toolchain_cpu = "x86"
-+ v8_toolchain_cpu = "arm"
-+ toolchain_os = "netbsd"
-+}
-+
-+clang_toolchain("clang_x86_v8_mipsel") {
-+ toolchain_cpu = "x86"
-+ v8_toolchain_cpu = "mipsel"
-+ toolchain_os = "netbsd"
-+}
-+
-+gcc_toolchain("x86") {
-+ cc = "gcc"
-+ cxx = "g++"
-+
-+ readelf = "readelf"
-+ nm = "nm"
-+ ar = "ar"
-+ ld = cxx
-+
-+ toolchain_cpu = "x86"
-+ toolchain_os = "netbsd"
-+ is_clang = false
-+}
-+
-+clang_toolchain("clang_x64") {
-+ toolchain_cpu = "x64"
-+ toolchain_os = "netbsd"
-+}
-+
-+clang_toolchain("clang_x64_v8_arm64") {
-+ toolchain_cpu = "x64"
-+ v8_toolchain_cpu = "arm64"
-+ toolchain_os = "netbsd"
-+}
-+
-+clang_toolchain("clang_x64_v8_mips64el") {
-+ toolchain_cpu = "x64"
-+ v8_toolchain_cpu = "mips64el"
-+ toolchain_os = "netbsd"
-+}
-+
-+gcc_toolchain("x64") {
-+ cc = "gcc"
-+ cxx = "g++"
-+
-+ readelf = "readelf"
-+ nm = "nm"
-+ ar = "ar"
-+ ld = cxx
-+
-+ toolchain_cpu = "x64"
-+ toolchain_os = "netbsd"
-+ is_clang = false
-+}
-+
-+clang_toolchain("clang_mipsel") {
-+ toolchain_cpu = "mipsel"
-+ toolchain_os = "netbsd"
-+}
-+
-+gcc_toolchain("mipsel") {
-+ cc = "mipsel-netbsd-gnu-gcc"
-+ cxx = "mipsel-netbsd-gnu-g++"
-+ ar = "mipsel-netbsd-gnu-ar"
-+ ld = cxx
-+ readelf = "mipsel-netbsd-gnu-readelf"
-+ nm = "mipsel-netbsd-gnu-nm"
-+
-+ toolchain_cpu = "mipsel"
-+ toolchain_os = "netbsd"
-+ is_clang = false
-+ cc_wrapper = ""
-+ use_goma = false
-+}
diff --git a/chromium-browser/patches/patch-third__party_icu_android_patch__locale.sh b/chromium-browser/patches/patch-third__party_icu_android_patch__locale.sh
deleted file mode 100644
index 5bc4bcb1fc..0000000000
--- a/chromium-browser/patches/patch-third__party_icu_android_patch__locale.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- third_party/icu/android/patch_locale.sh.orig 2016-08-05 23:25:39.830507748 +0000
-+++ third_party/icu/android/patch_locale.sh
-@@ -26,7 +26,7 @@ cd source/data
- for i in curr/*.txt
- do
- locale=$(basename $i .txt)
-- [ $locale == 'supplementalData' ] && continue;
-+ [ $locale = 'supplementalData' ] && continue;
- echo "Overwriting $i for $locale"
- sed -n -r -i \
- '1, /^'${locale}'\{$/ p
diff --git a/chromium-browser/patches/patch-third__party_icu_source_configure b/chromium-browser/patches/patch-third__party_icu_source_configure
deleted file mode 100644
index e154617bed..0000000000
--- a/chromium-browser/patches/patch-third__party_icu_source_configure
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD$
-
---- third_party/icu/source/configure.orig 2016-08-05 23:25:42.572753427 +0000
-+++ third_party/icu/source/configure
-@@ -7765,13 +7765,13 @@ fi
- # Now that we're done using CPPFLAGS etc. for tests, we can change it
- # for build.
-
--if test "${CC}" == "clang"; then
-+if test "${CC}" = "clang"; then
- CLANGCFLAGS="-Qunused-arguments -Wno-parentheses-equality"
- else
- CLANGCFLAGS=""
- fi
-
--if test "${CXX}" == "clang++"; then
-+if test "${CXX}" = "clang++"; then
- CLANGCXXFLAGS="-Qunused-arguments -Wno-parentheses-equality"
- else
- CLANGCXXFLAGS=""
diff --git a/chromium-browser/patches/patch-third__party_protobuf_post__process__dist.sh b/chromium-browser/patches/patch-third__party_protobuf_post__process__dist.sh
deleted file mode 100644
index 4594ac0925..0000000000
--- a/chromium-browser/patches/patch-third__party_protobuf_post__process__dist.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- third_party/protobuf/post_process_dist.sh.orig 2016-08-05 17:35:08.000000000 +0000
-+++ third_party/protobuf/post_process_dist.sh
-@@ -15,7 +15,7 @@
- # non-testdata .txt files are converted to Windows-style line endings.
- # 5) Cleans up after itself.
-
--if [ "$1" == "" ]; then
-+if [ "$1" = "" ]; then
- echo "USAGE: $0 DISTFILE" >&2
- exit 1
- fi
diff --git a/chromium-browser/patches/patch-third__party_xdg-utils_scripts_xdg-terminal b/chromium-browser/patches/patch-third__party_xdg-utils_scripts_xdg-terminal
deleted file mode 100644
index 0c609ced9a..0000000000
--- a/chromium-browser/patches/patch-third__party_xdg-utils_scripts_xdg-terminal
+++ /dev/null
@@ -1,62 +0,0 @@
-$NetBSD$
-
---- third_party/xdg-utils/scripts/xdg-terminal.orig 2016-08-09 01:05:40.000000000 +0000
-+++ third_party/xdg-utils/scripts/xdg-terminal
-@@ -302,7 +302,7 @@ detectDE()
- elif [ x"$GNOME_DESKTOP_SESSION_ID" != x"" ]; then DE=gnome;
- elif `dbus-send --print-reply --dest=org.freedesktop.DBus /org/freedesktop/DBus org.freedesktop.DBus.GetNameOwner string:org.gnome.SessionManager > /dev/null 2>&1` ; then DE=gnome;
- elif xprop -root _DT_SAVE_MODE 2> /dev/null | grep ' = \"xfce4\"$' >/dev/null 2>&1; then DE=xfce;
-- elif [ x"$DESKTOP_SESSION" == x"LXDE" ]; then DE=lxde;
-+ elif [ x"$DESKTOP_SESSION" = x"LXDE" ]; then DE=lxde;
- else DE=""
- fi
- }
-@@ -331,7 +331,7 @@ terminal_kde()
- terminal_exec=`which $terminal 2>/dev/null`
-
- if [ -x "$terminal_exec" ]; then
-- if [ x"$1" == x"" ]; then
-+ if [ x"$1" = x"" ]; then
- $terminal_exec
- else
- $terminal_exec -e "$1"
-@@ -358,10 +358,10 @@ terminal_gnome()
- terminal_exec=`which $term_exec 2>/dev/null`
-
- if [ -x "$terminal_exec" ]; then
-- if [ x"$1" == x"" ]; then
-+ if [ x"$1" = x"" ]; then
- $terminal_exec
- else
-- if [ x"$term_exec_arg" == x"" ]; then
-+ if [ x"$term_exec_arg" = x"" ]; then
- $terminal_exec "$1"
- else
- $terminal_exec "$term_exec_arg" "$1"
-@@ -380,7 +380,7 @@ terminal_gnome()
-
- terminal_xfce()
- {
-- if [ x"$1" == x"" ]; then
-+ if [ x"$1" = x"" ]; then
- exo-open --launch TerminalEmulator
- else
- exo-open --launch TerminalEmulator "$1"
-@@ -396,7 +396,7 @@ terminal_xfce()
- terminal_generic()
- {
- # if $TERM is not set, try xterm
-- if [ x"$TERM" == x"" ]; then
-+ if [ x"$TERM" = x"" ]; then
- TERM=xterm
- fi
-
-@@ -416,7 +416,7 @@ terminal_generic()
- terminal_lxde()
- {
- if which lxterminal &>/dev/null; then
-- if [ x"$1" == x"" ]; then
-+ if [ x"$1" = x"" ]; then
- lxterminal
- else
- lxterminal -e "$1"
diff --git a/chromium-browser/patches/patch-third__party_xdg-utils_scripts_xdg-terminal.in b/chromium-browser/patches/patch-third__party_xdg-utils_scripts_xdg-terminal.in
deleted file mode 100644
index fcc33e5e3c..0000000000
--- a/chromium-browser/patches/patch-third__party_xdg-utils_scripts_xdg-terminal.in
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD$
-
---- third_party/xdg-utils/scripts/xdg-terminal.in.orig 2016-08-09 01:05:40.000000000 +0000
-+++ third_party/xdg-utils/scripts/xdg-terminal.in
-@@ -35,7 +35,7 @@ terminal_kde()
- terminal_exec=`which $terminal 2>/dev/null`
-
- if [ -x "$terminal_exec" ]; then
-- if [ x"$1" == x"" ]; then
-+ if [ x"$1" = x"" ]; then
- $terminal_exec
- else
- $terminal_exec -e "$1"
-@@ -62,10 +62,10 @@ terminal_gnome()
- terminal_exec=`which $term_exec 2>/dev/null`
-
- if [ -x "$terminal_exec" ]; then
-- if [ x"$1" == x"" ]; then
-+ if [ x"$1" = x"" ]; then
- $terminal_exec
- else
-- if [ x"$term_exec_arg" == x"" ]; then
-+ if [ x"$term_exec_arg" = x"" ]; then
- $terminal_exec "$1"
- else
- $terminal_exec "$term_exec_arg" "$1"
-@@ -84,7 +84,7 @@ terminal_gnome()
-
- terminal_xfce()
- {
-- if [ x"$1" == x"" ]; then
-+ if [ x"$1" = x"" ]; then
- exo-open --launch TerminalEmulator
- else
- exo-open --launch TerminalEmulator "$1"
-@@ -100,7 +100,7 @@ terminal_xfce()
- terminal_generic()
- {
- # if $TERM is not set, try xterm
-- if [ x"$TERM" == x"" ]; then
-+ if [ x"$TERM" = x"" ]; then
- TERM=xterm
- fi
-
-@@ -120,7 +120,7 @@ terminal_generic()
- terminal_lxde()
- {
- if which lxterminal &>/dev/null; then
-- if [ x"$1" == x"" ]; then
-+ if [ x"$1" = x"" ]; then
- lxterminal
- else
- lxterminal -e "$1"
diff --git a/chromium-browser/patches/patch-tools_battor__agent_BUILD.gn b/chromium-browser/patches/patch-tools_battor__agent_BUILD.gn
deleted file mode 100644
index 6f695e491d..0000000000
--- a/chromium-browser/patches/patch-tools_battor__agent_BUILD.gn
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- tools/battor_agent/BUILD.gn.orig 2016-08-05 17:36:02.000000000 +0000
-+++ tools/battor_agent/BUILD.gn
-@@ -5,7 +5,7 @@
- import("//testing/test.gni")
-
- # Works only on desktop platforms.
--assert(is_win || is_linux || is_mac)
-+assert(is_win || is_linux || is_mac || host_os == "netbsd")
-
- executable("battor_agent") {
- sources = [
diff --git a/chromium-browser/patches/patch-tools_gn_bootstrap_bootstrap.py b/chromium-browser/patches/patch-tools_gn_bootstrap_bootstrap.py
deleted file mode 100644
index b2ba2ace6e..0000000000
--- a/chromium-browser/patches/patch-tools_gn_bootstrap_bootstrap.py
+++ /dev/null
@@ -1,68 +0,0 @@
-$NetBSD$
-
---- tools/gn/bootstrap/bootstrap.py.orig 2016-08-05 17:36:04.000000000 +0000
-+++ tools/gn/bootstrap/bootstrap.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/pkg/bin/python2.7
- # Copyright 2014 The Chromium Authors. All rights reserved.
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-@@ -31,8 +31,9 @@ SRC_ROOT = os.path.dirname(os.path.dirna
-
- is_win = sys.platform.startswith('win')
- is_linux = sys.platform.startswith('linux')
-+is_netbsd = sys.platform.startswith('netbsd')
- is_mac = sys.platform.startswith('darwin')
--is_posix = is_linux or is_mac
-+is_posix = is_linux or is_mac or is_netbsd
-
- def check_call(cmd, **kwargs):
- logging.debug('Running: %s', ' '.join(cmd))
-@@ -183,7 +184,7 @@ def build_gn_with_ninja_manually(tempdir
-
- write_gn_ninja(os.path.join(tempdir, 'build.ninja'),
- root_gen_dir, options)
-- cmd = ['ninja', '-C', tempdir]
-+ cmd = ['ninja', '-C', tempdir, '-v']
- if options.verbose:
- cmd.append('-v')
-
-@@ -620,6 +621,37 @@ def write_gn_ninja(path, root_gen_dir, o
- '-framework', 'Security',
- ])
-
-+ if is_netbsd:
-+ libs.extend(['-lrt', '-lexecinfo'])
-+ ldflags.extend(['-lpthread'])
-+
-+ static_libraries['xdg_user_dirs'] = {
-+ 'sources': [
-+ 'base/third_party/xdg_user_dirs/xdg_user_dir_lookup.cc',
-+ ],
-+ 'tool': 'cxx',
-+ }
-+ static_libraries['base']['sources'].extend([
-+# 'base/allocator/allocator_shim.cc',
-+# 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc',
-+ 'base/memory/shared_memory_posix.cc',
-+ 'base/nix/xdg_util.cc',
-+ 'base/process/process_handle_netbsd.cc',
-+ 'base/process/process_iterator_netbsd.cc',
-+ 'base/process/process_posix.cc',
-+ 'base/process/process_metrics_netbsd.cc',
-+ 'base/strings/sys_string_conversions_posix.cc',
-+ 'base/sys_info_netbsd.cc',
-+ 'base/threading/platform_thread_netbsd.cc',
-+ 'base/trace_event/malloc_dump_provider.cc',
-+ ])
-+ static_libraries['libevent']['include_dirs'].extend([
-+ os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'freebsd')
-+ ])
-+ static_libraries['libevent']['sources'].extend([
-+ 'base/third_party/libevent/kqueue.c',
-+ ])
-+
- if is_win:
- static_libraries['base']['sources'].extend([
- 'base/base_paths_win.cc',
diff --git a/chromium-browser/patches/patch-tools_gn_setup.cc b/chromium-browser/patches/patch-tools_gn_setup.cc
deleted file mode 100644
index 4bd4a90f7f..0000000000
--- a/chromium-browser/patches/patch-tools_gn_setup.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- tools/gn/setup.cc.orig 2016-08-05 17:36:04.000000000 +0000
-+++ tools/gn/setup.cc
-@@ -616,7 +616,7 @@ void Setup::FillPythonPath(const base::C
- }
- build_settings_.set_python_path(python_path.NormalizePathSeparatorsTo('/'));
- #else
-- build_settings_.set_python_path(base::FilePath("python"));
-+ build_settings_.set_python_path(base::FilePath("/usr/pkg/bin/python2.7"));
- #endif
- }
- }
diff --git a/chromium-browser/patches/patch-tools_gn_variables.cc b/chromium-browser/patches/patch-tools_gn_variables.cc
deleted file mode 100644
index 65359607eb..0000000000
--- a/chromium-browser/patches/patch-tools_gn_variables.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
---- tools/gn/variables.cc.orig 2016-08-05 17:36:04.000000000 +0000
-+++ tools/gn/variables.cc
-@@ -191,7 +191,8 @@ const char kTargetOs_Help[] =
- " - \"linux\"\n"
- " - \"nacl\"\n"
- " - \"mac\"\n"
-- " - \"win\"\n";
-+ " - \"win\"\n"
-+ " - \"netbsd\"\n";
-
- const char kCurrentCpu[] = "current_cpu";
- const char kCurrentCpu_HelpShort[] =
diff --git a/chromium-browser/patches/patch-v8_tools_run-llprof.sh b/chromium-browser/patches/patch-v8_tools_run-llprof.sh
deleted file mode 100644
index e2c0f43f9e..0000000000
--- a/chromium-browser/patches/patch-v8_tools_run-llprof.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD$
-
---- v8/tools/run-llprof.sh.orig 2016-08-05 23:21:39.233511300 +0000
-+++ v8/tools/run-llprof.sh
-@@ -46,7 +46,7 @@ framework, then calls the low level tick
- EOF
- }
-
--if [ $# -eq 0 ] || [ "$1" == "-h" ] || [ "$1" == "--help" ] ; then
-+if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "--help" ] ; then
- usage
- exit 1
- fi
diff --git a/chromium/DESCR b/chromium/DESCR
deleted file mode 100644
index d5b7004f25..0000000000
--- a/chromium/DESCR
+++ /dev/null
@@ -1,2 +0,0 @@
-Chromium is an open-source browser project that aims to build a safer,
-faster and more stable way for Internet users to experience the web.
diff --git a/chromium/Makefile b/chromium/Makefile
deleted file mode 100644
index df5d8125bb..0000000000
--- a/chromium/Makefile
+++ /dev/null
@@ -1,176 +0,0 @@
-# $NetBSD: Makefile,v 1.14 2012/09/24 18:26:53 asau Exp $
-
-DISTNAME= chromium-11.0.696.72
-CATEGORIES= www
-MASTER_SITES= http://build.chromium.org/buildbot/official/obsolete/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= rxg%NetBSD.org@localhost
-HOMEPAGE= http://dev.chromium.org/Home
-COMMENT= Open-source browser project
-LICENSE= modified-bsd
-
-USE_TOOLS+= bash bison flex:pkgsrc gmake pax perl pkg-config
-USE_LANGUAGES= c c++
-
-BUILD_DEPENDS+= gperf>=3.0.1:../../devel/gperf
-BUILD_DEPENDS+= yasm>=0:../../devel/yasm
-
-ONLY_FOR_PLATFORM= *-*-arm *-*-i386 *-*-x86_64
-TOOLS_PLATFORM.flex= # override the platform definition to use pkgsrc's flex.
-
-DATADIR= ${DESTDIR}${PREFIX}/share/chromium
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "Linux" || ${OPSYS} == "DragonFly" || ${OPSYS} == "FreeBSD"
-.include "../../audio/alsa-lib/buildlink3.mk"
-.endif
-
-GNU_CONFIGURE= yes
-CONFIGURE_DIRS= third_party/icu/source
-CONFIGURE_DIRS+=third_party/tcmalloc/vendor
-CONFIGURE_DIRS+=third_party/yasm/source/patched-yasm
-CONFIGURE_ENV+= GYP_DEFINES=${GYP_DEFINES:Q}
-
-# Replace config.{guess,sub}
-OVERRIDE_DIRDEPTH= 5
-
-GYP_DEFINES+= OS=${LOWER_OPSYS}
-GYP_DEFINES+= buildtype=Official
-.if ${OPSYS} != "Linux"
-GYP_DEFINES+= disable_nacl=1
-.endif
-GYP_DEFINES+= disable_sse2=0
-GYP_DEFINES+= ffmpeg_branding=${FFMPEG_CODECS}
-GYP_DEFINES+= libvpx_path=${BUILDLINK_DIR}/lib
-.if ${OPSYS} != "Linux" && ${OPSYS} != "FreeBSD"
-GYP_DEFINES+= linux_use_tcmalloc=0
-.endif
-.if ${OPSYS} == "NetBSD"
-GYP_DEFINES+= no_gc_sections=1
-.endif
-GYP_DEFINES+= python_ver=${PYVERSSUFFIX}
-GYP_DEFINES+= use_system_bzip2=1
-GYP_DEFINES+= use_system_ffmpeg=0
-GYP_DEFINES+= use_system_libevent=1
-GYP_DEFINES+= use_system_libjpeg=1
-GYP_DEFINES+= use_system_libpng=1
-GYP_DEFINES+= use_system_libxml=1
-GYP_DEFINES+= use_system_sqlite=0
-GYP_DEFINES+= use_system_ssl=0
-GYP_DEFINES+= use_system_vpx=1
-GYP_DEFINES+= use_system_yasm=0
-GYP_DEFINES+= use_system_zlib=1
-
-FFMPEG_ARGS+= --disable-everything
-FFMPEG_ARGS+= --disable-network
-FFMPEG_ARGS+= --disable-bzlib
-FFMPEG_ARGS+= --disable-zlib
-FFMPEG_ARGS+= --disable-swscale
-FFMPEG_ARGS+= --disable-amd3dnow
-FFMPEG_ARGS+= --disable-amd3dnowext
-FFMPEG_ARGS+= --enable-shared
-FFMPEG_ARGS+= --enable-libvpx
-FFMPEG_ARGS+= --enable-encoder=libvpx
-
-.include "options.mk"
-
-BUILD_DIRS= .
-MAKE_ENV+= BUILDTYPE=${BUILDTYPE}
-MAKE_ENV+= CC.host=${CC:Q}
-MAKE_ENV+= CFLAGS.host=${CFLAGS:M*:Q}
-MAKE_ENV+= CXX.host=${CXX:Q}
-MAKE_ENV+= CXXFLAGS.host=${CXXFLAGS:M*:Q}
-MAKE_ENV+= LINK.host=${CXX:Q}
-MAKE_ENV+= LDFLAGS.host=${LDFLAGS:M*:Q}
-MAKE_ENV+= AR.host=${AR:Q}
-.if ${OPSYS} != "Linux"
-# Override the LINK variable for the platforms which do not have flock(1).
-MAKE_ENV+= LINK=${CXX:Q}
-.endif
-
-BUILDDIR= ${WRKSRC}/out/${BUILDTYPE}
-
-CHECK_PORTABILITY_SKIP+=gpu/demos/run_demo_ppapi.sh
-CHECK_PORTABILITY_SKIP+=third_party/xdg-utils/scripts/xdg-terminal
-CHECK_PORTABILITY_SKIP+=third_party/xdg-utils/scripts/xdg-terminal.in
-CHECK_PORTABILITY_SKIP+=v8/tools/linux-tick-processor
-
-SUBST_CLASSES+= bash
-SUBST_MESSAGE.bash= Fixing bash path
-SUBST_STAGE.bash= post-patch
-SUBST_FILES.bash+= build/linux/python_arch.sh
-SUBST_FILES.bash+= chrome/tools/build/linux/chrome-wrapper
-SUBST_FILES.bash+= chrome/tools/build/linux/sed.sh
-SUBST_SED.bash= -e 's:/bin/bash:${BASH}:'
-
-SUBST_CLASSES+= path
-SUBST_MESSAGE.path= Fixing pkg path
-SUBST_STAGE.path= post-patch
-SUBST_FILES.path+= base/base_paths_linux.cc
-SUBST_FILES.path+= base/process_util_openbsd.cc
-SUBST_FILES.path+= build/common.gypi
-SUBST_FILES.path+= chrome/chrome_tests.gypi
-SUBST_SED.path+= -e 's:/usr/local/:${PREFIX}/:'
-SUBST_SED.path+= -e 's:/usr/lib/:${BUILDLINK_DIR}/lib/:'
-SUBST_SED.path+= -e 's:/usr/include/:${BUILDLINK_DIR}/include/:'
-
-INSTALLATION_DIRS+= ${PKGMANDIR}/man1 bin share/chromium
-INSTALLATION_DIRS+= share/chromium/locales share/chromium/resources
-
-# Remove pre-configure stage when implement python in tools.
-pre-configure:
- ${LN} -sf ${PYTHONBIN} ${TOOLS_DIR}/bin/python
- ${RM} -f ${BUILDLINK_DIR}/${PYINC}/ast.h
- ${RM} -rf ${BUILDLINK_DIR}/include/GL
- cd ${WRKSRC}/third_party/icu && \
- ${CP} -Rf public/common/unicode source/common
-
-post-configure:
- cd ${WRKSRC}/third_party/icu && \
- ${MV} -f source/common/unicode/platform.h public/common/unicode
- cd ${WRKSRC}/third_party/tcmalloc && \
- ${MV} -f vendor/src/config.h chromium/src/config_linux.h
- cd ${WRKSRC}/third_party/ffmpeg/patched-ffmpeg-mt && \
- ${SH} ./configure ${FFMPEG_ARGS} && cd .. && \
- ${MV} -f patched-ffmpeg-mt/config.h \
- config/${FFMPEG_CODECS}/linux/${MACHINE_ARCH:S/i386/ia32/:S/x86_64/x64/}
- cd ${WRKSRC}/third_party/yasm/source && \
- ${MKDIR} config/${LOWER_OPSYS} && \
- ${MV} -f patched-yasm/Makefile \
- patched-yasm/config.h \
- patched-yasm/libyasm-stdint.h config/${LOWER_OPSYS}
- cd ${WRKSRC} && \
- ${SETENV} ${CONFIGURE_ENV} python build/gyp_chromium --depth=${WRKSRC}
-
-do-install:
-.for f in chrome ffmpegsumo_nolink libffmpegsumo.so mksnapshot protoc
- ${INSTALL_PROGRAM} ${BUILDDIR}/${f} ${DATADIR}
-.endfor
-.for f in chrome-wrapper xdg-mime xdg-settings
- ${INSTALL_SCRIPT} ${BUILDDIR}/${f} ${DATADIR}
-.endfor
-.for f in chrome.pak product_logo_48.png resources.pak
- ${INSTALL_DATA} ${BUILDDIR}/${f} ${DATADIR}
-.endfor
-.for d in locales resources
- cd ${BUILDDIR}/${d} && pax -rwpm . ${DATADIR}/${d}
-.endfor
- ${INSTALL_MAN} ${BUILDDIR}/chrome.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
- ${LN} -sf ${DATADIR}/chrome ${DESTDIR}${PREFIX}/bin
-
-.include "../../devel/GConf/buildlink3.mk"
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/libevent/buildlink3.mk"
-.include "../../devel/nss/buildlink3.mk"
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../lang/python/pyversion.mk"
-.include "../../mk/jpeg.buildlink3.mk"
-.include "../../multimedia/libvpx/buildlink3.mk"
-.include "../../textproc/libxslt/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/libXScrnSaver/buildlink3.mk"
-.include "../../x11/libXtst/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/chromium/PLIST b/chromium/PLIST
deleted file mode 100644
index 30b7082bb7..0000000000
--- a/chromium/PLIST
+++ /dev/null
@@ -1,232 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2011/04/28 03:09:01 rxg Exp $
-bin/chrome
-man/man1/chrome.1
-share/chromium/chrome
-share/chromium/chrome-wrapper
-share/chromium/chrome.pak
-share/chromium/ffmpegsumo_nolink
-share/chromium/libffmpegsumo.so
-share/chromium/locales/am.pak
-share/chromium/locales/ar.pak
-share/chromium/locales/bg.pak
-share/chromium/locales/bn.pak
-share/chromium/locales/ca.pak
-share/chromium/locales/cs.pak
-share/chromium/locales/da.pak
-share/chromium/locales/de.pak
-share/chromium/locales/el.pak
-share/chromium/locales/en-GB.pak
-share/chromium/locales/en-US.pak
-share/chromium/locales/es-419.pak
-share/chromium/locales/es.pak
-share/chromium/locales/et.pak
-share/chromium/locales/fa.pak
-share/chromium/locales/fi.pak
-share/chromium/locales/fil.pak
-share/chromium/locales/fr.pak
-share/chromium/locales/gu.pak
-share/chromium/locales/he.pak
-share/chromium/locales/hi.pak
-share/chromium/locales/hr.pak
-share/chromium/locales/hu.pak
-share/chromium/locales/id.pak
-share/chromium/locales/it.pak
-share/chromium/locales/ja.pak
-share/chromium/locales/kn.pak
-share/chromium/locales/ko.pak
-share/chromium/locales/lt.pak
-share/chromium/locales/lv.pak
-share/chromium/locales/ml.pak
-share/chromium/locales/mr.pak
-share/chromium/locales/nb.pak
-share/chromium/locales/nl.pak
-share/chromium/locales/pl.pak
-share/chromium/locales/pt-BR.pak
-share/chromium/locales/pt-PT.pak
-share/chromium/locales/ro.pak
-share/chromium/locales/ru.pak
-share/chromium/locales/sk.pak
-share/chromium/locales/sl.pak
-share/chromium/locales/sr.pak
-share/chromium/locales/sv.pak
-share/chromium/locales/sw.pak
-share/chromium/locales/ta.pak
-share/chromium/locales/te.pak
-share/chromium/locales/th.pak
-share/chromium/locales/tr.pak
-share/chromium/locales/uk.pak
-share/chromium/locales/vi.pak
-share/chromium/locales/zh-CN.pak
-share/chromium/locales/zh-TW.pak
-share/chromium/mksnapshot
-share/chromium/product_logo_48.png
-share/chromium/protoc
-share/chromium/resources.pak
-share/chromium/resources/inspector/DevTools.js
-share/chromium/resources/inspector/Images/applicationCache.png
-share/chromium/resources/inspector/Images/auditsIcon.png
-share/chromium/resources/inspector/Images/back.png
-share/chromium/resources/inspector/Images/breakpointBorder.png
-share/chromium/resources/inspector/Images/breakpointConditionalBorder.png
-share/chromium/resources/inspector/Images/breakpointConditionalCounterBorder.png
-share/chromium/resources/inspector/Images/breakpointCounterBorder.png
-share/chromium/resources/inspector/Images/breakpointsActivateButtonGlyph.png
-share/chromium/resources/inspector/Images/breakpointsDeactivateButtonGlyph.png
-share/chromium/resources/inspector/Images/checker.png
-share/chromium/resources/inspector/Images/clearConsoleButtonGlyph.png
-share/chromium/resources/inspector/Images/closeButtons.png
-share/chromium/resources/inspector/Images/consoleButtonGlyph.png
-share/chromium/resources/inspector/Images/consoleIcon.png
-share/chromium/resources/inspector/Images/cookie.png
-share/chromium/resources/inspector/Images/database.png
-share/chromium/resources/inspector/Images/databaseTable.png
-share/chromium/resources/inspector/Images/debuggerContinue.png
-share/chromium/resources/inspector/Images/debuggerPause.png
-share/chromium/resources/inspector/Images/debuggerStepInto.png
-share/chromium/resources/inspector/Images/debuggerStepOut.png
-share/chromium/resources/inspector/Images/debuggerStepOver.png
-share/chromium/resources/inspector/Images/disclosureTriangleSmallDown.png
-share/chromium/resources/inspector/Images/disclosureTriangleSmallDownBlack.png
-share/chromium/resources/inspector/Images/disclosureTriangleSmallDownWhite.png
-share/chromium/resources/inspector/Images/disclosureTriangleSmallRight.png
-share/chromium/resources/inspector/Images/disclosureTriangleSmallRightBlack.png
-share/chromium/resources/inspector/Images/disclosureTriangleSmallRightDown.png
-share/chromium/resources/inspector/Images/disclosureTriangleSmallRightDownBlack.png
-share/chromium/resources/inspector/Images/disclosureTriangleSmallRightDownWhite.png
-share/chromium/resources/inspector/Images/disclosureTriangleSmallRightWhite.png
-share/chromium/resources/inspector/Images/dockButtonGlyph.png
-share/chromium/resources/inspector/Images/elementsIcon.png
-share/chromium/resources/inspector/Images/enableOutlineButtonGlyph.png
-share/chromium/resources/inspector/Images/enableSolidButtonGlyph.png
-share/chromium/resources/inspector/Images/errorIcon.png
-share/chromium/resources/inspector/Images/errorMediumIcon.png
-share/chromium/resources/inspector/Images/errorRedDot.png
-share/chromium/resources/inspector/Images/excludeButtonGlyph.png
-share/chromium/resources/inspector/Images/focusButtonGlyph.png
-share/chromium/resources/inspector/Images/forward.png
-share/chromium/resources/inspector/Images/frame.png
-share/chromium/resources/inspector/Images/gearButtonGlyph.png
-share/chromium/resources/inspector/Images/glossyHeader.png
-share/chromium/resources/inspector/Images/glossyHeaderPressed.png
-share/chromium/resources/inspector/Images/glossyHeaderSelected.png
-share/chromium/resources/inspector/Images/glossyHeaderSelectedPressed.png
-share/chromium/resources/inspector/Images/goArrow.png
-share/chromium/resources/inspector/Images/graphLabelCalloutLeft.png
-share/chromium/resources/inspector/Images/graphLabelCalloutRight.png
-share/chromium/resources/inspector/Images/largerResourcesButtonGlyph.png
-share/chromium/resources/inspector/Images/localStorage.png
-share/chromium/resources/inspector/Images/networkIcon.png
-share/chromium/resources/inspector/Images/nodeSearchButtonGlyph.png
-share/chromium/resources/inspector/Images/paneAddButtons.png
-share/chromium/resources/inspector/Images/paneBottomGrow.png
-share/chromium/resources/inspector/Images/paneBottomGrowActive.png
-share/chromium/resources/inspector/Images/paneGrowHandleLine.png
-share/chromium/resources/inspector/Images/paneSettingsButtons.png
-share/chromium/resources/inspector/Images/pauseOnExceptionButtonGlyph.png
-share/chromium/resources/inspector/Images/percentButtonGlyph.png
-share/chromium/resources/inspector/Images/popoverArrows.png
-share/chromium/resources/inspector/Images/popoverBackground.png
-share/chromium/resources/inspector/Images/profileGroupIcon.png
-share/chromium/resources/inspector/Images/profileIcon.png
-share/chromium/resources/inspector/Images/profileSmallIcon.png
-share/chromium/resources/inspector/Images/profilesIcon.png
-share/chromium/resources/inspector/Images/profilesSilhouette.png
-share/chromium/resources/inspector/Images/programCounterBorder.png
-share/chromium/resources/inspector/Images/radioDot.png
-share/chromium/resources/inspector/Images/recordButtonGlyph.png
-share/chromium/resources/inspector/Images/recordToggledButtonGlyph.png
-share/chromium/resources/inspector/Images/reloadButtonGlyph.png
-share/chromium/resources/inspector/Images/resourceCSSIcon.png
-share/chromium/resources/inspector/Images/resourceDocumentIcon.png
-share/chromium/resources/inspector/Images/resourceDocumentIconSmall.png
-share/chromium/resources/inspector/Images/resourceJSIcon.png
-share/chromium/resources/inspector/Images/resourcePlainIcon.png
-share/chromium/resources/inspector/Images/resourcePlainIconSmall.png
-share/chromium/resources/inspector/Images/resourcesIcon.png
-share/chromium/resources/inspector/Images/resourcesSizeGraphIcon.png
-share/chromium/resources/inspector/Images/resourcesTimeGraphIcon.png
-share/chromium/resources/inspector/Images/scriptsIcon.png
-share/chromium/resources/inspector/Images/scriptsSilhouette.png
-share/chromium/resources/inspector/Images/searchSmallBlue.png
-share/chromium/resources/inspector/Images/searchSmallBrightBlue.png
-share/chromium/resources/inspector/Images/searchSmallGray.png
-share/chromium/resources/inspector/Images/searchSmallWhite.png
-share/chromium/resources/inspector/Images/segment.png
-share/chromium/resources/inspector/Images/segmentChromium.png
-share/chromium/resources/inspector/Images/segmentEnd.png
-share/chromium/resources/inspector/Images/segmentHover.png
-share/chromium/resources/inspector/Images/segmentHoverChromium.png
-share/chromium/resources/inspector/Images/segmentHoverEnd.png
-share/chromium/resources/inspector/Images/segmentHoverEndChromium.png
-share/chromium/resources/inspector/Images/segmentSelected.png
-share/chromium/resources/inspector/Images/segmentSelectedChromium.png
-share/chromium/resources/inspector/Images/segmentSelectedEnd.png
-share/chromium/resources/inspector/Images/segmentSelectedEndChromium.png
-share/chromium/resources/inspector/Images/sessionStorage.png
-share/chromium/resources/inspector/Images/spinner.gif
-share/chromium/resources/inspector/Images/splitviewDimple.png
-share/chromium/resources/inspector/Images/splitviewDividerBackground.png
-share/chromium/resources/inspector/Images/statusbarBackground.png
-share/chromium/resources/inspector/Images/statusbarBackgroundChromium.png
-share/chromium/resources/inspector/Images/statusbarBottomBackground.png
-share/chromium/resources/inspector/Images/statusbarBottomBackgroundChromium.png
-share/chromium/resources/inspector/Images/statusbarButtons.png
-share/chromium/resources/inspector/Images/statusbarButtonsChromium.png
-share/chromium/resources/inspector/Images/statusbarMenuButton.png
-share/chromium/resources/inspector/Images/statusbarMenuButtonChromium.png
-share/chromium/resources/inspector/Images/statusbarMenuButtonSelected.png
-share/chromium/resources/inspector/Images/statusbarMenuButtonSelectedChromium.png
-share/chromium/resources/inspector/Images/statusbarResizerHorizontal.png
-share/chromium/resources/inspector/Images/statusbarResizerVertical.png
-share/chromium/resources/inspector/Images/successGreenDot.png
-share/chromium/resources/inspector/Images/thumbActiveHoriz.png
-share/chromium/resources/inspector/Images/thumbActiveVert.png
-share/chromium/resources/inspector/Images/thumbHoriz.png
-share/chromium/resources/inspector/Images/thumbHoverHoriz.png
-share/chromium/resources/inspector/Images/thumbHoverVert.png
-share/chromium/resources/inspector/Images/thumbVert.png
-share/chromium/resources/inspector/Images/timelineBarBlue.png
-share/chromium/resources/inspector/Images/timelineBarGray.png
-share/chromium/resources/inspector/Images/timelineBarGreen.png
-share/chromium/resources/inspector/Images/timelineBarOrange.png
-share/chromium/resources/inspector/Images/timelineBarPurple.png
-share/chromium/resources/inspector/Images/timelineBarRed.png
-share/chromium/resources/inspector/Images/timelineBarYellow.png
-share/chromium/resources/inspector/Images/timelineCheckmarks.png
-share/chromium/resources/inspector/Images/timelineDots.png
-share/chromium/resources/inspector/Images/timelineHollowPillBlue.png
-share/chromium/resources/inspector/Images/timelineHollowPillGray.png
-share/chromium/resources/inspector/Images/timelineHollowPillGreen.png
-share/chromium/resources/inspector/Images/timelineHollowPillOrange.png
-share/chromium/resources/inspector/Images/timelineHollowPillPurple.png
-share/chromium/resources/inspector/Images/timelineHollowPillRed.png
-share/chromium/resources/inspector/Images/timelineHollowPillYellow.png
-share/chromium/resources/inspector/Images/timelineIcon.png
-share/chromium/resources/inspector/Images/timelinePillBlue.png
-share/chromium/resources/inspector/Images/timelinePillGray.png
-share/chromium/resources/inspector/Images/timelinePillGreen.png
-share/chromium/resources/inspector/Images/timelinePillOrange.png
-share/chromium/resources/inspector/Images/timelinePillPurple.png
-share/chromium/resources/inspector/Images/timelinePillRed.png
-share/chromium/resources/inspector/Images/timelinePillYellow.png
-share/chromium/resources/inspector/Images/toolbarItemSelected.png
-share/chromium/resources/inspector/Images/trackHoriz.png
-share/chromium/resources/inspector/Images/trackVert.png
-share/chromium/resources/inspector/Images/treeDownTriangleBlack.png
-share/chromium/resources/inspector/Images/treeDownTriangleWhite.png
-share/chromium/resources/inspector/Images/treeRightTriangleBlack.png
-share/chromium/resources/inspector/Images/treeRightTriangleWhite.png
-share/chromium/resources/inspector/Images/treeUpTriangleBlack.png
-share/chromium/resources/inspector/Images/treeUpTriangleWhite.png
-share/chromium/resources/inspector/Images/undockButtonGlyph.png
-share/chromium/resources/inspector/Images/userInputIcon.png
-share/chromium/resources/inspector/Images/userInputPreviousIcon.png
-share/chromium/resources/inspector/Images/userInputResultIcon.png
-share/chromium/resources/inspector/Images/warningIcon.png
-share/chromium/resources/inspector/Images/warningMediumIcon.png
-share/chromium/resources/inspector/Images/warningOrangeDot.png
-share/chromium/resources/inspector/Images/warningsErrors.png
-share/chromium/resources/inspector/devTools.css
-share/chromium/resources/inspector/devtools.html
-share/chromium/xdg-mime
-share/chromium/xdg-settings
diff --git a/chromium/TODO b/chromium/TODO
deleted file mode 100644
index e5bc23d9aa..0000000000
--- a/chromium/TODO
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: TODO,v 1.12 2015/09/14 22:26:13 venture37 Exp $
-
-* debug
-* test on Linux/FreeBSD/OpenBSD
-* use libtool
-
-When updating this package, please have a look at:
-- http://secunia.com/advisories/46636/
-- http://secunia.com/advisories/47694/
-- http://www.secunia.com/advisories/62964/
-- http://secunia.com/advisories/63496/
-- http://googlechromereleases.blogspot.com/2015/04/stable-channel-update_28.html
-- http://googlechromereleases.blogspot.com/2015/09/stable-channel-update.html
-- https://www.debian.org/security/2015/dsa-3376
-- https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-6792
-- https://www.debian.org/security/2015/dsa-3418
-- http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-8664
-- http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-1643
-- http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-1644
-- http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2016-1645
diff --git a/chromium/distinfo b/chromium/distinfo
deleted file mode 100644
index dc77e984f2..0000000000
--- a/chromium/distinfo
+++ /dev/null
@@ -1,337 +0,0 @@
-$NetBSD: distinfo,v 1.11 2012/11/17 02:57:11 gduzan Exp $
-
-SHA1 (chromium-11.0.696.72.tar.bz2) = 57613e310bdf7095f02417cbb98646a11f592521
-RMD160 (chromium-11.0.696.72.tar.bz2) = cfa3c1ea7d2c24396a5a9a87643a5794951b475a
-Size (chromium-11.0.696.72.tar.bz2) = 145218494 bytes
-SHA1 (patch-app_app.gyp) = 49be2be49aad8d6343cdb90cf762874893adca81
-SHA1 (patch-app_app__base.gypi) = 88491022e70c15c94a70a1ea1174f93ecc2a8e64
-SHA1 (patch-app_gfx_gl_gl__bindings.h) = c58703498ee418c60c904a74c0cde303dd159591
-SHA1 (patch-app_gfx_gl_gl__context__egl.cc) = 754e52b915b65204d0c4ef18cbf573876263ac0c
-SHA1 (patch-app_gfx_gl_gl__implementation__linux.cc) = 61a79e603068077fad0d4a16ec2ce2ef2fbf0f60
-SHA1 (patch-app_resources_app__resources.grd) = 82ae598737659ad92df75ce6240cefa8a8673c8d
-SHA1 (patch-app_surface_transport__dib.h) = c11a367d9847fa4b6dc95124a902887db159e128
-SHA1 (patch-app_surface_transport__dib__freebsd.cc) = 178ee45f99fb305de8b20eee71ef66b52a00e42a
-SHA1 (patch-app_surface_transport__dib__openbsd.cc) = 9515a19efa8e5a93f4d526320e548749386bbeb5
-SHA1 (patch-base_allocator_allocator.gyp) = 62582a98db5b4ea2df54a8107258a1313d9fe4c7
-SHA1 (patch-base_atomicops.h) = 559591e82d59ac520ce32838587c422d85f31d14
-SHA1 (patch-base_base.gyp) = 58b20fbf7645b32bece208b90cd748cd9117be89
-SHA1 (patch-base_base.gypi) = 3c3531c02acc2d466cd97fb050b24934d4324a63
-SHA1 (patch-base_base__paths__linux.cc) = aaee763db1f6742131e7f012363218d2e63378ea
-SHA1 (patch-base_debug_debugger__posix.cc) = 9995f8b753e02221904e11f4fa69c65f862547ba
-SHA1 (patch-base_debug_stack__trace__posix.cc) = 7e3a398df692671f5e702cced4b06637f174c6d0
-SHA1 (patch-base_debug_trace__event.cc) = 828a6d1b4c92afb413ec8595577ef882b9089607
-SHA1 (patch-base_dir__reader__posix__unittest.cc) = ce63bf9c6e47429a43fb1885de8c6123680a9495
-SHA1 (patch-base_file__util__posix.cc) = ed842b2106cb9c38cf7ff853fbf33c8d687c790c
-SHA1 (patch-base_i18n_number__formatting.cc) = eab3e193ea917e520bd54d9edf83ae609d2289d9
-SHA1 (patch-base_i18n_number__formatting.h) = b4418b2a21390807f40bdf32b3f258e43bf3a226
-SHA1 (patch-base_linux__util.cc) = 03ed72aa5b6bf8971b333e06faa2d5805853a201
-SHA1 (patch-base_logging.cc) = 79a7967ab43da8cf442facb17e895adbd48d9ceb
-SHA1 (patch-base_logging.h) = 49d444d577b8ee2acbf0cf3dca5273b4d1cd972e
-SHA1 (patch-base_platform__file__posix.cc) = 3e7709d3901f2079b773b3589fc1a9f8c1aa6d5b
-SHA1 (patch-base_process__util.h) = add85b7b77152290fa9fd35dfe938b47059356d1
-SHA1 (patch-base_process__util__dragonfly.cc) = a1d49ac6c874c50b037a56f718c8c25cb6c11598
-SHA1 (patch-base_process__util__freebsd.cc) = 5c971491ca3fb89d0ef88b3484884c7e609ebe82
-SHA1 (patch-base_process__util__netbsd.cc) = 07e891a80584db49d50f3f85b36be6d3012e81fd
-SHA1 (patch-base_process__util__openbsd.cc) = a4763de374006fe765425358c905880e24e96d97
-SHA1 (patch-base_process__util__posix.cc) = b4ebaf23e40581df855c36068886cf0e947f30de
-SHA1 (patch-base_shared__memory__posix.cc) = 2cb0d127d33518e28bb37ac1dd4e2df098be8324
-SHA1 (patch-base_string__util__posix.h) = 10f4ddcfdc0fee7a624625caef4778fdb89558e1
-SHA1 (patch-base_sys__info__dragonfly.cc) = 5fbce80381f096303bc7a3e78d5fae65ed3f240f
-SHA1 (patch-base_sys__info__linux.cc) = a1f47c5e548a47452cfee2f9f86207025cda3b10
-SHA1 (patch-base_sys__info__netbsd.cc) = ae6296277ef392a37005f5631d1d8149b3843d72
-SHA1 (patch-base_sys__info__posix.cc) = d6dd7f0432965782d8fe1346f4be184609f2f9d8
-SHA1 (patch-base_test_test__file__util__linux.cc) = 529b2ff06a411ce6b10313b7fbbd569385a6162c
-SHA1 (patch-base_test_test__file__util__posix.cc) = 573a009df8b0a95f799433f2ae85fac60c429c84
-SHA1 (patch-base_third__party_dmg__fp_dtoa.cc) = b3f24c4e13d027926a33a74263457b67f8b3c3c5
-SHA1 (patch-base_third__party_nspr_prcpucfg.h) = 1371951d1dd918e1bfc22a78b6806b67bffc5955
-SHA1 (patch-base_third__party_nspr_prcpucfg__netbsd.h) = 690a4553624c0494282e3a0068b012ecf50e74ad
-SHA1 (patch-base_third__party_symbolize_utilities.h) = 3dbe1af9cdf781775b1018623fefcda967146fcf
-SHA1 (patch-base_threading_platform__thread__posix.cc) = cda7c19bd42f7577cc50d5f5e7f50fdc4ad5ac8d
-SHA1 (patch-base_threading_worker__pool__posix.cc) = 92b1ee03d6deed6f78d9f7bdc6bd9e7305735522
-SHA1 (patch-base_time__posix.cc) = 20e475288672bf4c818b61efa7bd9b2f73007dde
-SHA1 (patch-build_all.gyp) = 7c784cb0d8ac4914e1394a676276504881819b86
-SHA1 (patch-build_build__config.h) = ca702d29091d97a61fbcfcdff1da3b844c588c4b
-SHA1 (patch-build_common.gypi) = f46f6592894e364c520a5a42c6a7f7db49bf50d9
-SHA1 (patch-build_features__override.gypi) = c4cbd200ca4398bce1b2f9e9e3e0d51fe8900470
-SHA1 (patch-build_linux_python__arch.sh) = 9ba5a14b3f846c3a6388a082f8b6ec83edca16b7
-SHA1 (patch-chrome_app_chrome__exe__main__gtk.cc) = c5c0873d1db9f6a08580f5183c94471ea86d37f3
-SHA1 (patch-chrome_app_generated__resources.grd) = ff4cb9421fb6c5fb634f2e8dd890ea963205851e
-SHA1 (patch-chrome_app_resources_locale__settings.grd) = f154b8ebc1965b5c34187fd631a5ec8b5fa896db
-SHA1 (patch-chrome_browser_about__flags.cc) = 47c9eed34e1b70c14a2a6681549394ef68c5482e
-SHA1 (patch-chrome_browser_browser__about__handler.cc) = 02436eab8490c1986e3af150b5d3edaddb36ed3c
-SHA1 (patch-chrome_browser_browser__resources.grd) = fedf36cf0904ddcd356af6f690a7736cdb9dd4dc
-SHA1 (patch-chrome_browser_geolocation_gateway__data__provider__bsd.cc) = 8a74366ab3d3ff19bef37075913ede3ac3e6fab3
-SHA1 (patch-chrome_browser_geolocation_gateway__data__provider__bsd.h) = d79a3bb3bb24a90c2b283af7ac7324395d713e92
-SHA1 (patch-chrome_browser_history_in__memory__url__index.cc) = 1de235ba618afb0196751603d3d4c4ff2aaa58cf
-SHA1 (patch-chrome_browser_memory__details.cc) = 27db522e3c8ed6f27e7b0640898169aa26be5094
-SHA1 (patch-chrome_browser_memory__purger.cc) = 9c12e659aa4a0185390b3fb1c13c3a44df52ca19
-SHA1 (patch-chrome_browser_net_connection__tester.cc) = 026995edb23a3f0eea829fad6e1e3b5f27a001f3
-SHA1 (patch-chrome_browser_notifications_balloon__collection__impl.h) = 67e5e84f53d0d6a9beb04a363777aab595f24083
-SHA1 (patch-chrome_browser_process__singleton.h) = 7d638a960de2fd80cd38db359f1ece41ef7ba3a3
-SHA1 (patch-chrome_browser_process__singleton__linux.cc) = ed629866d62e150f6674a7cfb95a7ac634ff57a6
-SHA1 (patch-chrome_browser_renderer__host_browser__render__process__host.cc) = 777d08da24cc53d9502619c3810e4c6488c546d0
-SHA1 (patch-chrome_browser_shell__integration__linux.cc) = 7df6e058bd78aa470f06d5028b605e416afe2bbe
-SHA1 (patch-chrome_browser_shell__integration__unittest.cc) = d54d23a73a655723554851d59b816c601860675e
-SHA1 (patch-chrome_browser_sync_engine_syncer__thread.cc) = 78821e61a964bfb79f57db5c2e57510a44ef210a
-SHA1 (patch-chrome_browser_sync_engine_syncer__thread.h) = f12799821b00de8227b39ea8bef377968bf82b04
-SHA1 (patch-chrome_browser_sync_glue_sync__backend__host.cc) = 142ed451bb91ee4986109fa465f736e6170c487c
-SHA1 (patch-chrome_browser_sync_syncable_directory__backing__store.cc) = f31f4ea39ff93d9e8472df4e346810ddd64b9c59
-SHA1 (patch-chrome_browser_task__manager_task__manager__resource__providers.cc) = 61918faae5037ff4279a9d6c777716a29b62a6a1
-SHA1 (patch-chrome_browser_ui_browser.cc) = a154a21b1a80eb25fe12a870d93ac93d1381e3a2
-SHA1 (patch-chrome_browser_ui_browser__list.cc) = ab1a896388f4fbc1768ab4e64f98f651a8165617
-SHA1 (patch-chrome_browser_ui_toolbar_wrench__menu__model.cc) = 04cf478df2bbae590de30dcf7f468d91d25fe1f2
-SHA1 (patch-chrome_browser_ui_views_create__application__shortcut__view.cc) = 48ef869cc2a165d201813a03091ab517afd2a180
-SHA1 (patch-chrome_browser_ui_views_dropdown__bar__host.cc) = 4399226ab0198e50d14712b86482711af14052bd
-SHA1 (patch-chrome_browser_ui_views_extensions_extension__popup.cc) = 163d726b971dfdc7ba93c81973f5fb81b90ae40d
-SHA1 (patch-chrome_browser_ui_views_extensions_extension__view.cc) = 1686b360b83f9ac18402629a4ec32a6fa4e9bee1
-SHA1 (patch-chrome_browser_ui_views_find__bar__view.cc) = 0abae63e96052031eb55dde4bd87a281e4ac87c0
-SHA1 (patch-chrome_browser_ui_views_find__bar__view.h) = 2c266e5c343cc6420b3c9c00231290a562365846
-SHA1 (patch-chrome_browser_ui_views_frame_app__panel__browser__frame__view.cc) = 4837a27ec4d53bdb03e66d54fbcd10574668e5e1
-SHA1 (patch-chrome_browser_ui_views_frame_browser__view.cc) = 665d81ba5f1f3e230e5ec5bb0b2b06ceaad39af4
-SHA1 (patch-chrome_browser_ui_views_frame_browser__view__layout.cc) = f016eae5769a0ac994fd71022365ca8a338f0666
-SHA1 (patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc) = c87723c445eb9287435ec73a134d1d97c0a18c99
-SHA1 (patch-chrome_browser_ui_views_fullscreen__exit__bubble.cc) = 5373659cfc6e492bed83800d5c6db71abc4eedd9
-SHA1 (patch-chrome_browser_ui_views_fullscreen__exit__bubble.h) = 4865596af9bd05509c2cfa0a55b6a35f4bc70670
-SHA1 (patch-chrome_browser_ui_views_info__bubble.cc) = b145ea1ecc7ad32369ce0d76d53f48ffa5ed4874
-SHA1 (patch-chrome_browser_ui_views_info__bubble.h) = 7c90d315a82f167dbb0bed5e00718daa95366b4e
-SHA1 (patch-chrome_browser_ui_views_location__bar_location__bar__view.cc) = e2dcccbc378485ff153f96f117cea5b3ee08bb9e
-SHA1 (patch-chrome_browser_ui_views_location__bar_location__bar__view.h) = 62faad41e7e30d28ffb6fd96a5401b94a029b880
-SHA1 (patch-chrome_browser_ui_views_notifications_balloon__view.cc) = fd7321f665edd306a16235672bd926a1a40ce0bc
-SHA1 (patch-chrome_browser_ui_views_notifications_balloon__view__host.cc) = 9e35b00a1482deeaea6f031650762cb217a9e9a3
-SHA1 (patch-chrome_browser_ui_views_tabs_dragged__tab__view.cc) = f461be439ae65544aae4dc21a632fc23c237a478
-SHA1 (patch-chrome_browser_ui_views_tabs_dragged__tab__view.h) = 5ffd82a7e9b9d77145a9bcac706d566ffe5d7e4f
-SHA1 (patch-chrome_browser_ui_views_tabs_tab__strip.cc) = 120136c3504e5e7fc7306518dd6b4c5ea1178e37
-SHA1 (patch-chrome_browser_ui_views_tabs_tab__strip.h) = 83c64eaeb918271f8479496d17f36b554e3fceb6
-SHA1 (patch-chrome_browser_web__applications_web__app.cc) = c235d3e082aa79262ed379dff6a296967588a2cf
-SHA1 (patch-chrome_chrome.gyp) = f91a5dcba8c565da986ae472972d9111558a3770
-SHA1 (patch-chrome_chrome__browser.gypi) = c073eddc86d59dc30d0caa73d7199f1cb5c8a226
-SHA1 (patch-chrome_chrome__common.gypi) = 277aec8713e0d0a8b1ef96b9bc197e0973b8c59d
-SHA1 (patch-chrome_chrome__exe.gypi) = dc21f1ba27921c56b1d8b8c3c3408ffdebeb33fa
-SHA1 (patch-chrome_chrome__renderer.gypi) = bbfa73ed35ce442f1172ebda3d1f3b404c4919f6
-SHA1 (patch-chrome_chrome__tests.gypi) = dfddfb067f62e17c787d0d83a1013088dcc57d77
-SHA1 (patch-chrome_common__constants.gypi) = 656c0280cbbafceb6cad4d5b52b0075f861fe571
-SHA1 (patch-chrome_common_chrome__constants.cc) = 112cd54ddeeb0ea4df5b040c053b1cac43a7bcd7
-SHA1 (patch-chrome_common_chrome__paths.cc) = fed198125d402ea479b859ef8485f8205fefd81d
-SHA1 (patch-chrome_common_chrome__switches.cc) = 539b11caa8b3d0856c8cd67fdb0efc51a2c55f1f
-SHA1 (patch-chrome_common_chrome__switches.h) = 16a52510fa3c4834110015d1c8e4974edebb56dc
-SHA1 (patch-chrome_common_multi__process__lock.h) = d26e20d8722d134b91d2561c57bb536b5e08bd6c
-SHA1 (patch-chrome_common_native__web__keyboard__event.h) = 9a9e58b185de9c37ee2a4789664d0ef4ddcc08de
-SHA1 (patch-chrome_common_plugin__messages.cc) = 26adc86ea5e9e90694fa4ac003802c5dcea1241d
-SHA1 (patch-chrome_common_plugin__messages.h) = 08f563f9d8a5133be74e07ec91e08d9cdf141b75
-SHA1 (patch-chrome_common_render__messages__internal.h) = 2a95845bd7f877ba4a89c8505e886c342e6dec82
-SHA1 (patch-chrome_common_service__process__util__posix.h) = ee2f768e28f2934abd9623349a2f17ffa7eb13fd
-SHA1 (patch-chrome_default__plugin_default__plugin.gyp) = 29348eaae9a1d58758ed94fed3e14f50078e4029
-SHA1 (patch-chrome_gpu_x__util.h) = 99ce2b7ec1c62c09943ca6ac71cb66f904bfaf43
-SHA1 (patch-chrome_nacl_nacl__main.cc) = 27b08fd5bf81da943cdbdd49ed163e8ccf1fe003
-SHA1 (patch-chrome_plugin_plugin__main__linux.cc) = fc6bf7d58bb27050e0be8c5b02213b86def0c023
-SHA1 (patch-chrome_plugin_plugin__thread.cc) = 3332e432484b1a0b7f31e709b704b8321ee9cc0d
-SHA1 (patch-chrome_plugin_webplugin__delegate__stub.cc) = f8acbcfdf5fa6951b230e861f1e245221c52e33c
-SHA1 (patch-chrome_plugin_webplugin__proxy.cc) = d650221ad66e5125c01a00b17fbd73f4499aeb46
-SHA1 (patch-chrome_plugin_webplugin__proxy.h) = 92f790753f304858ca362c16832a8b6cad7a784d
-SHA1 (patch-chrome_renderer_nacl__desc__wrapper__chrome.cc) = 2ddd55e84294ace5d454067f6325561d92b0db70
-SHA1 (patch-chrome_renderer_pepper__devices.cc) = 92b069615185bf7426172732b2bb254b9f1498c0
-SHA1 (patch-chrome_renderer_pepper__plugin__delegate__impl.cc) = b45d040e6ce7e3e10f52fe7c2792218c7089da55
-SHA1 (patch-chrome_renderer_pepper__scrollbar__widget.h) = fdf80706148e81dc15451e22f4f572f5b5e80e04
-SHA1 (patch-chrome_renderer_render__process__impl.cc) = a6850c31f35821a74c37dc138b43f06b250d0f12
-SHA1 (patch-chrome_renderer_render__thread.cc) = 58837d7b9366d6a69495d6f06a3cc9442ed7400f
-SHA1 (patch-chrome_renderer_render__view.h) = 903340f121252730350b5782cf67fd92eab63db9
-SHA1 (patch-chrome_renderer_render__widget.cc) = 3fa160413cebe8b0d3994653951378cec6c62bc8
-SHA1 (patch-chrome_renderer_renderer__glue.cc) = 78997a832ca91fe5dfd22d0b3ebe93a2c4a08ba9
-SHA1 (patch-chrome_renderer_renderer__main.cc) = f82dd000cd26fd632ed5e57050e84f295a02637e
-SHA1 (patch-chrome_renderer_renderer__main__platform__delegate__linux.cc) = 287d90576de8cfd3ce4424d8448e0c801f7d8181
-SHA1 (patch-chrome_renderer_renderer__webkitclient__impl.cc) = e9c2d8923ef59e652a505404393669e475fa35d8
-SHA1 (patch-chrome_renderer_webplugin__delegate__pepper.cc) = c683b0e38a53cf9efee50d99de848f5e18ac5d02
-SHA1 (patch-chrome_renderer_webplugin__delegate__pepper.h) = 8b63a9992e0378a12d583d4257b79e1f557e6ad6
-SHA1 (patch-chrome_renderer_webplugin__delegate__proxy.cc) = ea21dbbeb9389b313a1b4a048c2ff06f4b650b0b
-SHA1 (patch-chrome_renderer_webplugin__delegate__proxy.h) = 8060a97723ff3f18efe5d42907ce230ad58adfa9
-SHA1 (patch-chrome_test_automation_automation__proxy__uitest.cc) = fb87791d5679c95d847513d95c34e0ae22e883d2
-SHA1 (patch-chrome_test_automation_proxy__launcher.cc) = 80ed1518da37258ddbaf11e15507568e44370c6e
-SHA1 (patch-chrome_test_chrome__process__util.cc) = cf29364dd01ce0fce70aeeea81f9c8200fb5a069
-SHA1 (patch-chrome_test_gpu_gpu__pixel__browsertest.cc) = 015fb2502c9c6f6d6a653dea835e0cf2c701709d
-SHA1 (patch-chrome_test_in__process__browser__test.cc) = 6069b77d6cc7cea5c4bf10dc94ad768fdf0645cc
-SHA1 (patch-chrome_test_page__cycler_page__cycler__test.cc) = b24f108d0ca023d9fe6ca7cd1e7ff7b6b84a44de
-SHA1 (patch-chrome_test_reliability_page__load__test.cc) = a7ee67cea1841407c276f9f529712d725a356b96
-SHA1 (patch-chrome_test_startup_feature__startup__test.cc) = 879438983a945a6233df226e7b27feec6568020f
-SHA1 (patch-chrome_test_testing__browser__process.cc) = 7f74caf1c157a60978eb453d985140e0b1f3ba0e
-SHA1 (patch-chrome_test_testing__browser__process.h) = 52c761f3b57d4a61ca056286d5278d0736ed2466
-SHA1 (patch-chrome_test_ui__test__utils.cc) = 211b22f7bf00d5a584de25f85ae12345e9e2b8c8
-SHA1 (patch-chrome_test_ui_sunspider__uitest.cc) = 1bf7f9120dec9dc882d4f3d532ad2e660bba14bf
-SHA1 (patch-chrome_test_ui_ui__layout__test.cc) = b8dd6498f8b197f1e5030b07073c5b5850ecc29f
-SHA1 (patch-chrome_test_ui_ui__test.cc) = 3ea2bd33123013a4a8e9a4af301c3949a0d317e8
-SHA1 (patch-chrome_test_ui_v8__benchmark__uitest.cc) = e91e84147c186c6594fc1006614f4c52d677625a
-SHA1 (patch-chrome_test_url__fetch__test_url__fetch__test.cc) = 4f33f141021a9c6e074db3fb0092acf6982c4d17
-SHA1 (patch-content_browser_browser__child__process__host.cc) = 6bb8a2dc065755824a94e39c274d285993e5d778
-SHA1 (patch-content_browser_child__process__launcher.cc) = b06a6b8d3e5deb57a53815964f6b750a1496e08a
-SHA1 (patch-content_browser_geolocation_empty__device__data__provider.cc) = d173d8e52d2feb7b351ced3609dd83be7db40bc2
-SHA1 (patch-content_browser_geolocation_location__provider.cc) = 82060536295496bb82d05c90adcde5cbc29e2c40
-SHA1 (patch-content_browser_renderer__host_backing__store__x.cc) = 42ce77cfb3ccfa4723d7b6c5fa9ef71781ef0e0f
-SHA1 (patch-content_browser_renderer__host_mock__render__process__host.cc) = 73a2a62d64ce4f7739f7e6d83f92741785e8bb25
-SHA1 (patch-content_browser_renderer__host_p2p__socket__host__posix.cc) = 6b07448aef337493833e88f69abc8c3f8f39503f
-SHA1 (patch-content_browser_renderer__host_render__message__filter.cc) = cf26182de57047d85d392da91e39f889f40215d8
-SHA1 (patch-content_browser_renderer__host_render__sandbox__host__linux.cc) = 8e5699c469d379366527e0264f81cadd804a0258
-SHA1 (patch-content_browser_renderer__host_render__widget__helper.cc) = 94ad3101527ba77edc06ad9aca096c02bd8e0624
-SHA1 (patch-content_browser_renderer__host_render__widget__helper.h) = 9d8e56d9d0c708be3c872ca1da08107c5e02732e
-SHA1 (patch-content_browser_renderer__host_render__widget__host__unittest.cc) = fb01ccf2697fb4c46fc60aaa9617650fe722ae19
-SHA1 (patch-content_browser_tab__contents_tab__contents.cc) = 1e1ca97d6140e0af72544c0f269dd2043f3fc058
-SHA1 (patch-content_browser_zygote__host__linux.cc) = e259bb6a75b4d4a241f11ad5dbc09d29df2b8fdb
-SHA1 (patch-content_browser_zygote__host__linux.h) = 91eabb502d2b40d5289d0c7916e4afd571d06205
-SHA1 (patch-content_browser_zygote__main__linux.cc) = 77098078a2f7840d31de6a15ea260f0a5e1dcb1c
-SHA1 (patch-content_common_file__path__watcher_file__path__watcher__stub.cc) = e63bef12566c610afb6b9ea7a2b9c81ad9f8379f
-SHA1 (patch-content_content__browser.gypi) = 5ecf4e42c5c52d64fe48a10d32c683a0cd492630
-SHA1 (patch-content_content__common.gypi) = 69a59c707063eba343eb48aedbd355b8a1e3ee4c
-SHA1 (patch-gpu_demos_demos.gyp) = e4b54ac93a1f20b31cd8bd6dfb65f479dc38a25f
-SHA1 (patch-gpu_demos_framework_main__exe.cc) = 29a7675afc6f3c519870191a800bfe59efa7fd2e
-SHA1 (patch-gpu_demos_framework_main__pepper.cc) = 5bccb08e551c5426c1b789aeb7dd89d8d6adc3f9
-SHA1 (patch-gpu_gpu.gyp) = 4297bf0c7d81924772cf2de20b877ee3ba1562f1
-SHA1 (patch-ipc_ipc.gyp) = 5eeb3b95569e75914bc15986d51d2acacc4641e2
-SHA1 (patch-ipc_ipc__channel__posix.cc) = 45ed2087ddbcbe13472c244e7371947a0f64e905
-SHA1 (patch-ipc_ipc__channel__posix.h) = 4394e33808752c347a5a6d7b84fd6e07e087bc83
-SHA1 (patch-jingle_jingle.gyp) = 8fd9aefc41f62dd5e320a8144321a0c8e87e6bbc
-SHA1 (patch-media_audio_openbsd_audio__manager__openbsd.cc) = 3a9008ee3fd04e70defb3ee8c4fb5b8d87e269ce
-SHA1 (patch-media_audio_openbsd_audio__manager__openbsd.h) = 1d0e1a1b98267b707f33848370fc081610b5999e
-SHA1 (patch-media_base_media__switches.cc) = 10d346ad340d47d21f7043064cc53c3b5211c553
-SHA1 (patch-media_base_media__switches.h) = 5c044bf5f49e03a4537b365b042ab6160a45855e
-SHA1 (patch-media_ffmpeg_file__protocol.cc) = 26ea492d0fcd524b82f7ae4dd1e9610b3e5dba3c
-SHA1 (patch-media_filters_ffmpeg__glue.cc) = 5cd6d76048f8a3f48dd5279c8cb7ef6fcd32c9f4
-SHA1 (patch-media_media.gyp) = 89ee06e810a836e72b7875a06b6c9126518d2269
-SHA1 (patch-media_tools_shader__bench_shader__bench.cc) = f9c902325c65338d632cae4d3677465e7ef33b02
-SHA1 (patch-native__client_build_common.gypi) = 6166514e92110011bde6f74e681cd082bd1e5931
-SHA1 (patch-native__client_src_include_nacl__platform.h) = 6747dcf2dd3fee2f30a1a50109f4ab8d675491b9
-SHA1 (patch-native__client_src_shared_platform_linux_nacl__host__desc.c) = 961f410469ce43fcda48efb00aaddf7d374f6451
-SHA1 (patch-native__client_src_shared_platform_linux_nacl__host__dir.c) = fb187380455641f92b61e3c83440ea0dac61d2cd
-SHA1 (patch-native__client_src_shared_platform_linux_nacl__threads.c) = 0b53940b015125b8dd6a09dc7c971bc3df7e4384
-SHA1 (patch-native__client_src_shared_platform_nacl__host__desc.h) = d586dea00027bb5291f627d183ebd8d4e1cc573f
-SHA1 (patch-native__client_src_shared_platform_platform.gyp) = c523384d29a051e93dca8aad3b749d5cd0c2662b
-SHA1 (patch-native__client_src_trusted_debug__stub_debug__stub.gyp) = cb736e56f395d5fbdc065a60c58313ae93f54c85
-SHA1 (patch-native__client_src_trusted_debug__stub_posix_platform__impl.cc) = 9e6ae507d16a6eb92e75231be6722d7c048ca821
-SHA1 (patch-native__client_src_trusted_debug__stub_transport__common.cc) = a5ec9f6897dd8459ebda5ffc80dd874211215dd4
-SHA1 (patch-native__client_src_trusted_plugin_nacl__entry__points.cc) = 8923750a2405a6607aa6ca541b6320ede721fc17
-SHA1 (patch-native__client_src_trusted_service__runtime_arch_x86_sel__ldr__x86.h) = 7c9594276cf6b649bcfb2eceaa7f8d71aafc0ba2
-SHA1 (patch-native__client_src_trusted_service__runtime_service__runtime.gyp) = 3620205a9589aa565b02f3a23d96016ff5fcd50e
-SHA1 (patch-net_base_dnsrr__resolver.cc) = b9cf60d6d8ad6cabf2c9e5af879c70c07657bc6d
-SHA1 (patch-net_base_host__resolver__impl.cc) = 61c214d61143031cf2eb56746f1586ee38981f9a
-SHA1 (patch-net_base_host__resolver__proc.cc) = b922234c59b4f0a434c50dd0b45e27c51be8839e
-SHA1 (patch-net_base_listen__socket.cc) = 47abe7f9cc61ae05d01857fb02d8866734b6128b
-SHA1 (patch-net_base_listen__socket__unittest.cc) = 354e381072d2365bb02b62172706e06f5269ff50
-SHA1 (patch-net_base_listen__socket__unittest.h) = 300e02a66ed8d180501639ea5cd8fa64fceb1af5
-SHA1 (patch-net_base_net__util.cc) = 860d0bb7228ec6a3bed96aa21f5f616a5a77cba3
-SHA1 (patch-net_base_net__util.h) = 44950fe73159f457a1f319d80c50f1c3b4355343
-SHA1 (patch-net_base_network__change__notifier.cc) = 726b26dfc16ca3838dac0dd75045dfaaf33eaba1
-SHA1 (patch-net_disk__cache_disk__format.h) = cbb1b6c7759052670c92827e3a68c4aa787fd8dd
-SHA1 (patch-net_net.gyp) = 9ca7acdede3e42cad3e5d087f871f3a938ad806d
-SHA1 (patch-net_proxy_proxy__config__service__linux.cc) = 1a39ae17379414a3a8423e562f0719b05f36a748
-SHA1 (patch-net_proxy_proxy__service.cc) = cd9ebfc1dbd5e28261e59e38f05f4e5833409088
-SHA1 (patch-net_third__party_nss_ssl.gyp) = ba74b49f68ac127851411870e3a0de20386fe3b6
-SHA1 (patch-ppapi_ppapi__tests.gypi) = 538655d1c648e13ff5f48b7b4ca877f73d4c4083
-SHA1 (patch-ppapi_proxy_ppb__image__data__proxy.cc) = f01b8b38628416ecb13d30dfc9b8b1df468bdcbe
-SHA1 (patch-ppapi_proxy_serialized__structs.h) = beb1a662448a3f1330eb81fe73090b70692dcf1d
-SHA1 (patch-ppapi_proxy_serialized__var.cc) = 5b573d62ccb60b03f7f08d4ff2a6cd079e6d437c
-SHA1 (patch-printing_printing.gyp) = 606b2d30495882f49358e56c4bc0431b2aa74039
-SHA1 (patch-remoting_base_compound__buffer.cc) = 81ab809e34b97f4268dc503eee078b1de8bbeb61
-SHA1 (patch-remoting_base_compound__buffer.h) = 4e02833bd28de0b87d0a8337367fbdeebc478117
-SHA1 (patch-remoting_remoting.gyp) = 8ce90e0e49fda7a81e20f499a838d3d86a3d9061
-SHA1 (patch-remoting_tools_client__webserver_main.c) = 31727218051f2a17ae611737749bc67dd2927243
-SHA1 (patch-sandbox_sandbox.gyp) = e2a68bff8a22c82dc3de069ff824131a31cba58b
-SHA1 (patch-skia_ext_bitmap__platform__device.h) = 33b5c196ecbedef6d2e29e02352f7b2ceaa61910
-SHA1 (patch-skia_ext_bitmap__platform__device__data.h) = ca75a337afee544e72945025da6b677730f72867
-SHA1 (patch-skia_ext_canvas__paint.h) = 01261962a24e2771c5b436cdc828e27898e66acf
-SHA1 (patch-skia_ext_platform__canvas.h) = 748a7c51af0e3b1800447bd900b27a7197dbac84
-SHA1 (patch-skia_ext_platform__device.h) = 5d858c17d6a6cfb9d7980c1635c6bfa1ee84dd0b
-SHA1 (patch-skia_ext_vector__canvas.h) = 2c183c712353379b13f3666ffc34e589fb398ab2
-SHA1 (patch-skia_ext_vector__platform__device.h) = 47908f47f14fb4629ce918eafddb114ebe2a6829
-SHA1 (patch-skia_skia.gyp) = 54ca7898bb2159a04ff9d667ef9977f6f42a9efe
-SHA1 (patch-testing_gtest.gyp) = bd749692dcd08c8fb93c60a163471c8636837807
-SHA1 (patch-testing_gtest_include_gtest_internal_gtest-port.h) = e025fe0b598fbd579a682468491a9d0d5779afa8
-SHA1 (patch-testing_gtest_src_gtest-death-test.cc) = e35dafa0ffedd5311c3f31dcd216739f51c6d972
-SHA1 (patch-testing_gtest_src_gtest.cc) = 4929ffcd58201794908bbe6db7663b20f4f12718
-SHA1 (patch-third__party_WebKit_Source_JavaScriptCore_JavaScriptCore.gyp_JavaScriptCore.gyp) = 2b25125df16cfc41ca7ac79669071e5b2f063734
-SHA1 (patch-third__party_WebKit_Source_JavaScriptCore_config.h) = 5e05cf4463121283ed8553817dcbcc8215dc11b8
-SHA1 (patch-third__party_WebKit_Source_JavaScriptCore_jit_JITStubs.cpp) = b1dcb1f1e58d2166272e00a1ac58d4ab04a88f2e
-SHA1 (patch-third__party_WebKit_Source_JavaScriptCore_wtf_Platform.h) = 7bdda957f8a09a1f74468e633ae251ac47a9ca24
-SHA1 (patch-third__party_WebKit_Source_WebCore_WebCore.gyp_WebCore.gyp) = 4496e73f6f453c8d38327e1dd029ec5bae95e387
-SHA1 (patch-third__party_WebKit_Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp) = 34649dfd8c7ff0112e08d3682ad0f8b2d0dd7a62
-SHA1 (patch-third__party_WebKit_Source_WebCore_bindings_v8_V8Proxy.cpp) = eeea95eeb491cf4c5d7f44d0ba047e4e80a28805
-SHA1 (patch-third__party_WebKit_Source_WebCore_bindings_v8_custom_V8InspectorFrontendHostCustom.cpp) = f7ad4507b9ccd81760a53de97e3cef3e6fe6e553
-SHA1 (patch-third__party_WebKit_Source_WebCore_dom_SelectElement.cpp) = 8dbb59840604a15f6e18bdd977ce3aabf36c7b79
-SHA1 (patch-third__party_WebKit_Source_WebCore_loader_cache_CachedFont.cpp) = 5606ba692fb99d7b2bbc46dc0260fdead295dcbd
-SHA1 (patch-third__party_WebKit_Source_WebCore_page_EventHandler.cpp) = 6f88631431e79a53a06aae9ce9b8dfbd3a8dcf70
-SHA1 (patch-third__party_WebKit_Source_WebCore_page_chromium_EventHandlerChromium.cpp) = c1b3a64c5e3d5bbc269b2a09e78fcf51c85c2e58
-SHA1 (patch-third__party_WebKit_Source_WebCore_platform_Scrollbar.cpp) = f8bf9f76d5566411e34df3be045a6c396913f9a4
-SHA1 (patch-third__party_WebKit_Source_WebCore_platform_chromium_PlatformBridge.h) = 093b6ce1b64b39bf958b27d8509bd35a0ff88130
-SHA1 (patch-third__party_WebKit_Source_WebCore_platform_graphics_chromium_FontPlatformData.h) = e18a6b51e76f11f8085af120454b0a4a807098cf
-SHA1 (patch-third__party_WebKit_Source_WebCore_platform_graphics_skia_FontCustomPlatformData.h) = 6c5b1e42c0660767569e2717d350e5510322ff2f
-SHA1 (patch-third__party_WebKit_Source_WebCore_platform_image-decoders_png_PNGImageDecoder.cpp) = 522c6d50673ebfbfc4401849b249c0428a894ff7
-SHA1 (patch-third__party_WebKit_Source_WebCore_platform_image-encoders_skia_PNGImageEncoder.cpp) = 3facdc633a3cb3c4384de9e6013c308cb0ebf9bf
-SHA1 (patch-third__party_WebKit_Source_WebCore_storage_IDBDatabaseBackendImpl.cpp) = 1907c296d8c0bbd946a84bea97b0d249aa412225
-SHA1 (patch-third__party_WebKit_Source_WebCore_websockets_WebSocketHandshake.cpp) = aab08ab01b710ce22572810cd088d3684f3f8811
-SHA1 (patch-third__party_WebKit_Source_WebKit_chromium_WebKit.gyp) = e92d3d432873979f9773eef5492464813d695954
-SHA1 (patch-third__party_WebKit_Source_WebKit_chromium_src_PlatformBridge.cpp) = 08e83d7c8959705c89f29642acea31608ab6418a
-SHA1 (patch-third__party_WebKit_Source_WebKit_chromium_src_WebFrameImpl.cpp) = e58ac04c2e8a2c61e089c6a2301c3f8e110da3fe
-SHA1 (patch-third__party_WebKit_Source_WebKit_chromium_src_WebViewImpl.cpp) = 4e005f80309099b1ff66dd1edb8e969a6a1b5e64
-SHA1 (patch-third__party_angle_src_compiler_osinclude.h) = 7aebcdeb5b54fe72c3c5af93923248f8437edb65
-SHA1 (patch-third__party_cld_base_build__config.h) = e8d81666b0cc232ff370b1629790b0edf59e8df0
-SHA1 (patch-third__party_expat_expat.gyp) = c8d1191710e296356fb7345bf932af0d701fe063
-SHA1 (patch-third__party_ffmpeg_ffmpeg.gyp) = fbe9191dffb22b76edeb9e852294027923fd8a02
-SHA1 (patch-third__party_ffmpeg_patched-ffmpeg-mt_configure) = ac8bcad8453d6b6c88775c9505d6f05735a8a941
-SHA1 (patch-third__party_icu_icu.gyp) = c52019ce2953ec7a9c70f56e4c47fe7bcb6f2d47
-SHA1 (patch-third__party_icu_source_configure) = 99f287174623ceeb84ca3fc2b7ea7ebcbcdd140d
-SHA1 (patch-third__party_libjingle_libjingle.gyp) = ec31924a8d2ee7513124c66fef68f3cb91e5ebde
-SHA1 (patch-third__party_libjingle_source_talk_base_nethelpers.cc) = e2111fc6c331f16cbdccff35616d8b0c07445999
-SHA1 (patch-third__party_libjingle_source_talk_base_network.cc) = 8e74b5e5d38e0257de53dedfa76145e67d67a5f6
-SHA1 (patch-third__party_libjingle_source_talk_base_socketaddress.cc) = 8ea7875057bd4e8ab226a58b7f1435dd3f00b397
-SHA1 (patch-third__party_libsrtp_src_crypto_include_integers.h) = 062442a85e37caf4f63da21686b37c1ef12d80c6
-SHA1 (patch-third__party_libxml_libxml.gyp) = 71c096853d12a4c88070534a3ab267dc1168f855
-SHA1 (patch-third__party_libxslt_libxslt.gyp) = f683cedd9c492bbe33c8900dd4f83cfe903ccd37
-SHA1 (patch-third__party_mesa_MesaLib_src_mesa_main_imports.h) = 8a0ee7f5a4f6ede75c26e5fb9f06b0158ea31c77
-SHA1 (patch-third__party_mesa_mesa.gyp) = dace02e3ac56810c2abfdd64ba5c06ca1bc8ac8c
-SHA1 (patch-third__party_npapi_npapi.gyp) = b35f78160647a35c22eb7c078b38b64738e348b6
-SHA1 (patch-third__party_qcms_qcms.gyp) = ef9a69a8ce408507632a6e2d6a6131bcb0b33ebd
-SHA1 (patch-third__party_skia_include_core_SkPreConfig.h) = f2266fa487610d9fee5a43a0988551aa9b75a289
-SHA1 (patch-third__party_sqlite_sqlite.gyp) = 1ba923af65191300d4331b4b17e9382fc4b46c5d
-SHA1 (patch-third__party_yasm_source_patched-yasm_Makefile.in) = 60202571b5bdee6586e473a8f14ac95b0c7db4db
-SHA1 (patch-third__party_yasm_yasm.gyp) = 820b50a3bde3aa21dcb198cf9c40539fcda29ba7
-SHA1 (patch-tools_gyp_pylib_gyp_____init____.py) = 11c8aec84908a464ccdff4fb517ac298370cf767
-SHA1 (patch-tools_gyp_test_additional-targets_src_dir1_actions.gyp) = 8db632cb51d105897767e51ea85ab13930a4c69c
-SHA1 (patch-tools_gyp_test_library_src_library.gyp) = 2033cc3961234be68105b1675eb0a8613ce996db
-SHA1 (patch-ui_base_l10n_l10n__util.cc) = c82af0901bca4c97f0f3b3765347d78c851e3383
-SHA1 (patch-ui_base_resource_resource__bundle.cc) = 5f9c594abfaf910319304a63e8afd018cc1f9357
-SHA1 (patch-ui_base_ui__base.gypi) = 9f601bada8d6c5acc10bed0dd42fd9bcbeb8313a
-SHA1 (patch-ui_gfx_gfx.gyp) = 8f97e564d61fc9d2787b292d11d18ec00a2d4484
-SHA1 (patch-ui_gfx_gfx__resources.grd) = 7a4f31ac37b73520093415d910bcefac9a5cfbf1
-SHA1 (patch-ui_gfx_image.cc) = 529e9990665f1fcf4fc387c618912f547fe25b5f
-SHA1 (patch-ui_gfx_image.h) = e4408de985eea6520e2a4a8b7b9c9eb407002afe
-SHA1 (patch-ui_gfx_native__widget__types.h) = 13575526f548ac6eb4b0c8fa92cca0177e0b0ff8
-SHA1 (patch-ui_ui.gyp) = 43e065c03cb3c3aecab69a0bfb75ed26ec152694
-SHA1 (patch-ui_views_events_accelerator.cc) = 10b64135bc932aaaa733c546e816e09c88fc6110
-SHA1 (patch-ui_views_focus_accelerator__handler.h) = 1bb863f1563c7ca9758eec50386fb1f0d9cc621a
-SHA1 (patch-ui_views_focus_focus__manager.cc) = 20f06f1d866021f93d4d277fce6f8875b6ac2035
-SHA1 (patch-ui_views_views.gyp) = edfe9771ffe91b297fbaca9c9187381132be721e
-SHA1 (patch-v8_src_d8.gyp) = 6bf551552252090c490b5870cf0241c7dd2b6770
-SHA1 (patch-v8_src_globals.h) = 7cc717c926ba85a9742b9a9b13ef9be74b870b8a
-SHA1 (patch-v8_src_heap.cc) = f7996ac68760c12dd5445e31b3dcee93fef75757
-SHA1 (patch-v8_src_platform-dragonfly.cc) = 4165c160a6a4b45f5a59df335a4a276e85af9dd0
-SHA1 (patch-v8_src_platform-netbsd.cc) = 1734f772f328b38a21811bc3718de5be61e3a310
-SHA1 (patch-v8_src_platform-openbsd.cc) = 2e7efd7b9286b0fd97d696a22400814d5cbcbf4f
-SHA1 (patch-v8_src_x64_code-stubs-x64.cc) = decaeef6981267b26f057d9ec6e59b3fca2fb4c5
-SHA1 (patch-v8_src_x64_codegen-x64.cc) = 958d1b3062d0f0312ab4bc37684e7c4592ec7cb8
-SHA1 (patch-v8_src_x64_full-codegen-x64.cc) = 7b72e948a0ffc766bb2f6614189a4e9e8030a31b
-SHA1 (patch-v8_src_x64_lithium-codegen-x64.cc) = d2388271f6ef5f57c75db6662c0b68d453196305
-SHA1 (patch-v8_src_x64_macro-assembler-x64.cc) = d0589efc04d0db15ce1a27c3d7038a90b4ac2076
-SHA1 (patch-v8_src_x64_macro-assembler-x64.h) = d3f017b80654a30370c84aaf27cba0fbda929d89
-SHA1 (patch-v8_tools_gyp_v8.gyp) = fdffbd821e658f21edfee649a53f34ad140d92cc
-SHA1 (patch-views_views.gyp) = fc9e9219719f06d04ecb45e2557f7f4f5acd29a3
-SHA1 (patch-webkit_glue_webkit__glue.gypi) = 4f9bfc7f7254cba33f1d2c28afc13281e041feaa
-SHA1 (patch-webkit_glue_webkit__glue.h) = 82d0a34ba4efb25aede9fda921588bef515874c0
-SHA1 (patch-webkit_glue_webkitclient__impl.cc) = bdedf523f508fab811099b3c700bbb8e3eb7ea95
-SHA1 (patch-webkit_glue_webkitclient__impl.h) = 6512fd1702a58b309118f766e51bb0cdc6d18806
-SHA1 (patch-webkit_plugins_npapi_plugin__lib__posix.cc) = e6de6e0116b4c1ec452b27c355d2d738d8955819
-SHA1 (patch-webkit_plugins_ppapi_ppapi__plugin__instance.cc) = 7e74eadba4e2b0b322420f66dce0e4db6918187a
-SHA1 (patch-webkit_plugins_ppapi_ppapi__plugin__instance.h) = ac9324cb42034f99bb73270c8d9f21894d5249d3
-SHA1 (patch-webkit_plugins_ppapi_ppb__file__system__impl.cc) = 76834a7f24bc71893a5413d814be9f7ba7ea2139
-SHA1 (patch-webkit_plugins_ppapi_ppb__flash__impl.h) = fa1c4490f5a6b6937237fa6ac7540800573f1b2a
-SHA1 (patch-webkit_plugins_ppapi_ppb__pdf__impl.cc) = 69d167136779f1792e6bb52a1b9e506e0fd1e003
-SHA1 (patch-webkit_support_webkit__support__glue.cc) = 418ffe34314c7755d83d212df82f6d9f9dac5296
-SHA1 (patch-webkit_tools_pepper__test__plugin_event__handler.cc) = 82318b1a0ed0389cbd171f7fa90efa66f4ba32b4
-SHA1 (patch-webkit_tools_pepper__test__plugin_pepper__test__plugin.gyp) = 07e7f3baebb717832024449c283425746f2228f9
-SHA1 (patch-webkit_tools_test__shell_test__shell.cc) = 9fbdbf32249e4fc00bafc03ae0f822971c856932
-SHA1 (patch-webkit_tools_test__shell_test__shell.gypi) = 7ff0b7a57062332ff411be9faab71c73adf63b5f
diff --git a/chromium/options.mk b/chromium/options.mk
deleted file mode 100644
index 7d2bacf51f..0000000000
--- a/chromium/options.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD: options.mk,v 1.3 2011/05/27 13:23:09 rxg Exp $
-
-PKG_OPTIONS_VAR= PKG_OPTIONS.chromium
-.if ${MACHINE_ARCH} != "arm"
-PKG_SUPPORTED_OPTIONS= cups
-.endif
-PKG_SUPPORTED_OPTIONS+= codecs debug gnome-keyring
-PKG_SUGGESTED_OPTIONS= # empty
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mcups)
-GYP_DEFINES+= use_cups=1
-. include "../../print/cups/buildlink3.mk"
-.else
-GYP_DEFINES+= use_cups=0
-.endif
-
-.if !empty(PKG_OPTIONS:Mcodecs)
-FFMPEG_CODECS= Chrome
-FFMPEG_ARGS+= --enable-decoder='theora,vorbis,libvpx,pcm_u8,pcm_s16le,pcm_f32le,aac,h264,mp3'
-FFMPEG_ARGS+= --enable-demuxer='ogg,matroska,wav,mp3,mov'
-FFMPEG_ARGS+= --enable-parser=mpegaudio
-.else
-FFMPEG_CODECS= Chromium
-FFMPEG_ARGS+= --enable-decoder='theora,vorbis,libvpx,pcm_u8,pcm_s16le,pcm_f32le'
-FFMPEG_ARGS+= --enable-demuxer='ogg,matroska,wav'
-.endif
-
-.if !empty(PKG_OPTIONS:Mdebug)
-BUILDTYPE= Debug
-.else
-BUILDTYPE= Release
-.endif
-
-.if !empty(PKG_OPTIONS:Mgnome-keyring)
-GYP_DEFINES+= linux_link_gnome_keyring=1
-GYP_DEFINES+= use_gnome_keyring=1
-. include "../../security/libgnome-keyring/buildlink3.mk"
-.else
-GYP_DEFINES+= use_gnome_keyring=0
-.endif
diff --git a/chromium/patches/patch-app_app.gyp b/chromium/patches/patch-app_app.gyp
deleted file mode 100644
index ad911c029f..0000000000
--- a/chromium/patches/patch-app_app.gyp
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-app_app.gyp,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- app/app.gyp.orig 2011-05-24 08:01:04.000000000 +0000
-+++ app/app.gyp
-@@ -65,7 +65,7 @@
- '..',
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'sources': [
- '../ui/base/dragdrop/gtk_dnd_util_unittest.cc',
- ],
-@@ -81,7 +81,7 @@
- '../ui/base/view_prop_unittest.cc',
- ],
- }],
-- ['OS =="linux" or OS =="freebsd"', {
-+ ['OS =="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'conditions': [
- ['linux_use_tcmalloc==1', {
- 'dependencies': [
-@@ -165,7 +165,7 @@
- },
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'targets': [{
- 'target_name': 'app_unittest_strings',
- 'type': 'none',
diff --git a/chromium/patches/patch-app_app__base.gypi b/chromium/patches/patch-app_app__base.gypi
deleted file mode 100644
index 2d393cd248..0000000000
--- a/chromium/patches/patch-app_app__base.gypi
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-app_app__base.gypi,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- app/app_base.gypi.orig 2011-04-13 08:01:07.000000000 +0000
-+++ app/app_base.gypi
-@@ -33,7 +33,7 @@
- 'app_switches.cc',
- ],
- 'conditions': [
-- ['OS!="linux" and OS!="freebsd" and OS!="openbsd"', {
-+ ['OS!="linux" and OS!="dragonfly" and OS!="freebsd" and OS!="netbsd" and OS!="openbsd"', {
- 'sources!': [
- '../ui/base/dragdrop/gtk_dnd_util.cc',
- '../ui/base/dragdrop/gtk_dnd_util.h',
-@@ -283,7 +283,7 @@
- },
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- # font_gtk.cc uses fontconfig.
- # TODO(evanm): I think this is wrong; it should just use GTK.
-@@ -335,7 +335,22 @@
- ['exclude', '^win/*'],
- ],
- }],
-- ['OS=="linux"', {
-+ ['OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
-+ 'sources!': [
-+ 'surface/transport_dib_linux.cc',
-+ ],
-+ }],
-+ ['OS=="freebsd" or OS=="dragonfly"', {
-+ 'sources': [
-+ 'surface/transport_dib_freebsd.cc',
-+ ],
-+ }],
-+ ['OS=="openbsd" or OS=="netbsd"', {
-+ 'sources': [
-+ 'surface/transport_dib_openbsd.cc',
-+ ],
-+ }],
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'sources': [
- 'gfx/gl/gl_context_egl.cc',
- 'gfx/gl/gl_context_egl.h',
-@@ -363,11 +378,17 @@
- 'link_settings': {
- 'libraries': [
- '-lX11',
-- '-ldl',
- ],
- },
- },
- }],
-+ ['OS=="linux"', {
-+ 'link_settings': {
-+ 'libraries': [
-+ '-ldl',
-+ ],
-+ },
-+ }],
- ['OS=="mac"', {
- 'link_settings': {
- 'libraries': [
diff --git a/chromium/patches/patch-app_gfx_gl_gl__bindings.h b/chromium/patches/patch-app_gfx_gl_gl__bindings.h
deleted file mode 100644
index b7e4bd04d2..0000000000
--- a/chromium/patches/patch-app_gfx_gl_gl__bindings.h
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-app_gfx_gl_gl__bindings.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- app/gfx/gl/gl_bindings.h.orig 2011-04-13 08:01:07.000000000 +0000
-+++ app/gfx/gl/gl_bindings.h
-@@ -22,7 +22,7 @@
- // The standard OpenGL native extension headers are also included.
- #if defined(OS_WIN)
- #include <GL/wglext.h>
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #include <GL/glx.h>
- #include <GL/glxext.h>
-
-@@ -52,7 +52,7 @@
- typedef struct osmesa_context *OSMesaContext;
- typedef void (*OSMESAproc)();
-
--#if defined(OS_WIN) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
-
- // Forward declare EGL types.
- typedef unsigned int EGLBoolean;
-@@ -75,7 +75,7 @@ typedef Pixmap EGLNativePixmapType;
- typedef Window EGLNativeWindowType;
- #endif
-
--#endif // OS_WIN || OS_LINUX
-+#endif // OS_WIN || OS_LINUX || OS_BSD
-
- #include "gl_bindings_autogen_gl.h"
- #include "gl_bindings_autogen_osmesa.h"
-@@ -83,7 +83,7 @@ typedef Window EGLNativeWindowType;
- #if defined(OS_WIN)
- #include "gl_bindings_autogen_egl.h"
- #include "gl_bindings_autogen_wgl.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #include "gl_bindings_autogen_egl.h"
- #include "gl_bindings_autogen_glx.h"
- #endif
diff --git a/chromium/patches/patch-app_gfx_gl_gl__context__egl.cc b/chromium/patches/patch-app_gfx_gl_gl__context__egl.cc
deleted file mode 100644
index b2882dbbb9..0000000000
--- a/chromium/patches/patch-app_gfx_gl_gl__context__egl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-app_gfx_gl_gl__context__egl.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- app/gfx/gl/gl_context_egl.cc.orig 2011-05-24 08:01:03.000000000 +0000
-+++ app/gfx/gl/gl_context_egl.cc
-@@ -13,7 +13,7 @@
- // it brings in #defines that cause conflicts.
- #include "app/gfx/gl/gl_bindings.h"
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- extern "C" {
- #include <X11/Xlib.h>
- }
diff --git a/chromium/patches/patch-app_gfx_gl_gl__implementation__linux.cc b/chromium/patches/patch-app_gfx_gl_gl__implementation__linux.cc
deleted file mode 100644
index 34801d3376..0000000000
--- a/chromium/patches/patch-app_gfx_gl_gl__implementation__linux.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-app_gfx_gl_gl__implementation__linux.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- app/gfx/gl/gl_implementation_linux.cc.orig 2011-04-13 08:01:07.000000000 +0000
-+++ app/gfx/gl/gl_implementation_linux.cc
-@@ -71,7 +71,7 @@ bool InitializeGLBindings(GLImplementati
- }
- case kGLImplementationDesktopGL: {
- base::NativeLibrary library = base::LoadNativeLibrary(
-- FilePath("libGL.so.1"));
-+ FilePath("libGL.so"));
- if (!library) {
- VLOG(1) << "libGL.so.1 not found.";
- return false;
diff --git a/chromium/patches/patch-app_resources_app__resources.grd b/chromium/patches/patch-app_resources_app__resources.grd
deleted file mode 100644
index bdd8269ad9..0000000000
--- a/chromium/patches/patch-app_resources_app__resources.grd
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-app_resources_app__resources.grd,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- app/resources/app_resources.grd.orig 2011-05-24 08:01:04.000000000 +0000
-+++ app/resources/app_resources.grd
-@@ -18,7 +18,7 @@
- <include name="IDR_CLOSE_H" file="close_h.png" type="BINDATA" />
- <include name="IDR_CLOSE_P" file="close_p.png" type="BINDATA" />
- </if>
-- <if expr="not pp_ifdef('toolkit_views') and (os == 'linux2' or os.find('bsd') != -1)">
-+ <if expr="not pp_ifdef('toolkit_views') and (os == 'linux2' or os.find('bsd') != -1 or os == 'dragonfly2')">
- <include name="IDR_CLOSE" file="linux_close.png" type="BINDATA" />
- <include name="IDR_CLOSE_H" file="linux_close_h.png" type="BINDATA" />
- <include name="IDR_CLOSE_P" file="linux_close_p.png" type="BINDATA" />
-@@ -42,7 +42,7 @@
- <include name="IDR_MAXIMIZE_H" file="maximize_h.png" type="BINDATA" />
- <include name="IDR_MAXIMIZE_P" file="maximize_p.png" type="BINDATA" />
- </if>
-- <if expr="not pp_ifdef('toolkit_views') and (os == 'linux2' or os.find('bsd') != -1)">
-+ <if expr="not pp_ifdef('toolkit_views') and (os == 'linux2' or os.find('bsd') != -1 or os == 'dragonfly2')">
- <include name="IDR_MAXIMIZE" file="linux_maximize.png" type="BINDATA" />
- <include name="IDR_MAXIMIZE_H" file="linux_maximize_h.png" type="BINDATA" />
- <include name="IDR_MAXIMIZE_P" file="linux_maximize_p.png" type="BINDATA" />
-@@ -54,7 +54,7 @@
- <include name="IDR_MINIMIZE_H" file="minimize_h.png" type="BINDATA" />
- <include name="IDR_MINIMIZE_P" file="minimize_p.png" type="BINDATA" />
- </if>
-- <if expr="not pp_ifdef('toolkit_views') and (os == 'linux2' or os.find('bsd') != -1)">
-+ <if expr="not pp_ifdef('toolkit_views') and (os == 'linux2' or os.find('bsd') != -1 or os == 'dragonfly2')">
- <include name="IDR_MINIMIZE" file="linux_minimize.png" type="BINDATA" />
- <include name="IDR_MINIMIZE_H" file="linux_minimize_h.png" type="BINDATA" />
- <include name="IDR_MINIMIZE_P" file="linux_minimize_p.png" type="BINDATA" />
-@@ -64,7 +64,7 @@
- <include name="IDR_RESTORE_H" file="restore_h.png" type="BINDATA" />
- <include name="IDR_RESTORE_P" file="restore_p.png" type="BINDATA" />
- </if>
-- <if expr="not pp_ifdef('toolkit_views') and (os == 'linux2' or os.find('bsd') != -1)">
-+ <if expr="not pp_ifdef('toolkit_views') and (os == 'linux2' or os.find('bsd') != -1 or os == 'dragonfly2')">
- <include name="IDR_RESTORE" file="linux_restore.png" type="BINDATA" />
- <include name="IDR_RESTORE_H" file="linux_restore_h.png" type="BINDATA" />
- <include name="IDR_RESTORE_P" file="linux_restore_p.png" type="BINDATA" />
diff --git a/chromium/patches/patch-app_surface_transport__dib.h b/chromium/patches/patch-app_surface_transport__dib.h
deleted file mode 100644
index 6153c563b1..0000000000
--- a/chromium/patches/patch-app_surface_transport__dib.h
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-app_surface_transport__dib.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- app/surface/transport_dib.h.orig 2011-04-13 08:01:07.000000000 +0000
-+++ app/surface/transport_dib.h
-@@ -8,7 +8,7 @@
-
- #include "base/basictypes.h"
-
--#if defined(OS_WIN) || defined(OS_MACOSX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD)
- #include "base/shared_memory.h"
- #endif
-
-@@ -78,7 +78,7 @@ class TransportDIB {
- static int fake_handle = 10;
- return reinterpret_cast<Handle>(fake_handle++);
- }
--#elif defined(OS_MACOSX)
-+#elif defined(OS_MACOSX) || defined(OS_BSD)
- typedef base::SharedMemoryHandle Handle;
- // On Mac, the inode number of the backing file is used as an id.
- typedef base::SharedMemoryId Id;
-@@ -171,11 +171,12 @@ class TransportDIB {
-
- private:
- TransportDIB();
--#if defined(OS_WIN) || defined(OS_MACOSX)
-+#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_BSD)
- explicit TransportDIB(base::SharedMemoryHandle dib);
- base::SharedMemory shared_memory_;
- uint32 sequence_num_;
--#elif defined(USE_X11)
-+#endif
-+#if defined(USE_X11)
- int key_; // SysV shared memory id
- void* address_; // mapped address
- XSharedMemoryId x_shm_; // X id for the shared segment
diff --git a/chromium/patches/patch-app_surface_transport__dib__freebsd.cc b/chromium/patches/patch-app_surface_transport__dib__freebsd.cc
deleted file mode 100644
index c5373ec567..0000000000
--- a/chromium/patches/patch-app_surface_transport__dib__freebsd.cc
+++ /dev/null
@@ -1,101 +0,0 @@
-$NetBSD: patch-app_surface_transport__dib__freebsd.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- app/surface/transport_dib_freebsd.cc.orig 2011-05-26 07:36:59.000000000 +0000
-+++ app/surface/transport_dib_freebsd.cc
-@@ -0,0 +1,96 @@
-+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "app/surface/transport_dib.h"
-+
-+#include <unistd.h>
-+#include <sys/stat.h>
-+
-+#include "base/eintr_wrapper.h"
-+#include "base/shared_memory.h"
-+#include "base/scoped_ptr.h"
-+#include "skia/ext/platform_canvas.h"
-+
-+TransportDIB::TransportDIB()
-+ : size_(0) {
-+}
-+
-+TransportDIB::TransportDIB(TransportDIB::Handle dib)
-+ : shared_memory_(dib, false /* read write */),
-+ size_(0) {
-+}
-+
-+TransportDIB::~TransportDIB() {
-+}
-+
-+// static
-+TransportDIB* TransportDIB::Create(size_t size, uint32 sequence_num) {
-+ TransportDIB* dib = new TransportDIB;
-+ if (!dib->shared_memory_.CreateAndMapAnonymous(size)) {
-+ delete dib;
-+ return NULL;
-+ }
-+
-+ dib->size_ = size;
-+ return dib;
-+}
-+
-+// static
-+TransportDIB* TransportDIB::Map(Handle handle) {
-+ scoped_ptr<TransportDIB> dib(CreateWithHandle(handle));
-+ if (!dib->Map())
-+ return NULL;
-+ return dib.release();
-+}
-+
-+// static
-+TransportDIB* TransportDIB::CreateWithHandle(Handle handle) {
-+ return new TransportDIB(handle);
-+}
-+
-+bool TransportDIB::Map() {
-+ if (!is_valid(handle()))
-+ return false;
-+ if (memory())
-+ return true;
-+
-+ struct stat st;
-+ if ((fstat(shared_memory_.handle().fd, &st) != 0) ||
-+ (!shared_memory_.Map(st.st_size))) {
-+ return false;
-+ }
-+
-+ size_ = st.st_size;
-+ return true;
-+}
-+
-+bool TransportDIB::is_valid(Handle dib) {
-+ return dib.fd >= 0;
-+}
-+
-+skia::PlatformCanvas* TransportDIB::GetPlatformCanvas(int w, int h) {
-+ return new skia::PlatformCanvas(w, h, true,
-+ reinterpret_cast<uint8_t*>(memory()));
-+}
-+
-+void* TransportDIB::memory() const {
-+ return shared_memory_.memory();
-+}
-+
-+TransportDIB::Id TransportDIB::id() const {
-+ return shared_memory_.id();
-+}
-+
-+TransportDIB::Handle TransportDIB::handle() const {
-+ return shared_memory_.handle();
-+}
-+
-+XID TransportDIB::MapToX(Display* display) {
-+ if (!x_shm_) {
-+ x_shm_ = ui::AttachSharedMemory(display, key_);
-+ display_ = display;
-+ }
-+
-+ return x_shm_;
-+}
diff --git a/chromium/patches/patch-app_surface_transport__dib__openbsd.cc b/chromium/patches/patch-app_surface_transport__dib__openbsd.cc
deleted file mode 100644
index d2927ef6d4..0000000000
--- a/chromium/patches/patch-app_surface_transport__dib__openbsd.cc
+++ /dev/null
@@ -1,107 +0,0 @@
-$NetBSD: patch-app_surface_transport__dib__openbsd.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- app/surface/transport_dib_openbsd.cc.orig 2011-05-26 07:36:59.000000000 +0000
-+++ app/surface/transport_dib_openbsd.cc
-@@ -0,0 +1,102 @@
-+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "app/surface/transport_dib.h"
-+
-+#include <unistd.h>
-+#include <sys/stat.h>
-+
-+#include "base/eintr_wrapper.h"
-+#include "base/logging.h"
-+#include "base/scoped_ptr.h"
-+#include "base/shared_memory.h"
-+#include "skia/ext/platform_canvas.h"
-+
-+TransportDIB::TransportDIB()
-+ : size_(0) {
-+}
-+
-+TransportDIB::TransportDIB(TransportDIB::Handle dib)
-+ : shared_memory_(dib, false /* read write */),
-+ size_(0) {
-+}
-+
-+TransportDIB::~TransportDIB() {
-+}
-+
-+// static
-+TransportDIB* TransportDIB::Create(size_t size, uint32 sequence_num) {
-+ TransportDIB* dib = new TransportDIB;
-+ if (!dib->shared_memory_.CreateAndMapAnonymous(size)) {
-+ delete dib;
-+ return NULL;
-+ }
-+
-+ dib->size_ = size;
-+ return dib;
-+}
-+
-+// static
-+TransportDIB* TransportDIB::Map(Handle handle) {
-+ scoped_ptr<TransportDIB> dib(CreateWithHandle(handle));
-+ if (!dib->Map())
-+ return NULL;
-+ return dib.release();
-+}
-+
-+// static
-+TransportDIB* TransportDIB::CreateWithHandle(Handle handle) {
-+ return new TransportDIB(handle);
-+}
-+
-+// static
-+bool TransportDIB::is_valid(Handle dib) {
-+ return dib.fd >= 0;
-+}
-+
-+skia::PlatformCanvas* TransportDIB::GetPlatformCanvas(int w, int h) {
-+ if (!memory() && !Map())
-+ return NULL;
-+ scoped_ptr<skia::PlatformCanvas> canvas(new skia::PlatformCanvas);
-+ if (!canvas->initialize(w, h, true, reinterpret_cast<uint8_t*>(memory())))
-+ return NULL;
-+ return canvas.release();
-+}
-+
-+bool TransportDIB::Map() {
-+ if (!is_valid(handle()))
-+ return false;
-+ if (memory())
-+ return true;
-+
-+ struct stat st;
-+ if ((fstat(shared_memory_.handle().fd, &st) != 0) ||
-+ (!shared_memory_.Map(st.st_size))) {
-+ return false;
-+ }
-+
-+ size_ = st.st_size;
-+ return true;
-+}
-+
-+void* TransportDIB::memory() const {
-+ return shared_memory_.memory();
-+}
-+
-+TransportDIB::Id TransportDIB::id() const {
-+ return shared_memory_.id();
-+}
-+
-+TransportDIB::Handle TransportDIB::handle() const {
-+ return shared_memory_.handle();
-+}
-+
-+XID TransportDIB::MapToX(Display* display) {
-+ if (!x_shm_) {
-+ x_shm_ = ui::AttachSharedMemory(display, key_);
-+ display_ = display;
-+ }
-+
-+ return x_shm_;
-+}
diff --git a/chromium/patches/patch-base_allocator_allocator.gyp b/chromium/patches/patch-base_allocator_allocator.gyp
deleted file mode 100644
index e2ebd1bf10..0000000000
--- a/chromium/patches/patch-base_allocator_allocator.gyp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-base_allocator_allocator.gyp,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/allocator/allocator.gyp.orig 2011-04-13 08:01:33.000000000 +0000
-+++ base/allocator/allocator.gyp
-@@ -309,7 +309,7 @@
- '<(tcmalloc_dir)/src/debugallocation.cc',
- ],
- }],
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'sources!': [
- '<(tcmalloc_dir)/src/system-alloc.h',
- '<(tcmalloc_dir)/src/windows/port.cc',
diff --git a/chromium/patches/patch-base_atomicops.h b/chromium/patches/patch-base_atomicops.h
deleted file mode 100644
index 059e2bbacc..0000000000
--- a/chromium/patches/patch-base_atomicops.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-base_atomicops.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/atomicops.h.orig 2011-04-13 08:01:34.000000000 +0000
-+++ base/atomicops.h
-@@ -54,7 +54,11 @@ typedef intptr_t Atomic64;
-
- // Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or
- // Atomic64 routines below, depending on your architecture.
-+#if defined(OS_OPENBSD) && defined(__i386__)
-+typedef Atomic32 AtomicWord;
-+#else
- typedef intptr_t AtomicWord;
-+#endif
-
- // Atomically execute:
- // result = *ptr;
diff --git a/chromium/patches/patch-base_base.gyp b/chromium/patches/patch-base_base.gyp
deleted file mode 100644
index 66e8260d7a..0000000000
--- a/chromium/patches/patch-base_base.gyp
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-base_base.gyp,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- base/base.gyp.orig 2011-05-24 08:01:33.000000000 +0000
-+++ base/base.gyp
-@@ -20,7 +20,7 @@
- '../third_party/icu/icu.gyp:icuuc',
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- # i18n/rtl.cc uses gtk
- '../build/linux/system.gyp:gtk',
-@@ -69,7 +69,7 @@
- 'bits_unittest.cc',
- 'callback_unittest.cc',
- 'command_line_unittest.cc',
-- 'cpu_unittest.cc',
-+ #'cpu_unittest.cc',
- 'crypto/encryptor_unittest.cc',
- 'crypto/rsa_private_key_unittest.cc',
- 'crypto/rsa_private_key_nss_unittest.cc',
-@@ -188,7 +188,7 @@
- '../testing/gtest.gyp:gtest',
- ],
- 'conditions': [
-- ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
-+ ['OS == "linux" or OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or OS == "openbsd" or OS == "solaris"', {
- 'sources!': [
- 'file_version_info_unittest.cc',
- ],
-@@ -253,7 +253,7 @@
- '../testing/gtest.gyp:gtest',
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- # test_suite initializes GTK.
- '../build/linux/system.gyp:gtk',
-@@ -298,7 +298,7 @@
- ],
- },
- 'conditions': [
-- ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
-+ ['OS == "linux" or OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or OS == "openbsd" or OS == "solaris"', {
- 'dependencies': [
- # Needed to handle the #include chain:
- # base/test/perf_test_suite.h
diff --git a/chromium/patches/patch-base_base.gypi b/chromium/patches/patch-base_base.gypi
deleted file mode 100644
index 3c900045de..0000000000
--- a/chromium/patches/patch-base_base.gypi
+++ /dev/null
@@ -1,106 +0,0 @@
-$NetBSD: patch-base_base.gypi,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- base/base.gypi.orig 2011-05-24 08:01:33.000000000 +0000
-+++ base/base.gypi
-@@ -167,8 +167,11 @@
- 'process_posix.cc',
- 'process_util.cc',
- 'process_util.h',
-+ 'process_util_dragonfly.cc',
- 'process_util_linux.cc',
- 'process_util_mac.mm',
-+ 'process_util_netbsd.cc',
-+ 'process_util_openbsd.cc',
- 'process_util_posix.cc',
- 'process_util_win.cc',
- 'process_win.cc',
-@@ -236,9 +239,11 @@
- 'synchronization/waitable_event_win.cc',
- 'sys_info.h',
- 'sys_info_chromeos.cc',
-+ 'sys_info_dragonfly.cc',
- 'sys_info_freebsd.cc',
- 'sys_info_linux.cc',
- 'sys_info_mac.cc',
-+ 'sys_info_netbsd.cc',
- 'sys_info_openbsd.cc',
- 'sys_info_posix.cc',
- 'sys_info_win.cc',
-@@ -345,7 +350,7 @@
- '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework/Frameworks',
- ],
- 'conditions': [
-- [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"', {
-+ [ 'OS != "linux" and OS != "dragonfly" and OS != "freebsd" and OS != "netbsd" and OS != "openbsd" and OS != "solaris"', {
- 'sources/': [
- ['exclude', '^nix/'],
- ],
-@@ -354,8 +359,6 @@
- 'message_pump_glib.cc',
- 'message_pump_glib_x.cc',
- ],
-- }],
-- [ 'OS != "linux"', {
- 'sources!': [
- # Not automatically excluded by the *linux.cc rules.
- 'gtk_util.cc',
-@@ -371,10 +374,25 @@
- }],
- # For now, just test the *BSD platforms enough to exclude them.
- # Subsequent changes will include them further.
-+ [ 'OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or OS == "openbsd"', {
-+ 'sources!': [
-+ 'file_util_linux.cc',
-+ 'process_linux.cc',
-+ 'process_util_linux.cc',
-+ ],
-+ }],
-+ [ 'OS != "dragonfly"', {
-+ 'sources/': [ ['exclude', '_dragonfly\\.cc$'] ],
-+ },
-+ ],
- [ 'OS != "freebsd"', {
- 'sources/': [ ['exclude', '_freebsd\\.cc$'] ],
- },
- ],
-+ [ 'OS != "netbsd"', {
-+ 'sources/': [ ['exclude', '_netbsd\\.cc$'] ],
-+ },
-+ ],
- [ 'OS != "openbsd"', {
- 'sources/': [ ['exclude', '_openbsd\\.cc$'] ],
- },
-@@ -422,7 +440,7 @@
- ],
- },
- 'conditions': [
-- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
-+ [ 'OS == "linux" or OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or OS == "openbsd" or OS == "solaris"', {
- 'conditions': [
- [ 'chromeos==1', {
- 'sources/': [ ['include', '_chromeos\\.cc$'] ]
-@@ -444,9 +462,15 @@
- '../third_party/openssl/openssl.gyp:openssl',
- ],
- }, { # use_openssl==0
-+ 'sources': [
-+ 'base/crypto/scoped_nss_types.h',
-+ ],
- 'dependencies': [
- '../build/linux/system.gyp:nss',
- ],
-+ 'export_dependent_settings': [
-+ '../build/linux/system.gyp:nss',
-+ ],
- }
- ],
- ],
-@@ -691,7 +715,7 @@
- },
- ],
- }],
-- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
-+ [ 'OS == "linux" or OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or OS == "openbsd" or OS == "solaris"', {
- 'targets': [
- {
- 'target_name': 'symbolize',
diff --git a/chromium/patches/patch-base_base__paths__linux.cc b/chromium/patches/patch-base_base__paths__linux.cc
deleted file mode 100644
index d1f2554df8..0000000000
--- a/chromium/patches/patch-base_base__paths__linux.cc
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-base_base__paths__linux.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- base/base_paths_linux.cc.orig 2011-05-24 08:01:33.000000000 +0000
-+++ base/base_paths_linux.cc
-@@ -5,7 +5,7 @@
- #include "base/base_paths.h"
-
- #include <unistd.h>
--#if defined(OS_FREEBSD)
-+#if defined(OS_BSD)
- #include <sys/param.h>
- #include <sys/sysctl.h>
- #endif
-@@ -21,7 +21,7 @@
-
- namespace base {
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_NETBSD)
- const char kSelfExe[] = "/proc/self/exe";
- #elif defined(OS_SOLARIS)
- const char kSelfExe[] = getexecname();
-@@ -36,7 +36,7 @@ bool PathProviderPosix(int key, FilePath
- switch (key) {
- case base::FILE_EXE:
- case base::FILE_MODULE: { // TODO(evanm): is this correct?
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_NETBSD)
- FilePath bin_dir;
- if (!file_util::ReadSymbolicLink(FilePath(kSelfExe), &bin_dir)) {
- NOTREACHED() << "Unable to resolve " << kSelfExe << ".";
-@@ -56,6 +56,9 @@ bool PathProviderPosix(int key, FilePath
- bin_dir[strlen(bin_dir)] = 0;
- *result = FilePath(bin_dir);
- return true;
-+#elif defined(OS_OPENBSD) || defined(OS_DRAGONFLY)
-+ *result = FilePath("/usr/local/share/chromium/chrome");
-+ return true;
- #endif
- }
- case base::DIR_SOURCE_ROOT: {
diff --git a/chromium/patches/patch-base_debug_debugger__posix.cc b/chromium/patches/patch-base_debug_debugger__posix.cc
deleted file mode 100644
index 88d39ede4f..0000000000
--- a/chromium/patches/patch-base_debug_debugger__posix.cc
+++ /dev/null
@@ -1,72 +0,0 @@
-$NetBSD: patch-base_debug_debugger__posix.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- base/debug/debugger_posix.cc.orig 2011-05-24 08:01:33.000000000 +0000
-+++ base/debug/debugger_posix.cc
-@@ -6,11 +6,18 @@
- #include "build/build_config.h"
-
- #include <errno.h>
-+#if !defined(OS_NETBSD) && !defined(OS_DRAGONFLY)
- #include <execinfo.h>
-+#endif
- #include <fcntl.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <sys/stat.h>
-+#if defined(OS_OPENBSD) || defined(OS_NETBSD)
-+#include <sys/param.h>
-+#elif defined(OS_DRAGONFLY)
-+#include <sys/kinfo.h>
-+#endif
- #if !defined(OS_NACL)
- #include <sys/sysctl.h>
- #endif
-@@ -50,7 +57,7 @@ bool SpawnDebuggerOnProcess(unsigned /*
- return false;
- }
-
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
-
- // Based on Apple's recommended method as described in
- // http://developer.apple.com/qa/qa2004/qa1361.html
-@@ -71,11 +78,23 @@ bool BeingDebugged() {
- KERN_PROC,
- KERN_PROC_PID,
- getpid()
-+#if defined(OS_OPENBSD) || defined(OS_NETBSD) || defined(OS_DRAGONFLY)
-+#if defined(OS_NETBSD)
-+ , sizeof(struct kinfo_proc2),
-+#else
-+ , sizeof(struct kinfo_proc),
-+#endif
-+ 400 /* XXX */
-+#endif
- };
-
- // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and
- // binary interfaces may change.
-+#if defined(OS_NETBSD)
-+ struct kinfo_proc2 info;
-+#else
- struct kinfo_proc info;
-+#endif
- size_t info_size = sizeof(info);
-
- int sysctl_result = sysctl(mib, arraysize(mib), &info, &info_size, NULL, 0);
-@@ -88,7 +107,15 @@ bool BeingDebugged() {
-
- // This process is being debugged if the P_TRACED flag is set.
- is_set = true;
-+#if defined(OS_OPENBSD) || defined(OS_NETBSD)
-+ being_debugged = (info.p_flag & P_TRACED) != 0;
-+#elif defined(OS_FREEBSD)
-+ being_debugged = (info.ki_flag & P_TRACED) != 0;
-+#elif defined(OS_DRAGONFLY)
-+ being_debugged = (info.kp_flags & P_TRACED) != 0;
-+#else
- being_debugged = (info.kp_proc.p_flag & P_TRACED) != 0;
-+#endif
- return being_debugged;
- }
-
diff --git a/chromium/patches/patch-base_debug_stack__trace__posix.cc b/chromium/patches/patch-base_debug_stack__trace__posix.cc
deleted file mode 100644
index c9bf5627cd..0000000000
--- a/chromium/patches/patch-base_debug_stack__trace__posix.cc
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-base_debug_stack__trace__posix.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- base/debug/stack_trace_posix.cc.orig 2011-05-24 08:01:33.000000000 +0000
-+++ base/debug/stack_trace_posix.cc
-@@ -5,11 +5,16 @@
- #include "base/debug/stack_trace.h"
-
- #include <errno.h>
-+#if !defined(OS_NETBSD) && !defined(OS_DRAGONFLY)
- #include <execinfo.h>
-+#endif
- #include <fcntl.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <sys/stat.h>
-+#if defined(OS_BSD)
-+#include <sys/param.h>
-+#endif
- #include <sys/sysctl.h>
- #include <sys/types.h>
- #include <unistd.h>
-@@ -158,7 +163,12 @@ StackTrace::StackTrace() {
- #endif
- // Though the backtrace API man page does not list any possible negative
- // return values, we take no chance.
-+#if !defined(OS_NETBSD) && !defined(OS_DRAGONFLY)
- count_ = std::max(backtrace(trace_, arraysize(trace_)), 0);
-+#else
-+ count_ = 0;
-+ return;
-+#endif
- }
-
- void StackTrace::PrintBacktrace() {
diff --git a/chromium/patches/patch-base_debug_trace__event.cc b/chromium/patches/patch-base_debug_trace__event.cc
deleted file mode 100644
index 106170d2f0..0000000000
--- a/chromium/patches/patch-base_debug_trace__event.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-base_debug_trace__event.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/debug/trace_event.cc.orig 2011-04-13 08:01:34.000000000 +0000
-+++ base/debug/trace_event.cc
-@@ -74,7 +74,7 @@ void TraceLog::Trace(const std::string&
- TimeTicks tick = TimeTicks::Now();
- #endif
- TimeDelta delta = tick - trace_start_time_;
-- int64 usec = delta.InMicroseconds();
-+ int64_t usec = delta.InMicroseconds();
- std::string msg =
- StringPrintf("{'pid':'0x%lx', 'tid':'0x%lx', 'type':'%s', "
- "'name':'%s', 'id':'%p', 'extra':'%s', 'file':'%s', "
diff --git a/chromium/patches/patch-base_dir__reader__posix__unittest.cc b/chromium/patches/patch-base_dir__reader__posix__unittest.cc
deleted file mode 100644
index d8f8356dfc..0000000000
--- a/chromium/patches/patch-base_dir__reader__posix__unittest.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-base_dir__reader__posix__unittest.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- base/dir_reader_posix_unittest.cc.orig 2011-05-24 08:01:33.000000000 +0000
-+++ base/dir_reader_posix_unittest.cc
-@@ -28,7 +28,11 @@ TEST(DirReaderPosixUnittest, Read) {
- const char* dir = mkdtemp(kDirTemplate);
- CHECK(dir);
-
-+#if defined(OS_BSD)
-+ const int prev_wd = open(".", O_RDONLY);
-+#else
- const int prev_wd = open(".", O_RDONLY | O_DIRECTORY);
-+#endif
- CHECK_GE(prev_wd, 0);
-
- PCHECK(chdir(dir) == 0);
diff --git a/chromium/patches/patch-base_file__util__posix.cc b/chromium/patches/patch-base_file__util__posix.cc
deleted file mode 100644
index 411a0fcfab..0000000000
--- a/chromium/patches/patch-base_file__util__posix.cc
+++ /dev/null
@@ -1,47 +0,0 @@
-$NetBSD: patch-base_file__util__posix.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/file_util_posix.cc.orig 2011-04-13 08:01:34.000000000 +0000
-+++ base/file_util_posix.cc
-@@ -59,7 +59,7 @@ bool RealPath(const FilePath& path, File
-
- } // namespace
-
--#if defined(OS_OPENBSD) || defined(OS_FREEBSD) || \
-+#if defined(OS_BSD) || \
- (defined(OS_MACOSX) && \
- MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5)
- typedef struct stat stat_wrapper_t;
-@@ -98,8 +98,8 @@ int CountFilesCreatedAfter(const FilePat
-
- DIR* dir = opendir(path.value().c_str());
- if (dir) {
--#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) && \
-- !defined(OS_OPENBSD) && !defined(OS_SOLARIS)
-+#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_BSD) && \
-+ !defined(OS_SOLARIS)
- #error Port warning: depending on the definition of struct dirent, \
- additional space for pathname may be needed
- #endif
-@@ -709,8 +709,8 @@ bool FileEnumerator::ReadDirectory(std::
- if (!dir)
- return false;
-
--#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_FREEBSD) && \
-- !defined(OS_OPENBSD) && !defined(OS_SOLARIS)
-+#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_BSD) && \
-+ !defined(OS_SOLARIS)
- #error Port warning: depending on the definition of struct dirent, \
- additional space for pathname may be needed
- #endif
-@@ -815,7 +815,11 @@ bool GetTempDir(FilePath* path) {
- }
-
- bool GetShmemTempDir(FilePath* path) {
-+#if defined(OS_LINUX)
- *path = FilePath("/dev/shm");
-+#else
-+ *path = FilePath("/tmp");
-+#endif
- return true;
- }
-
diff --git a/chromium/patches/patch-base_i18n_number__formatting.cc b/chromium/patches/patch-base_i18n_number__formatting.cc
deleted file mode 100644
index 9cacb87592..0000000000
--- a/chromium/patches/patch-base_i18n_number__formatting.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-base_i18n_number__formatting.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/i18n/number_formatting.cc.orig 2011-04-13 08:01:34.000000000 +0000
-+++ base/i18n/number_formatting.cc
-@@ -35,7 +35,7 @@ struct NumberFormatWrapper {
-
- static LazyInstance<NumberFormatWrapper> g_number_format(LINKER_INITIALIZED);
-
--string16 FormatNumber(int64 number) {
-+string16 FormatNumber(int64_t number) {
- icu::NumberFormat* number_format = g_number_format.Get().number_format.get();
-
- if (!number_format) {
diff --git a/chromium/patches/patch-base_i18n_number__formatting.h b/chromium/patches/patch-base_i18n_number__formatting.h
deleted file mode 100644
index a8ff3cc5bb..0000000000
--- a/chromium/patches/patch-base_i18n_number__formatting.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-base_i18n_number__formatting.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/i18n/number_formatting.h.orig 2011-04-13 08:01:34.000000000 +0000
-+++ base/i18n/number_formatting.h
-@@ -11,7 +11,7 @@
-
- namespace base {
-
--string16 FormatNumber(int64 number);
-+string16 FormatNumber(int64_t number);
-
- } // namespace base
-
diff --git a/chromium/patches/patch-base_linux__util.cc b/chromium/patches/patch-base_linux__util.cc
deleted file mode 100644
index 9a9f7c798f..0000000000
--- a/chromium/patches/patch-base_linux__util.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-base_linux__util.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/linux_util.cc.orig 2011-04-13 08:01:34.000000000 +0000
-+++ base/linux_util.cc
-@@ -171,6 +171,7 @@ std::string GetLinuxDistro() {
- }
- #else
- NOTIMPLEMENTED();
-+ return "Unknown";
- #endif
- }
-
diff --git a/chromium/patches/patch-base_logging.cc b/chromium/patches/patch-base_logging.cc
deleted file mode 100644
index fc53b7bced..0000000000
--- a/chromium/patches/patch-base_logging.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-base_logging.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/logging.cc.orig 2011-04-13 08:01:34.000000000 +0000
-+++ base/logging.cc
-@@ -133,7 +133,7 @@ int32 CurrentThreadId() {
- return mach_thread_self();
- #elif defined(OS_LINUX)
- return syscall(__NR_gettid);
--#elif defined(OS_FREEBSD)
-+#elif defined(OS_BSD)
- // TODO(BSD): find a better thread ID
- return reinterpret_cast<int64>(pthread_self());
- #elif defined(OS_NACL)
diff --git a/chromium/patches/patch-base_logging.h b/chromium/patches/patch-base_logging.h
deleted file mode 100644
index 26153f5b59..0000000000
--- a/chromium/patches/patch-base_logging.h
+++ /dev/null
@@ -1,41 +0,0 @@
-$NetBSD: patch-base_logging.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/logging.h.orig 2011-04-13 08:01:34.000000000 +0000
-+++ base/logging.h
-@@ -141,6 +141,18 @@
- // There is also the special severity of DFATAL, which logs FATAL in
- // debug mode, ERROR in normal mode.
-
-+// XXX better comment -- must be before we use << and in global namespace
-+// These functions are provided as a convenience for logging, which is where we
-+// use streams (it is against Google style to use streams in other places). It
-+// is designed to allow you to emit non-ASCII Unicode strings to the log file,
-+// which is normally ASCII. It is relatively slow, so try not to use it for
-+// common cases. Non-ASCII characters will be converted to UTF-8 by these
-+// operators.
-+std::ostream& operator<<(std::ostream& out, const wchar_t* wstr);
-+inline std::ostream& operator<<(std::ostream& out, const std::wstring& wstr) {
-+ return out << wstr.c_str();
-+}
-+
- namespace logging {
-
- // Where to record logging output? A flat file and/or system debug log via
-@@ -866,17 +878,6 @@ void RawLog(int level, const char* messa
-
- } // namespace logging
-
--// These functions are provided as a convenience for logging, which is where we
--// use streams (it is against Google style to use streams in other places). It
--// is designed to allow you to emit non-ASCII Unicode strings to the log file,
--// which is normally ASCII. It is relatively slow, so try not to use it for
--// common cases. Non-ASCII characters will be converted to UTF-8 by these
--// operators.
--std::ostream& operator<<(std::ostream& out, const wchar_t* wstr);
--inline std::ostream& operator<<(std::ostream& out, const std::wstring& wstr) {
-- return out << wstr.c_str();
--}
--
- // The NOTIMPLEMENTED() macro annotates codepaths which have
- // not been implemented yet.
- //
diff --git a/chromium/patches/patch-base_platform__file__posix.cc b/chromium/patches/patch-base_platform__file__posix.cc
deleted file mode 100644
index 493f0c7121..0000000000
--- a/chromium/patches/patch-base_platform__file__posix.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-base_platform__file__posix.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/platform_file_posix.cc.orig 2011-04-13 08:01:34.000000000 +0000
-+++ base/platform_file_posix.cc
-@@ -15,7 +15,7 @@
-
- namespace base {
-
--#if defined(OS_OPENBSD) || defined(OS_FREEBSD) || \
-+#if defined(OS_BSD) || \
- (defined(OS_MACOSX) && \
- MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_5)
- typedef struct stat stat_wrapper_t;
diff --git a/chromium/patches/patch-base_process__util.h b/chromium/patches/patch-base_process__util.h
deleted file mode 100644
index fbb7e060ee..0000000000
--- a/chromium/patches/patch-base_process__util.h
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-base_process__util.h,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- base/process_util.h.orig 2011-05-24 08:01:33.000000000 +0000
-+++ base/process_util.h
-@@ -14,14 +14,20 @@
- #if defined(OS_WIN)
- #include <windows.h>
- #include <tlhelp32.h>
--#elif defined(OS_MACOSX)
-+#elif defined(OS_MACOSX) || defined(OS_BSD)
- // kinfo_proc is defined in <sys/sysctl.h>, but this forward declaration
- // is sufficient for the vector<kinfo_proc> below.
-+#if defined(OS_NETBSD)
-+struct kinfo_proc2;
-+#else
- struct kinfo_proc;
-+#endif
- // malloc_zone_t is defined in <malloc/malloc.h>, but this forward declaration
- // is sufficient for GetPurgeableZone() below.
- typedef struct _malloc_zone_t malloc_zone_t;
-+#if defined(OS_MACOSX)
- #include <mach/mach.h>
-+#endif
- #elif defined(OS_POSIX)
- #include <dirent.h>
- #include <limits.h>
-@@ -161,10 +167,11 @@ void CloseProcessHandle(ProcessHandle pr
- // Win XP SP1 as well.
- ProcessId GetProcId(ProcessHandle process);
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // Returns the path to the executable of the given process.
- FilePath GetProcessExecutablePath(ProcessHandle process);
-
-+#elif defined(OS_LINUX)
- // Parse the data found in /proc/<pid>/stat and return the sum of the
- // CPU-related ticks. Returns -1 on parse error.
- // Exposed for testing.
-@@ -439,8 +446,12 @@ class ProcessIterator {
- #if defined(OS_WIN)
- HANDLE snapshot_;
- bool started_iteration_;
--#elif defined(OS_MACOSX)
-+#elif defined(OS_MACOSX) || defined(OS_BSD)
-+#if defined(OS_NETBSD)
-+ std::vector<kinfo_proc2> kinfo_procs_;
-+#else
- std::vector<kinfo_proc> kinfo_procs_;
-+#endif
- size_t index_of_kinfo_proc_;
- #elif defined(OS_POSIX)
- DIR *procfs_dir_;
diff --git a/chromium/patches/patch-base_process__util__dragonfly.cc b/chromium/patches/patch-base_process__util__dragonfly.cc
deleted file mode 100644
index 405b637650..0000000000
--- a/chromium/patches/patch-base_process__util__dragonfly.cc
+++ /dev/null
@@ -1,363 +0,0 @@
-$NetBSD: patch-base_process__util__dragonfly.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- base/process_util_dragonfly.cc.orig 2011-05-26 07:37:00.000000000 +0000
-+++ base/process_util_dragonfly.cc
-@@ -0,0 +1,358 @@
-+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "base/process_util.h"
-+
-+#include <ctype.h>
-+#include <dirent.h>
-+#include <dlfcn.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
-+#include <sys/wait.h>
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#include <sys/user.h>
-+#include <sys/kinfo.h>
-+#include <sys/vmmeter.h>
-+#include <time.h>
-+#include <unistd.h>
-+
-+#include "base/file_util.h"
-+#include "base/logging.h"
-+#include "base/string_number_conversions.h"
-+#include "base/string_split.h"
-+#include "base/string_tokenizer.h"
-+#include "base/string_util.h"
-+#include "base/sys_info.h"
-+#include "base/threading/thread_restrictions.h"
-+
-+namespace base {
-+
-+ProcessId GetParentProcessId(ProcessHandle process) {
-+ struct kinfo_proc info;
-+ int mib[6];
-+ size_t info_size = sizeof(info);
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_PID;
-+ mib[3] = process;
-+ mib[4] = info_size;
-+ mib[5] = 400; /* XXX */
-+
-+ if (sysctl(mib, 6, &info, &info_size, NULL, 0) < 0)
-+ return -1;
-+
-+ return info.kp_ppid;
-+}
-+
-+FilePath GetProcessExecutablePath(ProcessHandle process) {
-+ FilePath stat_file("/proc");
-+ stat_file = stat_file.Append(base::IntToString(process));
-+ stat_file = stat_file.Append("file");
-+ FilePath exe_name;
-+ if (!file_util::ReadSymbolicLink(stat_file, &exe_name)) {
-+ // No such process. Happens frequently in e.g. TerminateAllChromeProcesses
-+ return FilePath();
-+ }
-+ return exe_name;
-+}
-+
-+ProcessIterator::ProcessIterator(const ProcessFilter* filter)
-+ : index_of_kinfo_proc_(),
-+ filter_(filter) {
-+
-+ int mib[6];
-+
-+ printf("%s\n", __PRETTY_FUNCTION__);
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_UID;
-+ mib[3] = getuid();
-+ mib[4] = sizeof(struct kinfo_proc);
-+ mib[5] = 0;
-+
-+ bool done = false;
-+ int try_num = 1;
-+ const int max_tries = 10;
-+
-+ do {
-+ size_t len = 0;
-+ if (sysctl(mib, 6, NULL, &len, NULL, 0) <0 ){
-+ LOG(ERROR) << "failed to get the size needed for the process list";
-+ kinfo_procs_.resize(0);
-+ done = true;
-+ } else {
-+ size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
-+ // Leave some spare room for process table growth (more could show up
-+ // between when we check and now)
-+ num_of_kinfo_proc += 16;
-+ kinfo_procs_.resize(num_of_kinfo_proc);
-+ len = num_of_kinfo_proc * sizeof(struct kinfo_proc);
-+ if (sysctl(mib, 6, &kinfo_procs_[0], &len, NULL, 0) <0) {
-+ // If we get a mem error, it just means we need a bigger buffer, so
-+ // loop around again. Anything else is a real error and give up.
-+ if (errno != ENOMEM) {
-+ LOG(ERROR) << "failed to get the process list";
-+ kinfo_procs_.resize(0);
-+ done = true;
-+ }
-+ } else {
-+ // Got the list, just make sure we're sized exactly right
-+ size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
-+ kinfo_procs_.resize(num_of_kinfo_proc);
-+ done = true;
-+ }
-+ }
-+ } while (!done && (try_num++ < max_tries));
-+
-+ if (!done) {
-+ LOG(ERROR) << "failed to collect the process list in a few tries";
-+ kinfo_procs_.resize(0);
-+ }
-+}
-+
-+ProcessIterator::~ProcessIterator() {
-+}
-+
-+bool ProcessIterator::CheckForNextProcess() {
-+ std::string data;
-+
-+ printf("%s\n", __PRETTY_FUNCTION__);
-+
-+ for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++ index_of_kinfo_proc_) {
-+ int mib[3];
-+ size_t len;
-+ struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_];
-+
-+ if ((kinfo.kp_pid > 0) && (kinfo.kp_stat == SZOMB))
-+ continue;
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC_ARGS;
-+ mib[2] = kinfo.kp_pid;
-+
-+ len = 0;
-+ if (sysctl(mib, 3, NULL, &len, NULL, 0) < 0) {
-+ LOG(ERROR) << "failed to figure out the buffer size for a command line";
-+ continue;
-+ }
-+
-+ data.resize(len);
-+
-+ if (sysctl(mib, 3, &data[0], &len, NULL, 0) < 0) {
-+ LOG(ERROR) << "failed to fetch a commandline";
-+ continue;
-+ }
-+
-+ std::string delimiters;
-+ delimiters.push_back('\0');
-+ Tokenize(data, delimiters, &entry_.cmd_line_args_);
-+
-+ size_t exec_name_end = data.find('\0');
-+ if (exec_name_end == std::string::npos) {
-+ LOG(ERROR) << "command line data didn't match expected format";
-+ continue;
-+ }
-+
-+ entry_.pid_ = kinfo.kp_pid;
-+ entry_.ppid_ = kinfo.kp_ppid;
-+ entry_.gid_ = kinfo.kp_pgid;
-+
-+ size_t last_slash = data.rfind('/', exec_name_end);
-+ if (last_slash == std::string::npos)
-+ entry_.exe_file_.assign(data, 0, exec_name_end);
-+ else
-+ entry_.exe_file_.assign(data, last_slash + 1,
-+ exec_name_end - last_slash - 1);
-+
-+ // Start w/ the next entry next time through
-+ ++index_of_kinfo_proc_;
-+
-+ return true;
-+ }
-+ return false;
-+}
-+
-+bool NamedProcessIterator::IncludeEntry() {
-+ return (executable_name_ == entry().exe_file() &&
-+ ProcessIterator::IncludeEntry());
-+}
-+
-+
-+ProcessMetrics::ProcessMetrics(ProcessHandle process)
-+ : process_(process),
-+ last_time_(0),
-+ last_system_time_(0),
-+ last_cpu_(0) {
-+
-+ processor_count_ = base::SysInfo::NumberOfProcessors();
-+}
-+
-+// static
-+ProcessMetrics* ProcessMetrics::CreateProcessMetrics(ProcessHandle process) {
-+ return new ProcessMetrics(process);
-+}
-+
-+size_t ProcessMetrics::GetPagefileUsage() const {
-+ struct kinfo_proc info;
-+ int mib[6];
-+ size_t info_size = sizeof(info);
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_PID;
-+ mib[3] = process_;
-+ mib[4] = info_size;
-+ mib[5] = 400; /* XXX */
-+
-+ if (sysctl(mib, 6, &info, &info_size, NULL, 0) < 0)
-+ return 0;
-+
-+ return (info.kp_vm_tsize + info.kp_vm_dsize + info.kp_vm_ssize);
-+}
-+
-+size_t ProcessMetrics::GetPeakPagefileUsage() const {
-+ printf("%s\n", __PRETTY_FUNCTION__);
-+
-+ return 0;
-+}
-+
-+size_t ProcessMetrics::GetWorkingSetSize() const {
-+ struct kinfo_proc info;
-+ int mib[6];
-+ size_t info_size = sizeof(info);
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_PID;
-+ mib[3] = process_;
-+ mib[4] = info_size;
-+ mib[5] = 400; /* XXX */
-+
-+ if (sysctl(mib, 6, &info, &info_size, NULL, 0) < 0)
-+ return 0;
-+
-+ return info.kp_vm_rssize * getpagesize();
-+}
-+
-+size_t ProcessMetrics::GetPeakWorkingSetSize() const {
-+ printf("%s\n", __PRETTY_FUNCTION__);
-+
-+ return 0;
-+}
-+
-+bool ProcessMetrics::GetMemoryBytes(size_t* private_bytes,
-+ size_t* shared_bytes) {
-+ WorkingSetKBytes ws_usage;
-+
-+ if (!GetWorkingSetKBytes(&ws_usage))
-+ return false;
-+
-+ if (private_bytes)
-+ *private_bytes = ws_usage.priv << 10;
-+
-+ if (shared_bytes)
-+ *shared_bytes = ws_usage.shared * 1024;
-+
-+ return true;
-+}
-+
-+bool ProcessMetrics::GetWorkingSetKBytes(WorkingSetKBytes* ws_usage) const {
-+// TODO(bapt) be sure we can't be precise
-+ size_t priv = GetWorkingSetSize();
-+ if (!priv)
-+ return false;
-+ ws_usage->priv = priv / 1024;
-+ ws_usage->shareable = 0;
-+ ws_usage->shared = 0;
-+
-+ return true;
-+}
-+
-+bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const {
-+ return false;
-+}
-+
-+static int GetProcessCPU(pid_t pid) {
-+ struct kinfo_proc info;
-+ int mib[6];
-+ size_t info_size = sizeof(info);
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_PID;
-+ mib[3] = pid;
-+ mib[4] = info_size;
-+ mib[5] = 400; /* XXX */
-+
-+ if (sysctl(mib, 6, &info, &info_size, NULL, 0) < 0)
-+ return 0;
-+
-+ return info.kp_lwp.kl_pctcpu;
-+}
-+
-+double ProcessMetrics::GetCPUUsage() {
-+ struct timeval now;
-+
-+ int retval = gettimeofday(&now, NULL);
-+ if (retval)
-+ return 0;
-+
-+ int64 time = TimeValToMicroseconds(now);
-+
-+ if (last_time_ == 0) {
-+ // First call, just set the last values.
-+ last_time_ = time;
-+ last_cpu_ = GetProcessCPU(process_);
-+ return 0;
-+ }
-+
-+ int64 time_delta = time - last_time_;
-+ DCHECK_NE(time_delta, 0);
-+
-+ if (time_delta == 0)
-+ return 0;
-+
-+ int cpu = GetProcessCPU(process_);
-+
-+ last_time_ = time;
-+ last_cpu_ = cpu;
-+
-+ double percentage = static_cast<double>((cpu * 100.0) / FSCALE);
-+
-+ return percentage;
-+}
-+
-+size_t GetSystemCommitCharge() {
-+ int mib[2], pagesize;
-+ struct vmtotal vmtotal;
-+ unsigned long mem_total, mem_free, mem_inactive;
-+ size_t len = sizeof(vmtotal);
-+
-+ printf("%s\n", __PRETTY_FUNCTION__);
-+
-+ mib[0] = CTL_VM;
-+ mib[1] = VM_METER;
-+
-+ if (sysctl(mib, 2, &vmtotal, &len, NULL, 0) < 0)
-+ return 0;
-+
-+ mem_total = vmtotal.t_vm;
-+ mem_free = vmtotal.t_free;
-+ mem_inactive = vmtotal.t_vm - vmtotal.t_avm;
-+
-+ pagesize = getpagesize();
-+
-+ return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
-+}
-+
-+void EnableTerminationOnOutOfMemory() {
-+ NOTIMPLEMENTED();
-+ return;
-+}
-+}
diff --git a/chromium/patches/patch-base_process__util__freebsd.cc b/chromium/patches/patch-base_process__util__freebsd.cc
deleted file mode 100644
index 31feb3a6cd..0000000000
--- a/chromium/patches/patch-base_process__util__freebsd.cc
+++ /dev/null
@@ -1,312 +0,0 @@
-$NetBSD: patch-base_process__util__freebsd.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/process_util_freebsd.cc.orig 2011-04-26 05:17:12.000000000 +0000
-+++ base/process_util_freebsd.cc
-@@ -0,0 +1,307 @@
-+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "base/process_util.h"
-+
-+#include <ctype.h>
-+#include <dirent.h>
-+#include <dlfcn.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
-+#include <sys/wait.h>
-+#include <sys/sysctl.h>
-+#include <sys/user.h>
-+#include <time.h>
-+#include <unistd.h>
-+
-+#include "base/file_util.h"
-+#include "base/logging.h"
-+#include "base/string_number_conversions.h"
-+#include "base/string_split.h"
-+#include "base/string_tokenizer.h"
-+#include "base/string_util.h"
-+#include "base/sys_info.h"
-+#include "base/thread_restrictions.h"
-+
-+namespace base {
-+
-+ProcessId GetParentProcessId(ProcessHandle process) {
-+ struct kinfo_proc info;
-+ int mib[4];
-+ size_t info_size = sizeof(info);
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_PID;
-+ mib[3] = process;
-+
-+ if (sysctl(mib, 4, &info, &info_size, NULL, 0) < 0)
-+ return -1;
-+
-+ return info.ki_ppid;
-+}
-+
-+FilePath GetProcessExecutablePath(ProcessHandle process) {
-+ char pathname[PATH_MAX];
-+ int mib[4];
-+ size_t len;
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_PATHNAME;
-+ mib[3] = process;
-+
-+ len = sizeof(pathname);
-+
-+ if (sysctl(mib, 4, pathname, &len, NULL, 0) < 0 || len == 0)
-+ return FilePath();
-+
-+ return FilePath(std::string(pathname));
-+}
-+
-+ProcessIterator::ProcessIterator(const ProcessFilter* filter)
-+ : index_of_kinfo_proc_(),
-+ filter_(filter) {
-+
-+ int mib[4];
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_UID;
-+ mib[3] = getuid();
-+
-+ bool done = false;
-+ int try_num = 1;
-+ const int max_tries = 10;
-+
-+ do {
-+ size_t len = 0;
-+ if (sysctl(mib, 4, NULL, &len, NULL, 0) <0 ){
-+ LOG(ERROR) << "failed to get the size needed for the process list";
-+ kinfo_procs_.resize(0);
-+ done = true;
-+ } else {
-+ size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
-+ // Leave some spare room for process table growth (more could show up
-+ // between when we check and now)
-+ num_of_kinfo_proc += 16;
-+ kinfo_procs_.resize(num_of_kinfo_proc);
-+ len = num_of_kinfo_proc * sizeof(struct kinfo_proc);
-+ if (sysctl(mib, 4, &kinfo_procs_[0], &len, NULL, 0) <0) {
-+ // If we get a mem error, it just means we need a bigger buffer, so
-+ // loop around again. Anything else is a real error and give up.
-+ if (errno != ENOMEM) {
-+ LOG(ERROR) << "failed to get the process list";
-+ kinfo_procs_.resize(0);
-+ done = true;
-+ }
-+ } else {
-+ // Got the list, just make sure we're sized exactly right
-+ size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
-+ kinfo_procs_.resize(num_of_kinfo_proc);
-+ done = true;
-+ }
-+ }
-+ } while (!done && (try_num++ < max_tries));
-+
-+ if (!done) {
-+ LOG(ERROR) << "failed to collect the process list in a few tries";
-+ kinfo_procs_.resize(0);
-+ }
-+}
-+
-+ProcessIterator::~ProcessIterator() {
-+}
-+
-+bool ProcessIterator::CheckForNextProcess() {
-+ std::string data;
-+
-+ for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++ index_of_kinfo_proc_) {
-+ int mib[3];
-+ size_t len;
-+ struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_];
-+
-+ if ((kinfo.ki_pid > 0) && (kinfo.ki_stat == SZOMB))
-+ continue;
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC_ARGS;
-+ mib[2] = kinfo.ki_pid;
-+
-+ len = 0;
-+ if (sysctl(mib, 3, NULL, &len, NULL, 0) < 0) {
-+ LOG(ERROR) << "failed to figure out the buffer size for a command line";
-+ continue;
-+ }
-+
-+ data.resize(len);
-+
-+ if (sysctl(mib, 3, &data[0], &len, NULL, 0) < 0) {
-+ LOG(ERROR) << "failed to fetch a commandline";
-+ continue;
-+ }
-+
-+ std::string delimiters;
-+ delimiters.push_back('\0');
-+ Tokenize(data, delimiters, &entry_.cmd_line_args_);
-+
-+ size_t exec_name_end = data.find('\0');
-+ if (exec_name_end == std::string::npos) {
-+ LOG(ERROR) << "command line data didn't match expected format";
-+ continue;
-+ }
-+
-+ entry_.pid_ = kinfo.ki_pid;
-+ entry_.ppid_ = kinfo.ki_ppid;
-+ entry_.gid_ = kinfo.ki_pgid;
-+
-+ size_t last_slash = data.rfind('/', exec_name_end);
-+ if (last_slash == std::string::npos)
-+ entry_.exe_file_.assign(data, 0, exec_name_end);
-+ else
-+ entry_.exe_file_.assign(data, last_slash + 1,
-+ exec_name_end - last_slash - 1);
-+
-+ // Start w/ the next entry next time through
-+ ++index_of_kinfo_proc_;
-+
-+ return true;
-+ }
-+ return false;
-+}
-+
-+bool NamedProcessIterator::IncludeEntry() {
-+ return (WideToASCII(executable_name_) == entry().exe_file() &&
-+ ProcessIterator::IncludeEntry());
-+}
-+
-+
-+ProcessMetrics::ProcessMetrics(ProcessHandle process)
-+ : process_(process),
-+ last_time_(0),
-+ last_system_time_(0),
-+ last_cpu_(0) {
-+ processor_count_ = base::SysInfo::NumberOfProcessors();
-+}
-+
-+// static
-+ProcessMetrics* ProcessMetrics::CreateProcessMetrics(ProcessHandle process) {
-+ return new ProcessMetrics(process);
-+}
-+
-+size_t ProcessMetrics::GetPagefileUsage() const {
-+ struct kinfo_proc info;
-+ int mib[4];
-+ size_t info_size = sizeof(info);
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_PID;
-+ mib[3] = process_;
-+
-+ if (sysctl(mib, 4, &info, &info_size, NULL, 0) < 0)
-+ return 0;
-+
-+ return info.ki_size;
-+}
-+
-+size_t ProcessMetrics::GetPeakPagefileUsage() const {
-+ return 0;
-+}
-+
-+size_t ProcessMetrics::GetWorkingSetSize() const {
-+ struct kinfo_proc info;
-+ int mib[4];
-+ size_t info_size = sizeof(info);
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_PID;
-+ mib[3] = process_;
-+
-+ if (sysctl(mib, 4, &info, &info_size, NULL, 0) < 0)
-+ return 0;
-+
-+ return info.ki_rssize * getpagesize();
-+}
-+
-+size_t ProcessMetrics::GetPeakWorkingSetSize() const {
-+ return 0;
-+}
-+
-+bool ProcessMetrics::GetMemoryBytes(size_t* private_bytes,
-+ size_t* shared_bytes) {
-+ WorkingSetKBytes ws_usage;
-+ if (!GetWorkingSetKBytes(&ws_usage))
-+ return false;
-+
-+ if (private_bytes)
-+ *private_bytes = ws_usage.priv << 10;
-+
-+ if (shared_bytes)
-+ *shared_bytes = ws_usage.shared * 1024;
-+
-+ return true;
-+}
-+
-+bool ProcessMetrics::GetWorkingSetKBytes(WorkingSetKBytes* ws_usage) const {
-+// TODO(bapt) be sure we can't be precise
-+ size_t priv = GetWorkingSetSize();
-+ if (!priv)
-+ return false;
-+ ws_usage->priv = priv / 1024;
-+ ws_usage->shareable = 0;
-+ ws_usage->shared = 0;
-+
-+ return true;
-+}
-+
-+bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const {
-+ return false;
-+}
-+
-+double ProcessMetrics::GetCPUUsage() {
-+ struct kinfo_proc info;
-+ int mib[4];
-+ size_t info_size = sizeof(info);
-+
-+ struct timeval now;
-+ int retval = gettimeofday(&now, NULL);
-+ if (retval)
-+ return 0;
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_PID;
-+ mib[3] = process_;
-+
-+ if (sysctl(mib, 4, &info, &info_size, NULL, 0) < 0)
-+ return 0;
-+
-+ return (info.ki_pctcpu / FSCALE) * 100.0;
-+}
-+
-+size_t GetSystemCommitCharge() {
-+ int mib[2], pagesize;
-+ unsigned long mem_total, mem_free, mem_inactive;
-+ size_t len = sizeof(mem_total);
-+
-+ if (sysctl(mib, 2, &mem_total, &len, NULL, 0) < 0)
-+ return 0;
-+
-+ len = sizeof(mem_free);
-+ if (sysctlbyname("vm.stats.vm.v_free_count", &mem_free, &len, NULL, 0) < 0)
-+ return 0;
-+
-+ len = sizeof(mem_inactive);
-+ if (sysctlbyname("vm.stats.vm.v_inactive_count", &mem_inactive, &len, NULL, 0) < 0)
-+ return 0;
-+
-+ pagesize = getpagesize();
-+
-+ return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
-+}
-+}
diff --git a/chromium/patches/patch-base_process__util__netbsd.cc b/chromium/patches/patch-base_process__util__netbsd.cc
deleted file mode 100644
index 967b60d687..0000000000
--- a/chromium/patches/patch-base_process__util__netbsd.cc
+++ /dev/null
@@ -1,363 +0,0 @@
-$NetBSD: patch-base_process__util__netbsd.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/process_util_netbsd.cc.orig 2011-04-26 05:17:12.000000000 +0000
-+++ base/process_util_netbsd.cc
-@@ -0,0 +1,358 @@
-+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "base/process_util.h"
-+
-+#include <ctype.h>
-+#include <dirent.h>
-+#include <dlfcn.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
-+#include <sys/wait.h>
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#include <sys/user.h>
-+#include <time.h>
-+#include <unistd.h>
-+
-+#include "base/file_util.h"
-+#include "base/logging.h"
-+#include "base/string_number_conversions.h"
-+#include "base/string_split.h"
-+#include "base/string_tokenizer.h"
-+#include "base/string_util.h"
-+#include "base/sys_info.h"
-+#include "base/threading/thread_restrictions.h"
-+
-+namespace base {
-+
-+ProcessId GetParentProcessId(ProcessHandle process) {
-+ struct kinfo_proc2 info;
-+ int mib[6];
-+ size_t info_size = sizeof(info);
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_PID;
-+ mib[3] = process;
-+ mib[4] = info_size;
-+ mib[5] = 400; /* XXX */
-+
-+ if (sysctl(mib, 6, &info, &info_size, NULL, 0) < 0)
-+ return -1;
-+
-+ return info.p_ppid;
-+}
-+
-+FilePath GetProcessExecutablePath(ProcessHandle process) {
-+ printf("%s\n", __PRETTY_FUNCTION__);
-+
-+ FilePath stat_file("/proc");
-+ stat_file = stat_file.Append(base::IntToString(process));
-+ stat_file = stat_file.Append("exe");
-+ FilePath exe_name;
-+ if (!file_util::ReadSymbolicLink(stat_file, &exe_name)) {
-+ // No such process. Happens frequently in e.g. TerminateAllChromeProcesses
-+ return FilePath();
-+ }
-+ return exe_name;
-+}
-+
-+ProcessIterator::ProcessIterator(const ProcessFilter* filter)
-+ : index_of_kinfo_proc_(),
-+ filter_(filter) {
-+
-+ int mib[6];
-+
-+ printf("%s\n", __PRETTY_FUNCTION__);
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_UID;
-+ mib[3] = getuid();
-+ mib[4] = sizeof(struct kinfo_proc2);
-+ mib[5] = 0;
-+
-+ bool done = false;
-+ int try_num = 1;
-+ const int max_tries = 10;
-+
-+ do {
-+ size_t len = 0;
-+ if (sysctl(mib, 6, NULL, &len, NULL, 0) <0 ){
-+ LOG(ERROR) << "failed to get the size needed for the process list";
-+ kinfo_procs_.resize(0);
-+ done = true;
-+ } else {
-+ size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc2);
-+ // Leave some spare room for process table growth (more could show up
-+ // between when we check and now)
-+ num_of_kinfo_proc += 16;
-+ kinfo_procs_.resize(num_of_kinfo_proc);
-+ len = num_of_kinfo_proc * sizeof(struct kinfo_proc2);
-+ if (sysctl(mib, 6, &kinfo_procs_[0], &len, NULL, 0) <0) {
-+ // If we get a mem error, it just means we need a bigger buffer, so
-+ // loop around again. Anything else is a real error and give up.
-+ if (errno != ENOMEM) {
-+ LOG(ERROR) << "failed to get the process list";
-+ kinfo_procs_.resize(0);
-+ done = true;
-+ }
-+ } else {
-+ // Got the list, just make sure we're sized exactly right
-+ size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc2);
-+ kinfo_procs_.resize(num_of_kinfo_proc);
-+ done = true;
-+ }
-+ }
-+ } while (!done && (try_num++ < max_tries));
-+
-+ if (!done) {
-+ LOG(ERROR) << "failed to collect the process list in a few tries";
-+ kinfo_procs_.resize(0);
-+ }
-+}
-+
-+ProcessIterator::~ProcessIterator() {
-+}
-+
-+bool ProcessIterator::CheckForNextProcess() {
-+ std::string data;
-+
-+ printf("%s\n", __PRETTY_FUNCTION__);
-+
-+ for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++ index_of_kinfo_proc_) {
-+ int mib[3];
-+ size_t len;
-+ struct kinfo_proc2 kinfo = kinfo_procs_[index_of_kinfo_proc_];
-+
-+ if ((kinfo.p_pid > 0) && (kinfo.p_stat == SZOMB))
-+ continue;
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC_ARGS;
-+ mib[2] = kinfo.p_pid;
-+
-+ len = 0;
-+ if (sysctl(mib, 3, NULL, &len, NULL, 0) < 0) {
-+ LOG(ERROR) << "failed to figure out the buffer size for a command line";
-+ continue;
-+ }
-+
-+ data.resize(len);
-+
-+ if (sysctl(mib, 3, &data[0], &len, NULL, 0) < 0) {
-+ LOG(ERROR) << "failed to fetch a commandline";
-+ continue;
-+ }
-+
-+ std::string delimiters;
-+ delimiters.push_back('\0');
-+ Tokenize(data, delimiters, &entry_.cmd_line_args_);
-+
-+ size_t exec_name_end = data.find('\0');
-+ if (exec_name_end == std::string::npos) {
-+ LOG(ERROR) << "command line data didn't match expected format";
-+ continue;
-+ }
-+
-+ entry_.pid_ = kinfo.p_pid;
-+ entry_.ppid_ = kinfo.p_ppid;
-+ entry_.gid_ = kinfo.p__pgid;
-+
-+ size_t last_slash = data.rfind('/', exec_name_end);
-+ if (last_slash == std::string::npos)
-+ entry_.exe_file_.assign(data, 0, exec_name_end);
-+ else
-+ entry_.exe_file_.assign(data, last_slash + 1,
-+ exec_name_end - last_slash - 1);
-+
-+ // Start w/ the next entry next time through
-+ ++index_of_kinfo_proc_;
-+
-+ return true;
-+ }
-+ return false;
-+}
-+
-+bool NamedProcessIterator::IncludeEntry() {
-+ return (executable_name_ == entry().exe_file() &&
-+ ProcessIterator::IncludeEntry());
-+}
-+
-+
-+ProcessMetrics::ProcessMetrics(ProcessHandle process)
-+ : process_(process),
-+ last_time_(0),
-+ last_system_time_(0),
-+ last_cpu_(0) {
-+
-+ processor_count_ = base::SysInfo::NumberOfProcessors();
-+}
-+
-+// static
-+ProcessMetrics* ProcessMetrics::CreateProcessMetrics(ProcessHandle process) {
-+ return new ProcessMetrics(process);
-+}
-+
-+size_t ProcessMetrics::GetPagefileUsage() const {
-+ struct kinfo_proc2 info;
-+ int mib[6];
-+ size_t info_size = sizeof(info);
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_PID;
-+ mib[3] = process_;
-+ mib[4] = info_size;
-+ mib[5] = 400; /* XXX */
-+
-+ if (sysctl(mib, 6, &info, &info_size, NULL, 0) < 0)
-+ return 0;
-+
-+ return (info.p_vm_tsize + info.p_vm_dsize + info.p_vm_ssize);
-+}
-+
-+size_t ProcessMetrics::GetPeakPagefileUsage() const {
-+ printf("%s\n", __PRETTY_FUNCTION__);
-+
-+ return 0;
-+}
-+
-+size_t ProcessMetrics::GetWorkingSetSize() const {
-+ struct kinfo_proc2 info;
-+ int mib[6];
-+ size_t info_size = sizeof(info);
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_PID;
-+ mib[3] = process_;
-+ mib[4] = info_size;
-+ mib[5] = 400; /* XXX */
-+
-+ if (sysctl(mib, 6, &info, &info_size, NULL, 0) < 0)
-+ return 0;
-+
-+ return info.p_vm_rssize * getpagesize();
-+}
-+
-+size_t ProcessMetrics::GetPeakWorkingSetSize() const {
-+ printf("%s\n", __PRETTY_FUNCTION__);
-+
-+ return 0;
-+}
-+
-+bool ProcessMetrics::GetMemoryBytes(size_t* private_bytes,
-+ size_t* shared_bytes) {
-+ WorkingSetKBytes ws_usage;
-+
-+ if (!GetWorkingSetKBytes(&ws_usage))
-+ return false;
-+
-+ if (private_bytes)
-+ *private_bytes = ws_usage.priv << 10;
-+
-+ if (shared_bytes)
-+ *shared_bytes = ws_usage.shared * 1024;
-+
-+ return true;
-+}
-+
-+bool ProcessMetrics::GetWorkingSetKBytes(WorkingSetKBytes* ws_usage) const {
-+// TODO(bapt) be sure we can't be precise
-+ size_t priv = GetWorkingSetSize();
-+ if (!priv)
-+ return false;
-+ ws_usage->priv = priv / 1024;
-+ ws_usage->shareable = 0;
-+ ws_usage->shared = 0;
-+
-+ return true;
-+}
-+
-+bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const {
-+ return false;
-+}
-+
-+static int GetProcessCPU(pid_t pid) {
-+ struct kinfo_proc2 info;
-+ int mib[6];
-+ size_t info_size = sizeof(info);
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_PID;
-+ mib[3] = pid;
-+ mib[4] = info_size;
-+ mib[5] = 400; /* XXX */
-+
-+ if (sysctl(mib, 6, &info, &info_size, NULL, 0) < 0)
-+ return 0;
-+
-+ return info.p_pctcpu;
-+}
-+
-+double ProcessMetrics::GetCPUUsage() {
-+ struct timeval now;
-+
-+ int retval = gettimeofday(&now, NULL);
-+ if (retval)
-+ return 0;
-+
-+ int64 time = TimeValToMicroseconds(now);
-+
-+ if (last_time_ == 0) {
-+ // First call, just set the last values.
-+ last_time_ = time;
-+ last_cpu_ = GetProcessCPU(process_);
-+ return 0;
-+ }
-+
-+ int64 time_delta = time - last_time_;
-+ DCHECK_NE(time_delta, 0);
-+
-+ if (time_delta == 0)
-+ return 0;
-+
-+ int cpu = GetProcessCPU(process_);
-+
-+ last_time_ = time;
-+ last_cpu_ = cpu;
-+
-+ double percentage = static_cast<double>((cpu * 100.0) / FSCALE);
-+
-+ return percentage;
-+}
-+
-+size_t GetSystemCommitCharge() {
-+ int mib[2], pagesize;
-+ struct vmtotal vmtotal;
-+ unsigned long mem_total, mem_free, mem_inactive;
-+ size_t len = sizeof(vmtotal);
-+
-+ printf("%s\n", __PRETTY_FUNCTION__);
-+
-+ mib[0] = CTL_VM;
-+ mib[1] = VM_METER;
-+
-+ if (sysctl(mib, 2, &vmtotal, &len, NULL, 0) < 0)
-+ return 0;
-+
-+ mem_total = vmtotal.t_vm;
-+ mem_free = vmtotal.t_free;
-+ mem_inactive = vmtotal.t_vm - vmtotal.t_avm;
-+
-+ pagesize = getpagesize();
-+
-+ return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
-+}
-+
-+void EnableTerminationOnOutOfMemory() {
-+ NOTIMPLEMENTED();
-+ return;
-+}
-+}
diff --git a/chromium/patches/patch-base_process__util__openbsd.cc b/chromium/patches/patch-base_process__util__openbsd.cc
deleted file mode 100644
index a7132cdfe1..0000000000
--- a/chromium/patches/patch-base_process__util__openbsd.cc
+++ /dev/null
@@ -1,354 +0,0 @@
-$NetBSD: patch-base_process__util__openbsd.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/process_util_openbsd.cc.orig 2011-04-26 05:17:12.000000000 +0000
-+++ base/process_util_openbsd.cc
-@@ -0,0 +1,349 @@
-+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "base/process_util.h"
-+
-+#include <ctype.h>
-+#include <dirent.h>
-+#include <dlfcn.h>
-+#include <errno.h>
-+#include <fcntl.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
-+#include <sys/wait.h>
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#include <sys/user.h>
-+#include <time.h>
-+#include <unistd.h>
-+
-+#include "base/file_util.h"
-+#include "base/logging.h"
-+#include "base/string_number_conversions.h"
-+#include "base/string_split.h"
-+#include "base/string_tokenizer.h"
-+#include "base/string_util.h"
-+#include "base/sys_info.h"
-+#include "base/threading/thread_restrictions.h"
-+
-+namespace base {
-+
-+ProcessId GetParentProcessId(ProcessHandle process) {
-+ struct kinfo_proc info;
-+ int mib[6];
-+ size_t info_size = sizeof(info);
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_PID;
-+ mib[3] = process;
-+ mib[4] = info_size;
-+ mib[5] = 400; /* XXX */
-+
-+ if (sysctl(mib, 6, &info, &info_size, NULL, 0) < 0)
-+ return -1;
-+
-+ return info.p_ppid;
-+}
-+
-+FilePath GetProcessExecutablePath(ProcessHandle process) {
-+ printf("%s\n", __PRETTY_FUNCTION__);
-+ return FilePath(std::string("/usr/local/share/chromium/chrome"));
-+}
-+
-+ProcessIterator::ProcessIterator(const ProcessFilter* filter)
-+ : index_of_kinfo_proc_(),
-+ filter_(filter) {
-+
-+ int mib[6];
-+
-+ printf("%s\n", __PRETTY_FUNCTION__);
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_UID;
-+ mib[3] = getuid();
-+ mib[4] = sizeof(struct kinfo_proc);
-+ mib[5] = 0;
-+
-+ bool done = false;
-+ int try_num = 1;
-+ const int max_tries = 10;
-+
-+ do {
-+ size_t len = 0;
-+ if (sysctl(mib, 6, NULL, &len, NULL, 0) <0 ){
-+ LOG(ERROR) << "failed to get the size needed for the process list";
-+ kinfo_procs_.resize(0);
-+ done = true;
-+ } else {
-+ size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
-+ // Leave some spare room for process table growth (more could show up
-+ // between when we check and now)
-+ num_of_kinfo_proc += 16;
-+ kinfo_procs_.resize(num_of_kinfo_proc);
-+ len = num_of_kinfo_proc * sizeof(struct kinfo_proc);
-+ if (sysctl(mib, 6, &kinfo_procs_[0], &len, NULL, 0) <0) {
-+ // If we get a mem error, it just means we need a bigger buffer, so
-+ // loop around again. Anything else is a real error and give up.
-+ if (errno != ENOMEM) {
-+ LOG(ERROR) << "failed to get the process list";
-+ kinfo_procs_.resize(0);
-+ done = true;
-+ }
-+ } else {
-+ // Got the list, just make sure we're sized exactly right
-+ size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc);
-+ kinfo_procs_.resize(num_of_kinfo_proc);
-+ done = true;
-+ }
-+ }
-+ } while (!done && (try_num++ < max_tries));
-+
-+ if (!done) {
-+ LOG(ERROR) << "failed to collect the process list in a few tries";
-+ kinfo_procs_.resize(0);
-+ }
-+}
-+
-+ProcessIterator::~ProcessIterator() {
-+}
-+
-+bool ProcessIterator::CheckForNextProcess() {
-+ std::string data;
-+
-+ printf("%s\n", __PRETTY_FUNCTION__);
-+
-+ for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++ index_of_kinfo_proc_) {
-+ int mib[3];
-+ size_t len;
-+ struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_];
-+
-+ if ((kinfo.p_pid > 0) && (kinfo.p_stat == SZOMB))
-+ continue;
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC_ARGS;
-+ mib[2] = kinfo.p_pid;
-+
-+ len = 0;
-+ if (sysctl(mib, 3, NULL, &len, NULL, 0) < 0) {
-+ LOG(ERROR) << "failed to figure out the buffer size for a command line";
-+ continue;
-+ }
-+
-+ data.resize(len);
-+
-+ if (sysctl(mib, 3, &data[0], &len, NULL, 0) < 0) {
-+ LOG(ERROR) << "failed to fetch a commandline";
-+ continue;
-+ }
-+
-+ std::string delimiters;
-+ delimiters.push_back('\0');
-+ Tokenize(data, delimiters, &entry_.cmd_line_args_);
-+
-+ size_t exec_name_end = data.find('\0');
-+ if (exec_name_end == std::string::npos) {
-+ LOG(ERROR) << "command line data didn't match expected format";
-+ continue;
-+ }
-+
-+ entry_.pid_ = kinfo.p_pid;
-+ entry_.ppid_ = kinfo.p_ppid;
-+ entry_.gid_ = kinfo.p__pgid;
-+
-+ size_t last_slash = data.rfind('/', exec_name_end);
-+ if (last_slash == std::string::npos)
-+ entry_.exe_file_.assign(data, 0, exec_name_end);
-+ else
-+ entry_.exe_file_.assign(data, last_slash + 1,
-+ exec_name_end - last_slash - 1);
-+
-+ // Start w/ the next entry next time through
-+ ++index_of_kinfo_proc_;
-+
-+ return true;
-+ }
-+ return false;
-+}
-+
-+bool NamedProcessIterator::IncludeEntry() {
-+ return (executable_name_ == entry().exe_file() &&
-+ ProcessIterator::IncludeEntry());
-+}
-+
-+
-+ProcessMetrics::ProcessMetrics(ProcessHandle process)
-+ : process_(process),
-+ last_time_(0),
-+ last_system_time_(0),
-+ last_cpu_(0) {
-+
-+ processor_count_ = base::SysInfo::NumberOfProcessors();
-+}
-+
-+// static
-+ProcessMetrics* ProcessMetrics::CreateProcessMetrics(ProcessHandle process) {
-+ return new ProcessMetrics(process);
-+}
-+
-+size_t ProcessMetrics::GetPagefileUsage() const {
-+ struct kinfo_proc info;
-+ int mib[6];
-+ size_t info_size = sizeof(info);
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_PID;
-+ mib[3] = process_;
-+ mib[4] = info_size;
-+ mib[5] = 400; /* XXX */
-+
-+ if (sysctl(mib, 6, &info, &info_size, NULL, 0) < 0)
-+ return 0;
-+
-+ return (info.p_vm_tsize + info.p_vm_dsize + info.p_vm_ssize);
-+}
-+
-+size_t ProcessMetrics::GetPeakPagefileUsage() const {
-+ printf("%s\n", __PRETTY_FUNCTION__);
-+
-+ return 0;
-+}
-+
-+size_t ProcessMetrics::GetWorkingSetSize() const {
-+ struct kinfo_proc info;
-+ int mib[6];
-+ size_t info_size = sizeof(info);
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_PID;
-+ mib[3] = process_;
-+ mib[4] = info_size;
-+ mib[5] = 400; /* XXX */
-+
-+ if (sysctl(mib, 6, &info, &info_size, NULL, 0) < 0)
-+ return 0;
-+
-+ return info.p_vm_rssize * getpagesize();
-+}
-+
-+size_t ProcessMetrics::GetPeakWorkingSetSize() const {
-+ printf("%s\n", __PRETTY_FUNCTION__);
-+
-+ return 0;
-+}
-+
-+bool ProcessMetrics::GetMemoryBytes(size_t* private_bytes,
-+ size_t* shared_bytes) {
-+ WorkingSetKBytes ws_usage;
-+
-+ if (!GetWorkingSetKBytes(&ws_usage))
-+ return false;
-+
-+ if (private_bytes)
-+ *private_bytes = ws_usage.priv << 10;
-+
-+ if (shared_bytes)
-+ *shared_bytes = ws_usage.shared * 1024;
-+
-+ return true;
-+}
-+
-+bool ProcessMetrics::GetWorkingSetKBytes(WorkingSetKBytes* ws_usage) const {
-+// TODO(bapt) be sure we can't be precise
-+ size_t priv = GetWorkingSetSize();
-+ if (!priv)
-+ return false;
-+ ws_usage->priv = priv / 1024;
-+ ws_usage->shareable = 0;
-+ ws_usage->shared = 0;
-+
-+ return true;
-+}
-+
-+bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const {
-+ return false;
-+}
-+
-+static int GetProcessCPU(pid_t pid) {
-+ struct kinfo_proc info;
-+ int mib[6];
-+ size_t info_size = sizeof(info);
-+
-+ mib[0] = CTL_KERN;
-+ mib[1] = KERN_PROC;
-+ mib[2] = KERN_PROC_PID;
-+ mib[3] = pid;
-+ mib[4] = info_size;
-+ mib[5] = 400; /* XXX */
-+
-+ if (sysctl(mib, 6, &info, &info_size, NULL, 0) < 0)
-+ return 0;
-+
-+ return info.p_pctcpu;
-+}
-+
-+double ProcessMetrics::GetCPUUsage() {
-+ struct timeval now;
-+
-+ int retval = gettimeofday(&now, NULL);
-+ if (retval)
-+ return 0;
-+
-+ int64 time = TimeValToMicroseconds(now);
-+
-+ if (last_time_ == 0) {
-+ // First call, just set the last values.
-+ last_time_ = time;
-+ last_cpu_ = GetProcessCPU(process_);
-+ return 0;
-+ }
-+
-+ int64 time_delta = time - last_time_;
-+ DCHECK_NE(time_delta, 0);
-+
-+ if (time_delta == 0)
-+ return 0;
-+
-+ int cpu = GetProcessCPU(process_);
-+
-+ last_time_ = time;
-+ last_cpu_ = cpu;
-+
-+ double percentage = static_cast<double>((cpu * 100.0) / FSCALE);
-+
-+ return percentage;
-+}
-+
-+size_t GetSystemCommitCharge() {
-+ int mib[2], pagesize;
-+ struct vmtotal vmtotal;
-+ unsigned long mem_total, mem_free, mem_inactive;
-+ size_t len = sizeof(vmtotal);
-+
-+ printf("%s\n", __PRETTY_FUNCTION__);
-+
-+ mib[0] = CTL_VM;
-+ mib[1] = VM_METER;
-+
-+ if (sysctl(mib, 2, &vmtotal, &len, NULL, 0) < 0)
-+ return 0;
-+
-+ mem_total = vmtotal.t_vm;
-+ mem_free = vmtotal.t_free;
-+ mem_inactive = vmtotal.t_vm - vmtotal.t_avm;
-+
-+ pagesize = getpagesize();
-+
-+ return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize);
-+}
-+
-+void EnableTerminationOnOutOfMemory() {
-+ NOTIMPLEMENTED();
-+ return;
-+}
-+}
diff --git a/chromium/patches/patch-base_process__util__posix.cc b/chromium/patches/patch-base_process__util__posix.cc
deleted file mode 100644
index 2f46eda859..0000000000
--- a/chromium/patches/patch-base_process__util__posix.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-base_process__util__posix.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/process_util_posix.cc.orig 2011-04-13 08:01:34.000000000 +0000
-+++ base/process_util_posix.cc
-@@ -102,11 +102,11 @@ int WaitpidWithTimeout(ProcessHandle han
- return status;
- }
-
--void StackDumpSignalHandler(int signal, siginfo_t* info, ucontext_t* context) {
-+void StackDumpSignalHandler(int signal, siginfo_t* info /*, ucontext_t* context */) {
- LOG(ERROR) << "Received signal " << signal;
- debug::StackTrace().PrintBacktrace();
-
-- // TODO(shess): Port to Linux.
-+ // TODO(shess): Port to Linux and OpenBSD.
- #if defined(OS_MACOSX)
- // TODO(shess): Port to 64-bit.
- #if ARCH_CPU_32_BITS
-@@ -276,10 +276,10 @@ typedef scoped_ptr_malloc<DIR, ScopedDIR
- #elif defined(OS_SOLARIS)
- static const rlim_t kSystemDefaultMaxFds = 8192;
- static const char kFDDir[] = "/dev/fd";
--#elif defined(OS_FREEBSD)
-+#elif defined(OS_FREEBSD) || defined(OS_DRAGONFLY)
- static const rlim_t kSystemDefaultMaxFds = 8192;
- static const char kFDDir[] = "/dev/fd";
--#elif defined(OS_OPENBSD)
-+#elif defined(OS_OPENBSD) || defined(OS_NETBSD)
- static const rlim_t kSystemDefaultMaxFds = 256;
- static const char kFDDir[] = "/dev/fd";
- #endif
diff --git a/chromium/patches/patch-base_shared__memory__posix.cc b/chromium/patches/patch-base_shared__memory__posix.cc
deleted file mode 100644
index a1b39cf891..0000000000
--- a/chromium/patches/patch-base_shared__memory__posix.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-base_shared__memory__posix.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/shared_memory_posix.cc.orig 2011-04-13 08:01:34.000000000 +0000
-+++ base/shared_memory_posix.cc
-@@ -149,7 +149,7 @@ bool SharedMemory::CreateNamed(const std
- created_size_ = size;
- }
- if (fp == NULL) {
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_BSD)
- PLOG(ERROR) << "Creating shared memory in " << path.value() << " failed";
- FilePath dir = path.DirName();
- if (access(dir.value().c_str(), W_OK | X_OK) < 0) {
diff --git a/chromium/patches/patch-base_string__util__posix.h b/chromium/patches/patch-base_string__util__posix.h
deleted file mode 100644
index d480c045cd..0000000000
--- a/chromium/patches/patch-base_string__util__posix.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-base_string__util__posix.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/string_util_posix.h.orig 2011-04-13 08:01:34.000000000 +0000
-+++ base/string_util_posix.h
-@@ -45,7 +45,12 @@ inline int strncmp16(const char16* s1, c
- inline int vswprintf(wchar_t* buffer, size_t size,
- const wchar_t* format, va_list arguments) {
- DCHECK(IsWprintfFormatPortable(format));
-+#if defined(OS_OPENBSD)
-+ // OpenBSD does not have a wide-char equivalent
-+ return ::vsnprintf((char *)buffer, size, (const char *)format, arguments);
-+#else
- return ::vswprintf(buffer, size, format, arguments);
-+#endif
- }
-
- } // namespace base
diff --git a/chromium/patches/patch-base_sys__info__dragonfly.cc b/chromium/patches/patch-base_sys__info__dragonfly.cc
deleted file mode 100644
index 236e89209d..0000000000
--- a/chromium/patches/patch-base_sys__info__dragonfly.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-base_sys__info__dragonfly.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- base/sys_info_dragonfly.cc.orig 2011-05-26 07:37:00.000000000 +0000
-+++ base/sys_info_dragonfly.cc
-@@ -0,0 +1,25 @@
-+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "base/sys_info.h"
-+
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+
-+#include "base/logging.h"
-+
-+namespace base {
-+
-+int SysInfo::NumberOfProcessors() {
-+ int mib[] = { CTL_HW, HW_NCPU };
-+ int ncpu;
-+ size_t size = sizeof(ncpu);
-+ if (sysctl(mib, 2, &ncpu, &size, NULL, 0) == -1) {
-+ NOTREACHED();
-+ return 1;
-+ }
-+ return ncpu;
-+}
-+
-+} // namespace base
diff --git a/chromium/patches/patch-base_sys__info__linux.cc b/chromium/patches/patch-base_sys__info__linux.cc
deleted file mode 100644
index 2da76a2c57..0000000000
--- a/chromium/patches/patch-base_sys__info__linux.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-base_sys__info__linux.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/sys_info_linux.cc.orig 2011-04-13 08:01:34.000000000 +0000
-+++ base/sys_info_linux.cc
-@@ -10,7 +10,11 @@
- namespace base {
-
- int64 SysInfo::AmountOfPhysicalMemory() {
-+#ifdef _SC_PHYS_PAGES
- long pages = sysconf(_SC_PHYS_PAGES);
-+#else
-+ long pages = -1;
-+#endif
- long page_size = sysconf(_SC_PAGE_SIZE);
- if (pages == -1 || page_size == -1) {
- NOTREACHED();
diff --git a/chromium/patches/patch-base_sys__info__netbsd.cc b/chromium/patches/patch-base_sys__info__netbsd.cc
deleted file mode 100644
index 23b0a40817..0000000000
--- a/chromium/patches/patch-base_sys__info__netbsd.cc
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-base_sys__info__netbsd.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/sys_info_netbsd.cc.orig 2011-04-26 05:17:12.000000000 +0000
-+++ base/sys_info_netbsd.cc
-@@ -0,0 +1,25 @@
-+// Copyright (c) 2009 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#include "base/sys_info.h"
-+
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+
-+#include "base/logging.h"
-+
-+namespace base {
-+
-+int SysInfo::NumberOfProcessors() {
-+ int mib[] = { CTL_HW, HW_NCPU };
-+ int ncpu;
-+ size_t size = sizeof(ncpu);
-+ if (sysctl(mib, 2, &ncpu, &size, NULL, 0) == -1) {
-+ NOTREACHED();
-+ return 1;
-+ }
-+ return ncpu;
-+}
-+
-+} // namespace base
diff --git a/chromium/patches/patch-base_sys__info__posix.cc b/chromium/patches/patch-base_sys__info__posix.cc
deleted file mode 100644
index 6794353721..0000000000
--- a/chromium/patches/patch-base_sys__info__posix.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-base_sys__info__posix.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/sys_info_posix.cc.orig 2011-04-13 08:01:34.000000000 +0000
-+++ base/sys_info_posix.cc
-@@ -23,7 +23,7 @@
-
- namespace base {
-
--#if !defined(OS_OPENBSD)
-+#if !defined(OS_BSD)
- int SysInfo::NumberOfProcessors() {
- // It seems that sysconf returns the number of "logical" processors on both
- // Mac and Linux. So we get the number of "online logical" processors.
diff --git a/chromium/patches/patch-base_test_test__file__util__linux.cc b/chromium/patches/patch-base_test_test__file__util__linux.cc
deleted file mode 100644
index 05c54882d0..0000000000
--- a/chromium/patches/patch-base_test_test__file__util__linux.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-base_test_test__file__util__linux.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- base/test/test_file_util_linux.cc.orig 2011-05-24 08:01:33.000000000 +0000
-+++ base/test/test_file_util_linux.cc
-@@ -16,10 +16,15 @@ bool EvictFileFromSystemCache(const File
- int fd = open(file.value().c_str(), O_RDONLY);
- if (fd < 0)
- return false;
-+#if defined(OS_OPENBSD) || defined(OS_DRAGONFLY)
-+ if (fsync(fd) != 0)
-+ return false;
-+#else
- if (fdatasync(fd) != 0)
- return false;
- if (posix_fadvise(fd, 0, 0, POSIX_FADV_DONTNEED) != 0)
- return false;
-+#endif
- close(fd);
- return true;
- }
diff --git a/chromium/patches/patch-base_test_test__file__util__posix.cc b/chromium/patches/patch-base_test_test__file__util__posix.cc
deleted file mode 100644
index 7a31681697..0000000000
--- a/chromium/patches/patch-base_test_test__file__util__posix.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-base_test_test__file__util__posix.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/test/test_file_util_posix.cc.orig 2011-04-13 08:01:34.000000000 +0000
-+++ base/test/test_file_util_posix.cc
-@@ -101,7 +101,7 @@ bool CopyRecursiveDirNoCache(const FileP
- return success;
- }
-
--#if !defined(OS_LINUX) && !defined(OS_MACOSX)
-+#if !defined(OS_POSIX)
- bool EvictFileFromSystemCache(const FilePath& file) {
- // There doesn't seem to be a POSIX way to cool the disk cache.
- NOTIMPLEMENTED();
diff --git a/chromium/patches/patch-base_third__party_dmg__fp_dtoa.cc b/chromium/patches/patch-base_third__party_dmg__fp_dtoa.cc
deleted file mode 100644
index 81aa134209..0000000000
--- a/chromium/patches/patch-base_third__party_dmg__fp_dtoa.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-base_third__party_dmg__fp_dtoa.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/third_party/dmg_fp/dtoa.cc.orig 2011-04-13 08:01:34.000000000 +0000
-+++ base/third_party/dmg_fp/dtoa.cc
-@@ -1559,7 +1559,7 @@ hexnan
- CONST char *s;
- int c1, havedig, udx0, xshift;
-
-- if (!hexdig['0'])
-+ if (!hexdig[(int)'0'])
- hexdig_init();
- x[0] = x[1] = 0;
- havedig = xshift = 0;
-@@ -3283,7 +3283,7 @@ strtod
- #ifdef Avoid_Underflow
- if (bc.scale && y <= 2*P*Exp_msk1) {
- if (aadj <= 0x7fffffff) {
-- if ((z = aadj) <= 0)
-+ if ((z = (ULong)aadj) <= 0)
- z = 1;
- aadj = z;
- aadj1 = bc.dsign ? aadj : -aadj;
-@@ -3837,7 +3837,7 @@ dtoa
- */
- dval(&eps) = 0.5/tens[ilim-1] - dval(&eps);
- for(i = 0;;) {
-- L = dval(&u);
-+ L = (int)dval(&u);
- dval(&u) -= L;
- *s++ = '0' + (int)L;
- if (dval(&u) < dval(&eps))
diff --git a/chromium/patches/patch-base_third__party_nspr_prcpucfg.h b/chromium/patches/patch-base_third__party_nspr_prcpucfg.h
deleted file mode 100644
index 67b5450f81..0000000000
--- a/chromium/patches/patch-base_third__party_nspr_prcpucfg.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-base_third__party_nspr_prcpucfg.h,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- base/third_party/nspr/prcpucfg.h.orig 2011-05-24 08:01:33.000000000 +0000
-+++ base/third_party/nspr/prcpucfg.h
-@@ -36,8 +36,10 @@
- #include "base/third_party/nspr/prcpucfg_mac.h"
- #elif defined(__linux__) || defined(__native_client__)
- #include "base/third_party/nspr/prcpucfg_linux.h"
--#elif defined(__FreeBSD__)
-+#elif defined(__FreeBSD__) || defined(__DragonFly__)
- #include "base/third_party/nspr/prcpucfg_freebsd.h"
-+#elif defined(__NetBSD__)
-+#include "base/third_party/nspr/prcpucfg_netbsd.h"
- #elif defined(__OpenBSD__)
- #include "base/third_party/nspr/prcpucfg_openbsd.h"
- #elif defined(__sun)
diff --git a/chromium/patches/patch-base_third__party_nspr_prcpucfg__netbsd.h b/chromium/patches/patch-base_third__party_nspr_prcpucfg__netbsd.h
deleted file mode 100644
index 5e46cd1f56..0000000000
--- a/chromium/patches/patch-base_third__party_nspr_prcpucfg__netbsd.h
+++ /dev/null
@@ -1,388 +0,0 @@
-$NetBSD: patch-base_third__party_nspr_prcpucfg__netbsd.h,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- base/third_party/nspr/prcpucfg_netbsd.h.orig 2011-05-26 07:37:00.000000000 +0000
-+++ base/third_party/nspr/prcpucfg_netbsd.h
-@@ -0,0 +1,383 @@
-+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is the Netscape Portable Runtime (NSPR).
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Netscape Communications Corporation.
-+ * Portions created by the Initial Developer are Copyright (C) 1998-2000
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *
-+ * Alternatively, the contents of this file may be used under the terms of
-+ * either the GNU General Public License Version 2 or later (the "GPL"), or
-+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-+ * in which case the provisions of the GPL or the LGPL are applicable instead
-+ * of those above. If you wish to allow use of your version of this file only
-+ * under the terms of either the GPL or the LGPL, and not to allow others to
-+ * use your version of this file under the terms of the MPL, indicate your
-+ * decision by deleting the provisions above and replace them with the notice
-+ * and other provisions required by the GPL or the LGPL. If you do not delete
-+ * the provisions above, a recipient may use your version of this file under
-+ * the terms of any one of the MPL, the GPL or the LGPL.
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#ifndef nspr_cpucfg___
-+#define nspr_cpucfg___
-+
-+#ifndef XP_UNIX
-+#define XP_UNIX
-+#endif
-+
-+#ifndef NETBSD
-+#define NETBSD
-+#endif
-+
-+#define PR_AF_INET6 24 /* same as AF_INET6 */
-+
-+#ifndef HAVE_LONG_LONG
-+#define HAVE_LONG_LONG
-+#endif
-+
-+#if defined(__i386__) || defined(__arm32__) || defined(__ARMEL__) || \
-+ defined(__MIPSEL__)
-+
-+#define IS_LITTLE_ENDIAN 1
-+#undef IS_BIG_ENDIAN
-+#undef HAVE_ALIGNED_DOUBLES
-+#undef HAVE_ALIGNED_LONGLONGS
-+
-+#define PR_BYTES_PER_BYTE 1
-+#define PR_BYTES_PER_SHORT 2
-+#define PR_BYTES_PER_INT 4
-+#define PR_BYTES_PER_INT64 8
-+#define PR_BYTES_PER_LONG 4
-+#define PR_BYTES_PER_FLOAT 4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD 4
-+#define PR_BYTES_PER_DWORD 8
-+#define PR_BYTES_PER_WORD_LOG2 2
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
-+#define PR_BITS_PER_BYTE 8
-+#define PR_BITS_PER_SHORT 16
-+#define PR_BITS_PER_INT 32
-+#define PR_BITS_PER_INT64 64
-+#define PR_BITS_PER_LONG 32
-+#define PR_BITS_PER_FLOAT 32
-+#define PR_BITS_PER_DOUBLE 64
-+#define PR_BITS_PER_WORD 32
-+
-+#define PR_BITS_PER_BYTE_LOG2 3
-+#define PR_BITS_PER_SHORT_LOG2 4
-+#define PR_BITS_PER_INT_LOG2 5
-+#define PR_BITS_PER_INT64_LOG2 6
-+#define PR_BITS_PER_LONG_LOG2 5
-+#define PR_BITS_PER_FLOAT_LOG2 5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2 5
-+
-+#define PR_ALIGN_OF_SHORT 2
-+#define PR_ALIGN_OF_INT 4
-+#define PR_ALIGN_OF_LONG 4
-+#define PR_ALIGN_OF_INT64 4
-+#define PR_ALIGN_OF_FLOAT 4
-+#define PR_ALIGN_OF_DOUBLE 4
-+#define PR_ALIGN_OF_POINTER 4
-+
-+#elif defined(__sparc_v9__)
-+
-+#undef IS_LITTLE_ENDIAN
-+#define IS_BIG_ENDIAN 1
-+#define HAVE_ALIGNED_DOUBLES
-+#define HAVE_ALIGNED_LONGLONGS
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE 1
-+#define PR_BYTES_PER_SHORT 2
-+#define PR_BYTES_PER_INT 4
-+#define PR_BYTES_PER_INT64 8
-+#define PR_BYTES_PER_LONG 8
-+#define PR_BYTES_PER_FLOAT 4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD 8
-+#define PR_BYTES_PER_DWORD 8
-+#define PR_BYTES_PER_WORD_LOG2 3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
-+#define PR_BITS_PER_BYTE 8
-+#define PR_BITS_PER_SHORT 16
-+#define PR_BITS_PER_INT 32
-+#define PR_BITS_PER_INT64 64
-+#define PR_BITS_PER_LONG 64
-+#define PR_BITS_PER_FLOAT 32
-+#define PR_BITS_PER_DOUBLE 64
-+#define PR_BITS_PER_WORD 64
-+
-+#define PR_BITS_PER_BYTE_LOG2 3
-+#define PR_BITS_PER_SHORT_LOG2 4
-+#define PR_BITS_PER_INT_LOG2 5
-+#define PR_BITS_PER_INT64_LOG2 6
-+#define PR_BITS_PER_LONG_LOG2 6
-+#define PR_BITS_PER_FLOAT_LOG2 5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2 6
-+
-+#define PR_ALIGN_OF_SHORT 2
-+#define PR_ALIGN_OF_INT 4
-+#define PR_ALIGN_OF_LONG 8
-+#define PR_ALIGN_OF_INT64 8
-+#define PR_ALIGN_OF_FLOAT 4
-+#define PR_ALIGN_OF_DOUBLE 8
-+#define PR_ALIGN_OF_POINTER 8
-+
-+#elif defined(__sparc__) || defined(__MIPSEB__) || defined(__ARMEB__)
-+
-+#undef IS_LITTLE_ENDIAN
-+#define IS_BIG_ENDIAN 1
-+#define HAVE_ALIGNED_DOUBLES
-+#define HAVE_ALIGNED_LONGLONGS
-+
-+#define PR_BYTES_PER_BYTE 1
-+#define PR_BYTES_PER_SHORT 2
-+#define PR_BYTES_PER_INT 4
-+#define PR_BYTES_PER_INT64 8
-+#define PR_BYTES_PER_LONG 4
-+#define PR_BYTES_PER_FLOAT 4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD 4
-+#define PR_BYTES_PER_DWORD 8
-+#define PR_BYTES_PER_WORD_LOG2 2
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
-+#define PR_BITS_PER_BYTE 8
-+#define PR_BITS_PER_SHORT 16
-+#define PR_BITS_PER_INT 32
-+#define PR_BITS_PER_INT64 64
-+#define PR_BITS_PER_LONG 32
-+#define PR_BITS_PER_FLOAT 32
-+#define PR_BITS_PER_DOUBLE 64
-+#define PR_BITS_PER_WORD 32
-+
-+#define PR_BITS_PER_BYTE_LOG2 3
-+#define PR_BITS_PER_SHORT_LOG2 4
-+#define PR_BITS_PER_INT_LOG2 5
-+#define PR_BITS_PER_INT64_LOG2 6
-+#define PR_BITS_PER_LONG_LOG2 5
-+#define PR_BITS_PER_FLOAT_LOG2 5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2 5
-+
-+#define PR_ALIGN_OF_SHORT 2
-+#define PR_ALIGN_OF_INT 4
-+#define PR_ALIGN_OF_LONG 4
-+#define PR_ALIGN_OF_INT64 8
-+#define PR_ALIGN_OF_FLOAT 4
-+#define PR_ALIGN_OF_DOUBLE 8
-+#define PR_ALIGN_OF_POINTER 4
-+
-+#elif defined(__alpha__)
-+#define IS_LITTLE_ENDIAN 1
-+#undef IS_BIG_ENDIAN
-+#define HAVE_ALIGNED_DOUBLES
-+#define HAVE_ALIGNED_LONGLONGS
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE 1
-+#define PR_BYTES_PER_SHORT 2
-+#define PR_BYTES_PER_INT 4
-+#define PR_BYTES_PER_INT64 8
-+#define PR_BYTES_PER_LONG 8
-+#define PR_BYTES_PER_FLOAT 4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD 8
-+#define PR_BYTES_PER_DWORD 8
-+
-+#define PR_BITS_PER_BYTE 8
-+#define PR_BITS_PER_SHORT 16
-+#define PR_BITS_PER_INT 32
-+#define PR_BITS_PER_INT64 64
-+#define PR_BITS_PER_LONG 64
-+#define PR_BITS_PER_FLOAT 32
-+#define PR_BITS_PER_DOUBLE 64
-+#define PR_BITS_PER_WORD 64
-+
-+#define PR_BITS_PER_BYTE_LOG2 3
-+#define PR_BITS_PER_SHORT_LOG2 4
-+#define PR_BITS_PER_INT_LOG2 5
-+#define PR_BITS_PER_INT64_LOG2 6
-+#define PR_BITS_PER_LONG_LOG2 6
-+#define PR_BITS_PER_FLOAT_LOG2 5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2 6
-+
-+#define PR_ALIGN_OF_SHORT 2
-+#define PR_ALIGN_OF_INT 4
-+#define PR_ALIGN_OF_LONG 8
-+#define PR_ALIGN_OF_INT64 8
-+#define PR_ALIGN_OF_FLOAT 4
-+#define PR_ALIGN_OF_DOUBLE 8
-+#define PR_ALIGN_OF_POINTER 8
-+
-+#define PR_BYTES_PER_WORD_LOG2 3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
-+#elif defined(__amd64__)
-+#define IS_LITTLE_ENDIAN 1
-+#undef IS_BIG_ENDIAN
-+#define HAVE_ALIGNED_DOUBLES
-+#define HAVE_ALIGNED_LONGLONGS
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE 1
-+#define PR_BYTES_PER_SHORT 2
-+#define PR_BYTES_PER_INT 4
-+#define PR_BYTES_PER_INT64 8
-+#define PR_BYTES_PER_LONG 8
-+#define PR_BYTES_PER_FLOAT 4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD 8
-+#define PR_BYTES_PER_DWORD 8
-+
-+#define PR_BITS_PER_BYTE 8
-+#define PR_BITS_PER_SHORT 16
-+#define PR_BITS_PER_INT 32
-+#define PR_BITS_PER_INT64 64
-+#define PR_BITS_PER_LONG 64
-+#define PR_BITS_PER_FLOAT 32
-+#define PR_BITS_PER_DOUBLE 64
-+#define PR_BITS_PER_WORD 64
-+
-+#define PR_BITS_PER_BYTE_LOG2 3
-+#define PR_BITS_PER_SHORT_LOG2 4
-+#define PR_BITS_PER_INT_LOG2 5
-+#define PR_BITS_PER_INT64_LOG2 6
-+#define PR_BITS_PER_LONG_LOG2 6
-+#define PR_BITS_PER_FLOAT_LOG2 5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2 6
-+
-+#define PR_ALIGN_OF_SHORT 2
-+#define PR_ALIGN_OF_INT 4
-+#define PR_ALIGN_OF_LONG 8
-+#define PR_ALIGN_OF_INT64 8
-+#define PR_ALIGN_OF_FLOAT 4
-+#define PR_ALIGN_OF_DOUBLE 8
-+#define PR_ALIGN_OF_POINTER 8
-+#define PR_ALIGN_OF_WORD 8
-+
-+#define PR_BYTES_PER_WORD_LOG2 3
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
-+#elif defined(__powerpc__) || defined(__m68k__)
-+
-+#undef IS_LITTLE_ENDIAN
-+#define IS_BIG_ENDIAN 1
-+#undef HAVE_ALIGNED_DOUBLES
-+#undef HAVE_ALIGNED_LONGLONGS
-+
-+#define PR_BYTES_PER_BYTE 1
-+#define PR_BYTES_PER_SHORT 2
-+#define PR_BYTES_PER_INT 4
-+#define PR_BYTES_PER_INT64 8
-+#define PR_BYTES_PER_LONG 4
-+#define PR_BYTES_PER_FLOAT 4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD 4
-+#define PR_BYTES_PER_DWORD 8
-+
-+#define PR_BITS_PER_BYTE 8
-+#define PR_BITS_PER_SHORT 16
-+#define PR_BITS_PER_INT 32
-+#define PR_BITS_PER_INT64 64
-+#define PR_BITS_PER_LONG 32
-+#define PR_BITS_PER_FLOAT 32
-+#define PR_BITS_PER_DOUBLE 64
-+#define PR_BITS_PER_WORD 32
-+
-+#define PR_BITS_PER_BYTE_LOG2 3
-+#define PR_BITS_PER_SHORT_LOG2 4
-+#define PR_BITS_PER_INT_LOG2 5
-+#define PR_BITS_PER_INT64_LOG2 6
-+#define PR_BITS_PER_LONG_LOG2 5
-+#define PR_BITS_PER_FLOAT_LOG2 5
-+#define PR_BITS_PER_DOUBLE_LOG2 6
-+#define PR_BITS_PER_WORD_LOG2 5
-+
-+#define PR_ALIGN_OF_SHORT 2
-+#define PR_ALIGN_OF_INT 4
-+#define PR_ALIGN_OF_LONG 4
-+#define PR_ALIGN_OF_INT64 4
-+#define PR_ALIGN_OF_FLOAT 4
-+#define PR_ALIGN_OF_DOUBLE 4
-+#define PR_ALIGN_OF_POINTER 4
-+
-+#define PR_BYTES_PER_WORD_LOG2 2
-+#define PR_BYTES_PER_DWORD_LOG2 3
-+
-+#else
-+
-+#error Must define constants for type sizes here.
-+
-+#endif
-+
-+
-+#ifndef NO_NSPR_10_SUPPORT
-+
-+#define BYTES_PER_BYTE PR_BYTES_PER_BYTE
-+#define BYTES_PER_SHORT PR_BYTES_PER_SHORT
-+#define BYTES_PER_INT PR_BYTES_PER_INT
-+#define BYTES_PER_INT64 PR_BYTES_PER_INT64
-+#define BYTES_PER_LONG PR_BYTES_PER_LONG
-+#define BYTES_PER_FLOAT PR_BYTES_PER_FLOAT
-+#define BYTES_PER_DOUBLE PR_BYTES_PER_DOUBLE
-+#define BYTES_PER_WORD PR_BYTES_PER_WORD
-+#define BYTES_PER_DWORD PR_BYTES_PER_DWORD
-+
-+#define BITS_PER_BYTE PR_BITS_PER_BYTE
-+#define BITS_PER_SHORT PR_BITS_PER_SHORT
-+#define BITS_PER_INT PR_BITS_PER_INT
-+#define BITS_PER_INT64 PR_BITS_PER_INT64
-+#define BITS_PER_LONG PR_BITS_PER_LONG
-+#define BITS_PER_FLOAT PR_BITS_PER_FLOAT
-+#define BITS_PER_DOUBLE PR_BITS_PER_DOUBLE
-+#define BITS_PER_WORD PR_BITS_PER_WORD
-+
-+#define BITS_PER_BYTE_LOG2 PR_BITS_PER_BYTE_LOG2
-+#define BITS_PER_SHORT_LOG2 PR_BITS_PER_SHORT_LOG2
-+#define BITS_PER_INT_LOG2 PR_BITS_PER_INT_LOG2
-+#define BITS_PER_INT64_LOG2 PR_BITS_PER_INT64_LOG2
-+#define BITS_PER_LONG_LOG2 PR_BITS_PER_LONG_LOG2
-+#define BITS_PER_FLOAT_LOG2 PR_BITS_PER_FLOAT_LOG2
-+#define BITS_PER_DOUBLE_LOG2 PR_BITS_PER_DOUBLE_LOG2
-+#define BITS_PER_WORD_LOG2 PR_BITS_PER_WORD_LOG2
-+
-+#define ALIGN_OF_SHORT PR_ALIGN_OF_SHORT
-+#define ALIGN_OF_INT PR_ALIGN_OF_INT
-+#define ALIGN_OF_LONG PR_ALIGN_OF_LONG
-+#define ALIGN_OF_INT64 PR_ALIGN_OF_INT64
-+#define ALIGN_OF_FLOAT PR_ALIGN_OF_FLOAT
-+#define ALIGN_OF_DOUBLE PR_ALIGN_OF_DOUBLE
-+#define ALIGN_OF_POINTER PR_ALIGN_OF_POINTER
-+#define ALIGN_OF_WORD PR_ALIGN_OF_WORD
-+
-+#define BYTES_PER_WORD_LOG2 PR_BYTES_PER_WORD_LOG2
-+#define BYTES_PER_DWORD_LOG2 PR_BYTES_PER_DWORD_LOG2
-+#define WORDS_PER_DWORD_LOG2 PR_WORDS_PER_DWORD_LOG2
-+
-+#endif /* NO_NSPR_10_SUPPORT */
-+
-+#endif /* nspr_cpucfg___ */
diff --git a/chromium/patches/patch-base_third__party_symbolize_utilities.h b/chromium/patches/patch-base_third__party_symbolize_utilities.h
deleted file mode 100644
index f7dbc889e8..0000000000
--- a/chromium/patches/patch-base_third__party_symbolize_utilities.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-base_third__party_symbolize_utilities.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/third_party/symbolize/utilities.h.orig 2011-04-13 08:01:34.000000000 +0000
-+++ base/third_party/symbolize/utilities.h
-@@ -6,6 +6,10 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--typedef uint64_t uint64;
-+#if __LP64__
-+typedef unsigned long uint64;
-+#else
-+typedef unsigned long long uint64;
-+#endif
- #define HAVE_SYMBOLIZE 1
- #define ATTRIBUTE_NOINLINE __attribute__ ((noinline))
diff --git a/chromium/patches/patch-base_threading_platform__thread__posix.cc b/chromium/patches/patch-base_threading_platform__thread__posix.cc
deleted file mode 100644
index bf45b81a98..0000000000
--- a/chromium/patches/patch-base_threading_platform__thread__posix.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-base_threading_platform__thread__posix.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/threading/platform_thread_posix.cc.orig 2011-04-13 08:01:34.000000000 +0000
-+++ base/threading/platform_thread_posix.cc
-@@ -124,7 +124,7 @@ PlatformThreadId PlatformThread::Current
- return mach_thread_self();
- #elif defined(OS_LINUX)
- return syscall(__NR_gettid);
--#elif defined(OS_FREEBSD)
-+#elif defined(OS_BSD)
- // TODO(BSD): find a better thread ID
- return reinterpret_cast<int64>(pthread_self());
- #elif defined(OS_NACL)
diff --git a/chromium/patches/patch-base_threading_worker__pool__posix.cc b/chromium/patches/patch-base_threading_worker__pool__posix.cc
deleted file mode 100644
index 38605b661f..0000000000
--- a/chromium/patches/patch-base_threading_worker__pool__posix.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-base_threading_worker__pool__posix.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/threading/worker_pool_posix.cc.orig 2011-04-13 08:01:34.000000000 +0000
-+++ base/threading/worker_pool_posix.cc
-@@ -19,7 +19,7 @@ namespace {
- const int kIdleSecondsBeforeExit = 10 * 60;
- // A stack size of 64 KB is too small for the CERT_PKIXVerifyCert
- // function of NSS because of NSS bug 439169.
--const int kWorkerThreadStackSize = 128 * 1024;
-+const int kWorkerThreadStackSize = 256 * 1024;
-
- class WorkerPoolImpl {
- public:
diff --git a/chromium/patches/patch-base_time__posix.cc b/chromium/patches/patch-base_time__posix.cc
deleted file mode 100644
index ed3eacea05..0000000000
--- a/chromium/patches/patch-base_time__posix.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-base_time__posix.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- base/time_posix.cc.orig 2011-04-13 08:01:34.000000000 +0000
-+++ base/time_posix.cc
-@@ -160,7 +160,7 @@ Time Time::FromExploded(bool is_local, c
- // FreeBSD 6 has CLOCK_MONOLITHIC but defines _POSIX_MONOTONIC_CLOCK to -1.
- #if (defined(OS_POSIX) && \
- defined(_POSIX_MONOTONIC_CLOCK) && _POSIX_MONOTONIC_CLOCK >= 0) || \
-- defined(OS_FREEBSD) || defined(OS_OPENBSD)
-+ defined(OS_BSD)
-
- // static
- TimeTicks TimeTicks::Now() {
diff --git a/chromium/patches/patch-build_all.gyp b/chromium/patches/patch-build_all.gyp
deleted file mode 100644
index c76c9fb967..0000000000
--- a/chromium/patches/patch-build_all.gyp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-build_all.gyp,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- build/all.gyp.orig 2011-04-13 08:01:33.000000000 +0000
-+++ build/all.gyp
-@@ -87,7 +87,7 @@
- }],
- ],
- }],
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../tools/gtk_clipboard_dump/gtk_clipboard_dump.gyp:*',
- '../tools/xdisplaycheck/xdisplaycheck.gyp:*',
diff --git a/chromium/patches/patch-build_build__config.h b/chromium/patches/patch-build_build__config.h
deleted file mode 100644
index ff4c894941..0000000000
--- a/chromium/patches/patch-build_build__config.h
+++ /dev/null
@@ -1,53 +0,0 @@
-$NetBSD: patch-build_build__config.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- build/build_config.h.orig 2011-04-13 08:01:33.000000000 +0000
-+++ build/build_config.h
-@@ -28,9 +28,15 @@
- #elif defined(_WIN32)
- #define OS_WIN 1
- #define TOOLKIT_VIEWS 1
-+#elif defined(__DragonFly__)
-+#define OS_DRAGONFLY 1
-+#define TOOLKIT_GTK
- #elif defined(__FreeBSD__)
- #define OS_FREEBSD 1
- #define TOOLKIT_GTK
-+#elif defined(__NetBSD__)
-+#define OS_NETBSD 1
-+#define TOOLKIT_GTK
- #elif defined(__OpenBSD__)
- #define OS_OPENBSD 1
- #define TOOLKIT_GTK
-@@ -47,8 +53,8 @@
- #define TOOLKIT_USES_GTK 1
- #endif
-
--#if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD) || \
-- defined(OS_SOLARIS)
-+#if defined(OS_LINUX) || defined(OS_DRAGONFLY) || defined(OS_FREEBSD) || \
-+ defined(OS_NETBSD) || defined(OS_OPENBSD) || defined(OS_SOLARIS)
- #if !defined(USE_OPENSSL)
- #define USE_NSS 1 // Default to use NSS for crypto, unless OpenSSL is chosen.
- #endif
-@@ -61,13 +67,19 @@
-
- // For access to standard POSIXish features, use OS_POSIX instead of a
- // more specific macro.
--#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || \
-- defined(OS_OPENBSD) || defined(OS_SOLARIS) || defined(OS_NACL)
-+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_DRAGONFLY) || \
-+ defined(OS_FREEBSD) || defined(OS_NETBSD) || defined(OS_OPENBSD) || \
-+ defined(OS_SOLARIS) || defined(OS_NACL)
- #define OS_POSIX 1
- // Use base::DataPack for name/value pairs.
- #define USE_BASE_DATA_PACK 1
- #endif
-
-+#if defined(OS_DRAGONFLY) || defined(OS_FREEBSD) || defined(OS_NETBSD) || \
-+ defined(OS_OPENBSD)
-+#define OS_BSD 1
-+#endif
-+
- // Use tcmalloc
- #if (defined(OS_WIN) || defined(OS_LINUX)) && !defined(NO_TCMALLOC)
- #define USE_TCMALLOC 1
diff --git a/chromium/patches/patch-build_common.gypi b/chromium/patches/patch-build_common.gypi
deleted file mode 100644
index 99fd37f097..0000000000
--- a/chromium/patches/patch-build_common.gypi
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-build_common.gypi,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- build/common.gypi.orig 2011-05-24 08:01:32.000000000 +0000
-+++ build/common.gypi
-@@ -42,7 +42,7 @@
-
- # Compute the architecture that we're building on.
- 'conditions': [
-- [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ [ 'OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- # This handles the Linux platforms we generally deal with. Anything
- # else gets passed through, which probably won't work very well; such
- # hosts should pass an explicit target_arch to gyp.
-@@ -389,7 +389,7 @@
- 'icu_src_dir': '../third_party/icu',
-
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- # This will set gcc_version to XY if you are running gcc X.Y.*.
- # This is used to tweak build flags for gcc 4.4.
- 'gcc_version%': '<!(python <(DEPTH)/build/compiler_version.py)',
-@@ -690,7 +690,7 @@
- 'target_conditions': [
- ['chromium_code==0', {
- 'conditions': [
-- [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ [ 'OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- # We don't want to get warnings from third-party code,
- # so remove any existing warning-enabling flags like -Wall.
- 'cflags!': [
-@@ -745,14 +745,14 @@
- ['exclude', '(^|/)(cocoa|mac)/'],
- ['exclude', '\\.mm?$' ] ],
- }],
-- ['OS!="linux" and OS!="freebsd" and OS!="openbsd"', {
-+ ['OS!="linux" and OS!="dragonfly" and OS!="freebsd" and OS!="netbsd" and OS!="openbsd"', {
- 'sources/': [
- ['exclude', '_(chromeos|gtk|x|x11|xdg)(_unittest)?\\.(h|cc)$'],
- ['exclude', '(^|/)gtk/'],
- ['exclude', '(^|/)(gtk|x11)_[^/]*\\.(h|cc)$'],
- ],
- }],
-- ['OS!="linux"', {
-+ ['OS!="linux" and OS!="dragonfly" and OS!="freebsd" and OS!="netbsd" and OS!="openbsd"', {
- 'sources/': [
- ['exclude', '_linux(_unittest)?\\.(h|cc)$'],
- ['exclude', '(^|/)linux/'],
-@@ -971,7 +971,7 @@
- },
- },
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'target_defaults': {
- # Enable -Werror by default, but put it in a variable so it can
- # be disabled in ~/.gyp/include.gypi on the valgrind builders.
-@@ -984,7 +984,9 @@
- # aliasing issues have been fixed.
- 'no_strict_aliasing%': 1,
- 'conditions': [['OS=="linux"', {'werror%': '-Werror',}],
-+ ['OS=="dragonfly"', {'werror%': '',}],
- ['OS=="freebsd"', {'werror%': '',}],
-+ ['OS=="netbsd"', {'werror%': '',}],
- ['OS=="openbsd"', {'werror%': '',}],
- ],
- },
-@@ -1053,7 +1055,7 @@
- # Specifically tell the linker to perform optimizations.
- # See http://lwn.net/Articles/192624/ .
- '-Wl,-O1',
-- '-Wl,--as-needed',
-+ #'-Wl,--as-needed',
- ],
- 'conditions' : [
- ['no_gc_sections==0', {
diff --git a/chromium/patches/patch-build_features__override.gypi b/chromium/patches/patch-build_features__override.gypi
deleted file mode 100644
index 4a69d5c6ab..0000000000
--- a/chromium/patches/patch-build_features__override.gypi
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-build_features__override.gypi,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- build/features_override.gypi.orig 2011-04-13 08:01:33.000000000 +0000
-+++ build/features_override.gypi
-@@ -72,7 +72,7 @@
- 'enable_svg%': '<(enable_svg)',
- 'enable_touch_events%': '<(enable_touch_events)',
- 'conditions': [
-- ['(OS=="win" or OS=="linux" or OS=="mac") and use_accelerated_compositing==1', {
-+ ['(OS=="win" or OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="mac") and use_accelerated_compositing==1', {
- 'feature_defines': [
- 'WTF_USE_ACCELERATED_COMPOSITING=1',
- 'ENABLE_3D_RENDERING=1',
diff --git a/chromium/patches/patch-build_linux_python__arch.sh b/chromium/patches/patch-build_linux_python__arch.sh
deleted file mode 100644
index 5cdd2fa287..0000000000
--- a/chromium/patches/patch-build_linux_python__arch.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-build_linux_python__arch.sh,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- build/linux/python_arch.sh.orig 2011-05-24 08:01:31.000000000 +0000
-+++ build/linux/python_arch.sh
-@@ -10,7 +10,7 @@
- # python_arch.sh /path/to/sysroot/usr/lib/libpython2.4.so.1.0
- #
-
--python=$(readlink -f "$1")
-+python=$(readlink "$1")
- if [ ! -r "$python" ]; then
- echo unknown
- exit 0;
diff --git a/chromium/patches/patch-chrome_app_chrome__exe__main__gtk.cc b/chromium/patches/patch-chrome_app_chrome__exe__main__gtk.cc
deleted file mode 100644
index e39e59e3e8..0000000000
--- a/chromium/patches/patch-chrome_app_chrome__exe__main__gtk.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-chrome_app_chrome__exe__main__gtk.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/app/chrome_exe_main_gtk.cc.orig 2011-04-13 08:01:37.000000000 +0000
-+++ chrome/app/chrome_exe_main_gtk.cc
-@@ -3,7 +3,7 @@
- // found in the LICENSE file.
-
- #include "base/process_util.h"
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- #include "chrome/browser/first_run/first_run.h"
- #endif
-
-@@ -19,11 +19,11 @@
- extern "C" {
- int ChromeMain(int argc, const char** argv);
-
--#if defined(OS_LINUX) && defined(USE_TCMALLOC)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_TCMALLOC)
-
- int tc_set_new_mode(int mode);
-
--#endif // defined(OS_LINUX) && defined(USE_TCMALLOC)
-+#endif // (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_TCMALLOC)
- }
-
- int main(int argc, const char** argv) {
-@@ -36,7 +36,7 @@ int main(int argc, const char** argv) {
- // dependency on TCMalloc. Really, we ought to have our allocator shim code
- // implement this EnableTerminationOnOutOfMemory() function. Whateverz. This
- // works for now.
--#if defined(OS_LINUX) && defined(USE_TCMALLOC)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_TCMALLOC)
- // For tcmalloc, we need to tell it to behave like new.
- tc_set_new_mode(1);
- #endif
diff --git a/chromium/patches/patch-chrome_app_generated__resources.grd b/chromium/patches/patch-chrome_app_generated__resources.grd
deleted file mode 100644
index 34c96166bc..0000000000
--- a/chromium/patches/patch-chrome_app_generated__resources.grd
+++ /dev/null
@@ -1,94 +0,0 @@
-$NetBSD: patch-chrome_app_generated__resources.grd,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/app/generated_resources.grd.orig 2011-05-24 08:01:36.000000000 +0000
-+++ chrome/app/generated_resources.grd
-@@ -973,7 +973,7 @@ Other platform defines such as use_title
- Preferences...
- </message>
- </if>
-- <if expr="os == 'linux2'">
-+ <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'dragonfly2'">
- <message name="IDS_PREFERENCES" desc="The text label of the Preferences menu item.">
- Preferences
- </message>
-@@ -2362,7 +2362,7 @@ Other platform defines such as use_title
- <message name="IDS_CREATE_SHORTCUTS_QUICK_LAUNCH_BAR_CHKBOX" desc="Label of the checkbox to create an application shortcut in quick launch bar.">
- Quick launch bar
- </message>
-- <if expr="os == 'linux2' or os.find('bsd') != -1">
-+ <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'dragonfly2'">
- <message name="IDS_CREATE_SHORTCUTS_ERROR_TITLE" desc="Title of the error dialog box when creating an application shortcut failed.">
- Failed to Create Application Shortcut
- </message>
-@@ -5961,7 +5961,7 @@ Keep your key file in a safe place. You
- and make sure your configuration is set to "no proxy" or "direct."
- </message>
- </if>
-- <if expr="not pp_ifdef('chromeos') and (os == 'linux2' or os.find('bsd') != -1)">
-+ <if expr="not pp_ifdef('chromeos') and (os == 'linux2' or os.find('bsd') != -1 or os == 'dragonfly2')">
- <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server.">
- Go to
- <ph name="BEGIN_BOLD"><strong></ph>
-@@ -6754,7 +6754,7 @@ Keep your key file in a safe place. You
- Settings
- </message>
- </if>
-- <if expr="not pp_ifdef('chromeos') and (os == 'darwin' or os == 'linux2' or os.find('bsd') != -1)">
-+ <if expr="not pp_ifdef('chromeos') and (os == 'darwin' or os == 'linux2' or os.find('bsd') != -1 or os == 'dragonfly2')">
- <message name="IDS_SETTINGS_TITLE" desc="Title for the settings tab.">
- Preferences
- </message>
-@@ -6774,7 +6774,7 @@ Keep your key file in a safe place. You
- <message name="IDS_OPTIONS_DIALOG_TITLE" desc="The title of the Options dialog box">
- <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> Options
- </message>
-- <if expr="os == 'linux2'">
-+ <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'dragonfly2'">
- <message name="IDS_PREFERENCES_DIALOG_TITLE" desc="The title of the Preferences dialog box">
- <ph name="PRODUCT_NAME">$1<ex>Google Chrome</ex></ph> Preferences
- </message>
-@@ -7167,7 +7167,7 @@ Keep your key file in a safe place. You
- </message>
- </if>
-
-- <if expr="os == 'darwin' or (os =='linux2' and not pp_ifdef('chromeos'))">
-+ <if expr="os == 'darwin' or ((os =='linux2' or os.find('bsd') != -1 or os == 'dragonfly2') and not pp_ifdef('chromeos'))">
- <message name="IDS_AUTOFILL_OPTIONS_TITLE" desc="The title of the Autofill dialog.">
- Autofill Preferences
- </message>
-@@ -7339,7 +7339,7 @@ Keep your key file in a safe place. You
- <message name="IDS_THEMES_GROUP_NAME" desc="The title of the themes group">
- Themes:
- </message>
-- <if expr="os == 'linux2' or os.find('bsd') != -1">
-+ <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'dragonfly2'">
- <message name="IDS_APPEARANCE_GROUP_NAME" desc="In Title Case and without trailing colon: The title of the themes group">
- Appearance
- </message>
-@@ -7423,7 +7423,7 @@ Keep your key file in a safe place. You
- Some settings have been disabled by your IT administrator.
- </message>
- </if>
-- <if expr="not pp_ifdef('chromeos') and (os == 'darwin' or os == 'linux2' or os.find('bsd') != -1)">
-+ <if expr="not pp_ifdef('chromeos') and (os == 'darwin' or os == 'linux2' or os.find('bsd') != -1 or os == 'dragonfly2')">
- <message name="IDS_OPTIONS_MANAGED_PREFS" desc="Mac/Linux banner displayed in case there are managed options the user won't be able to change.">
- Some preferences have been disabled by your IT administrator.
- </message>
-@@ -7463,7 +7463,7 @@ Keep your key file in a safe place. You
- Search settings
- </message>
- </if>
-- <if expr="not pp_ifdef('chromeos') and (os == 'darwin' or os == 'linux2' or os.find('bsd') != -1)">
-+ <if expr="not pp_ifdef('chromeos') and (os == 'darwin' or os == 'linux2' or os.find('bsd') != -1 or os == 'dragonfly2')">
- <message name="IDS_OPTIONS_SEARCH_PLACEHOLDER" desc="Text placeholder for an empty search field on Mac/Linux.">
- Search preferences
- </message>
-@@ -11501,7 +11501,7 @@ Keep your key file in a safe place. You
- Import bookmarks now...
- </message>
-
-- <if expr="os == 'linux2' or os == 'openbsd4' or os=='freebsd6'">
-+ <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'dragonfly2'">
- <!-- Linux proxy configuration fallback help -->
- <message name="IDS_ABOUT_LINUX_PROXY_CONFIG_TITLE" desc="Title of HTML page shown on systems where system proxy configuration is unsupported.">
- Proxy Configuration Help
diff --git a/chromium/patches/patch-chrome_app_resources_locale__settings.grd b/chromium/patches/patch-chrome_app_resources_locale__settings.grd
deleted file mode 100644
index e53fa95898..0000000000
--- a/chromium/patches/patch-chrome_app_resources_locale__settings.grd
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_app_resources_locale__settings.grd,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/app/resources/locale_settings.grd.orig 2011-05-24 08:01:35.000000000 +0000
-+++ chrome/app/resources/locale_settings.grd
-@@ -589,7 +589,7 @@
- </message>
-
- <!-- The width and height for the "create application shortcuts error" dialog. -->
-- <if expr="os == 'linux2' or os.find('bsd') != -1">
-+ <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'dragonfly2'">
- <message name="IDS_CREATE_SHORTCUTS_ERROR_DIALOG_WIDTH_CHARS" use_name_for_id="true">
- 60
- </message>
diff --git a/chromium/patches/patch-chrome_browser_about__flags.cc b/chromium/patches/patch-chrome_browser_about__flags.cc
deleted file mode 100644
index a13bc034c1..0000000000
--- a/chromium/patches/patch-chrome_browser_about__flags.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_browser_about__flags.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/about_flags.cc.orig 2011-04-13 08:01:44.000000000 +0000
-+++ chrome/browser/about_flags.cc
-@@ -503,7 +503,7 @@ int GetCurrentPlatform() {
- return kOsWin;
- #elif defined(OS_CHROMEOS) // Needs to be before the OS_LINUX check.
- return kOsCrOS;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- return kOsLinux;
- #else
- #error Unknown platform
diff --git a/chromium/patches/patch-chrome_browser_browser__about__handler.cc b/chromium/patches/patch-chrome_browser_browser__about__handler.cc
deleted file mode 100644
index 1803bb5c55..0000000000
--- a/chromium/patches/patch-chrome_browser_browser__about__handler.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-chrome_browser_browser__about__handler.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/browser/browser_about_handler.cc.orig 2011-05-24 08:01:43.000000000 +0000
-+++ chrome/browser/browser_about_handler.cc
-@@ -71,7 +71,7 @@
- #include "chrome/browser/chromeos/login/wizard_controller.h"
- #include "chrome/browser/chromeos/version_loader.h"
- #include "content/browser/zygote_host_linux.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #include "content/browser/zygote_host_linux.h"
- #endif
-
-@@ -126,7 +126,7 @@ const char kNetInternalsPath[] = "net-in
- const char kPluginsPath[] = "plugins";
- const char kSyncInternalsPath[] = "sync-internals";
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- const char kLinuxProxyConfigPath[] = "linux-proxy-config";
- const char kSandboxPath[] = "sandbox";
- #endif
-@@ -160,7 +160,7 @@ const char *kAllAboutPaths[] = {
- kTcmallocPath,
- kTermsPath,
- kVersionPath,
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- kSandboxPath,
- #endif
- #if defined(OS_CHROMEOS)
-@@ -648,7 +648,7 @@ std::string AboutStats(const std::string
- return data;
- }
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- std::string AboutLinuxProxyConfig() {
- std::string data;
- data.append("<!DOCTYPE HTML>\n");
-@@ -863,7 +863,7 @@ void AboutSource::StartDataRequest(const
- response = ResourceBundle::GetSharedInstance().GetRawDataResource(
- IDR_TERMS_HTML).as_string();
- #endif
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- } else if (path == kLinuxProxyConfigPath) {
- response = AboutLinuxProxyConfig();
- } else if (path == kSandboxPath) {
diff --git a/chromium/patches/patch-chrome_browser_browser__resources.grd b/chromium/patches/patch-chrome_browser_browser__resources.grd
deleted file mode 100644
index d82f5fef30..0000000000
--- a/chromium/patches/patch-chrome_browser_browser__resources.grd
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-chrome_browser_browser__resources.grd,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/browser/browser_resources.grd.orig 2011-05-24 08:01:43.000000000 +0000
-+++ chrome/browser/browser_resources.grd
-@@ -14,13 +14,13 @@ without changes to the corresponding grd
- <if expr="os.find('win') != -1">
- <include name="IDR_ABOUT_CONFLICTS_HTML" file="resources\about_conflicts.html" flattenhtml="true" type="BINDATA" />
- </if>
-- <if expr="os == 'linux2' or os.find('bsd') != -1">
-+ <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'dragonfly2'">
- <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_linux.html" flattenhtml="true" type="BINDATA" />
- </if>
- <if expr="os == 'darwin'">
- <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory_mac.html" flattenhtml="true" type="BINDATA" />
- </if>
-- <if expr="os != 'linux2' and os != 'darwin' and os.find('bsd') == -1">
-+ <if expr="os != 'linux2' and os != 'darwin' and os.find('bsd') == -1 and os != 'dragonfly2'">
- <include name="IDR_ABOUT_MEMORY_HTML" file="resources\about_memory.html" flattenhtml="true" type="BINDATA" />
- </if>
- <include name="IDR_ABOUT_STATS_HTML" file="resources\about_stats.html" flattenhtml="true" type="BINDATA" />
diff --git a/chromium/patches/patch-chrome_browser_geolocation_gateway__data__provider__bsd.cc b/chromium/patches/patch-chrome_browser_geolocation_gateway__data__provider__bsd.cc
deleted file mode 100644
index 0528f21e77..0000000000
--- a/chromium/patches/patch-chrome_browser_geolocation_gateway__data__provider__bsd.cc
+++ /dev/null
@@ -1,193 +0,0 @@
-$NetBSD: patch-chrome_browser_geolocation_gateway__data__provider__bsd.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/geolocation/gateway_data_provider_bsd.cc.orig 2011-04-26 05:17:13.000000000 +0000
-+++ chrome/browser/geolocation/gateway_data_provider_bsd.cc
-@@ -0,0 +1,188 @@
-+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+// Provides MAC addresses of connected routers by using the /proc/net/
-+// directory which contains files with network information.
-+// This directory is used in most BSD based operating systems.
-+
-+#include "chrome/browser/geolocation/gateway_data_provider_bsd.h"
-+
-+#include <sys/types.h>
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#include <unistd.h>
-+#include <sys/time.h>
-+#include <sys/socket.h>
-+#include <net/if.h>
-+#include <net/if_dl.h>
-+#include <net/route.h>
-+#include <net/ethernet.h>
-+#include <netinet/in.h>
-+#include <netinet/if_ether.h>
-+#include <arpa/inet.h>
-+#include <string.h>
-+#include <unistd.h>
-+#include <stdlib.h>
-+
-+#include <algorithm>
-+#include <set>
-+#include <string>
-+#include <vector>
-+
-+#include "base/command_line.h"
-+#include "base/utf_string_conversions.h"
-+#include "chrome/browser/geolocation/empty_device_data_provider.h"
-+#include "chrome/browser/geolocation/gateway_data_provider_common.h"
-+#include "chrome/common/chrome_switches.h"
-+
-+#ifndef SA_SIZE
-+#define SA_SIZE(sa) \
-+ ((!(sa) || ((struct sockaddr *)(sa))->sa_len == 0) ? \
-+ sizeof(long) : \
-+ 1 + ( (((struct sockaddr *)(sa))->sa_len - 1) | (sizeof(long) - 1)))
-+#endif
-+
-+namespace {
-+
-+// TODO(joth): Cache the sets of gateways and MAC addresses to avoid reading
-+// through the arp table when the routing table hasn't changed.
-+class BSDGatewayApi : public GatewayDataProviderCommon::GatewayApiInterface {
-+ public:
-+ BSDGatewayApi() {}
-+ virtual ~BSDGatewayApi() {}
-+
-+ static BSDGatewayApi* Create() {
-+ return new BSDGatewayApi();
-+ }
-+
-+ // GatewayApiInterface
-+ virtual bool GetRouterData(GatewayData::RouterDataSet* data);
-+
-+ private:
-+ DISALLOW_COPY_AND_ASSIGN(BSDGatewayApi);
-+};
-+
-+bool GetGateways(std::set<std::string>* gateways) {
-+ struct rt_msghdr *rtm;
-+ size_t needed;
-+ int mib[6];
-+ char *buf, *next, *lim;
-+
-+ struct sockaddr *dst;
-+ struct sockaddr_inarp *gw;
-+
-+ mib[0] = CTL_NET;
-+ mib[1] = PF_ROUTE;
-+ mib[2] = 0;
-+ mib[3] = AF_INET;
-+ mib[4] = NET_RT_DUMP;
-+ mib[5] = 0;
-+
-+ if (sysctl(mib, 6, NULL, &needed, NULL, 0) > 0)
-+ return false;
-+
-+ if ((buf = (char *)malloc(needed)) == 0)
-+ return false;
-+
-+ if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0)
-+ return false;
-+
-+ lim = buf + needed;
-+ for (next = buf; next < lim; next += rtm->rtm_msglen) {
-+ rtm = (struct rt_msghdr *) next;
-+ if (!(rtm->rtm_flags & RTF_GATEWAY))
-+ continue;
-+
-+ dst = (struct sockaddr *)(rtm + 1);
-+ gw = (struct sockaddr_inarp *)(dst->sa_len + (char *)dst);
-+
-+ gateways->insert(inet_ntoa(gw->sin_addr));
-+
-+ }
-+ free(buf);
-+ return true;
-+}
-+
-+// Gets a RouterDataSet containing MAC addresses related to any connected
-+// routers. Returns false if we cannot read the arp file.
-+// The /proc/net/arp file contains arp data in the following format
-+// Note: "|" represents a delimeter.
-+// IP address|HW type|Flags|HW address|Mask|Device
-+// The delimiter for this table is " ".
-+bool GetMacAddresses(GatewayData::RouterDataSet* data,
-+ std::set<std::string>* gateways) {
-+ struct rt_msghdr *rtm;
-+ size_t needed;
-+ int mib[6];
-+ char *buf, *next, *lim;
-+
-+ struct sockaddr_inarp *sin;
-+ struct sockaddr_dl *sdl;
-+
-+ mib[0] = CTL_NET;
-+ mib[1] = PF_ROUTE;
-+ mib[2] = 0;
-+ mib[3] = AF_INET;
-+ mib[4] = NET_RT_FLAGS;
-+ mib[5] = 0;
-+
-+ if (sysctl(mib, 6, NULL, &needed, NULL, 0) < 0)
-+ return false;
-+
-+ if ((buf = (char *)malloc(needed)) == 0)
-+ return false;
-+
-+ if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0)
-+ return false;
-+
-+ lim = buf + needed;
-+ for (next = buf; next < lim; next += rtm->rtm_msglen) {
-+ rtm = (struct rt_msghdr *)next;
-+ sin = (struct sockaddr_inarp *)(rtm + 1);
-+
-+ std::string ip_addr = inet_ntoa(sin->sin_addr);
-+ if (gateways->find(ip_addr) == gateways->end())
-+ continue;
-+
-+ sdl = (struct sockaddr_dl *)((char *)sin + SA_SIZE(sin));
-+ std::string mac_addr = ether_ntoa((struct ether_addr *)LLADDR(sdl));
-+
-+ std::replace(mac_addr.begin(), mac_addr.end(), ':', '-');
-+ RouterData router;
-+ router.mac_address = UTF8ToUTF16(mac_addr);
-+ data->insert(router);
-+ }
-+
-+ return true;
-+}
-+
-+bool BSDGatewayApi::GetRouterData(GatewayData::RouterDataSet* data) {
-+ std::set<std::string> gateways;
-+ if (!GetGateways(&gateways))
-+ return false;
-+ if (gateways.empty())
-+ return true;
-+ return GetMacAddresses(data, &gateways);
-+}
-+} // namespace
-+
-+// static
-+template<>
-+GatewayDataProviderImplBase* GatewayDataProvider::DefaultFactoryFunction() {
-+ if (!CommandLine::ForCurrentProcess()
-+ ->HasSwitch(switches::kExperimentalLocationFeatures))
-+ return new EmptyDeviceDataProvider<GatewayData>();
-+ return new GatewayDataProviderBSD();
-+}
-+
-+GatewayDataProviderBSD::GatewayDataProviderBSD() {
-+}
-+
-+GatewayDataProviderBSD::~GatewayDataProviderBSD() {
-+}
-+
-+GatewayDataProviderCommon::GatewayApiInterface*
-+ GatewayDataProviderBSD::NewGatewayApi() {
-+ return BSDGatewayApi::Create();
-+}
diff --git a/chromium/patches/patch-chrome_browser_geolocation_gateway__data__provider__bsd.h b/chromium/patches/patch-chrome_browser_geolocation_gateway__data__provider__bsd.h
deleted file mode 100644
index 4db9f65dfc..0000000000
--- a/chromium/patches/patch-chrome_browser_geolocation_gateway__data__provider__bsd.h
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-chrome_browser_geolocation_gateway__data__provider__bsd.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/geolocation/gateway_data_provider_bsd.h.orig 2011-04-26 05:17:13.000000000 +0000
-+++ chrome/browser/geolocation/gateway_data_provider_bsd.h
-@@ -0,0 +1,22 @@
-+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
-+// Use of this source code is governed by a BSD-style license that can be
-+// found in the LICENSE file.
-+
-+#ifndef CHROME_BROWSER_GEOLOCATION_GATEWAY_DATA_PROVIDER_BSD_H_
-+#define CHROME_BROWSER_GEOLOCATION_GATEWAY_DATA_PROVIDER_BSD_H_
-+#pragma once
-+#include "chrome/browser/geolocation/gateway_data_provider_common.h"
-+
-+class GatewayDataProviderBSD : public GatewayDataProviderCommon {
-+ public:
-+ GatewayDataProviderBSD();
-+
-+ private:
-+ virtual ~GatewayDataProviderBSD();
-+
-+ // GatewayDataProviderCommon
-+ virtual GatewayApiInterface* NewGatewayApi();
-+ DISALLOW_COPY_AND_ASSIGN(GatewayDataProviderBSD);
-+};
-+
-+#endif // CHROME_BROWSER_GEOLOCATION_GATEWAY_DATA_PROVIDER_BSD_H_
diff --git a/chromium/patches/patch-chrome_browser_history_in__memory__url__index.cc b/chromium/patches/patch-chrome_browser_history_in__memory__url__index.cc
deleted file mode 100644
index bf9957b674..0000000000
--- a/chromium/patches/patch-chrome_browser_history_in__memory__url__index.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-chrome_browser_history_in__memory__url__index.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/browser/history/in_memory_url_index.cc.orig 2011-05-24 08:01:42.000000000 +0000
-+++ chrome/browser/history/in_memory_url_index.cc
-@@ -864,8 +864,8 @@ bool InMemoryURLIndex::RestoreWordIDHist
- return false;
- WordID word_id = iter->word_id();
- HistoryIDSet history_id_set;
-- const RepeatedField<int64>& history_ids(iter->history_id());
-- for (RepeatedField<int64>::const_iterator jiter = history_ids.begin();
-+ const RepeatedField<int64_t>& history_ids(iter->history_id());
-+ for (RepeatedField<int64_t>::const_iterator jiter = history_ids.begin();
- jiter != history_ids.end(); ++jiter)
- history_id_set.insert(*jiter);
- word_id_history_map_[word_id] = history_id_set;
diff --git a/chromium/patches/patch-chrome_browser_memory__details.cc b/chromium/patches/patch-chrome_browser_memory__details.cc
deleted file mode 100644
index 24791df769..0000000000
--- a/chromium/patches/patch-chrome_browser_memory__details.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-chrome_browser_memory__details.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/browser/memory_details.cc.orig 2011-05-24 08:01:43.000000000 +0000
-+++ chrome/browser/memory_details.cc
-@@ -25,7 +25,7 @@
- #include "grit/generated_resources.h"
- #include "ui/base/l10n/l10n_util.h"
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "content/browser/zygote_host_linux.h"
- #include "content/browser/renderer_host/render_sandbox_host_linux.h"
- #endif
-@@ -109,7 +109,7 @@ void MemoryDetails::CollectChildInfoOnIO
- void MemoryDetails::CollectChildInfoOnUIThread() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- const pid_t zygote_pid = ZygoteHost::GetInstance()->pid();
- const pid_t sandbox_helper_pid = RenderSandboxHostLinux::GetInstance()->pid();
- #endif
-@@ -236,7 +236,7 @@ void MemoryDetails::CollectChildInfoOnUI
- }
- }
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- if (process.pid == zygote_pid) {
- process.type = ChildProcessInfo::ZYGOTE_PROCESS;
- } else if (process.pid == sandbox_helper_pid) {
diff --git a/chromium/patches/patch-chrome_browser_memory__purger.cc b/chromium/patches/patch-chrome_browser_memory__purger.cc
deleted file mode 100644
index e5d64ba5e0..0000000000
--- a/chromium/patches/patch-chrome_browser_memory__purger.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_browser_memory__purger.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/memory_purger.cc.orig 2011-04-13 08:01:44.000000000 +0000
-+++ chrome/browser/memory_purger.cc
-@@ -135,7 +135,7 @@ void MemoryPurger::PurgeBrowser() {
- // * Purge AppCache memory. Not yet implemented sufficiently.
- // * Browser-side DatabaseTracker. Not implemented sufficiently.
-
--#if (defined(OS_WIN) || defined(OS_LINUX)) && defined(USE_TCMALLOC)
-+#if (defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)) && defined(USE_TCMALLOC)
- // Tell tcmalloc to release any free pages it's still holding.
- //
- // TODO(pkasting): A lot of the above calls kick off actions on other threads.
diff --git a/chromium/patches/patch-chrome_browser_net_connection__tester.cc b/chromium/patches/patch-chrome_browser_net_connection__tester.cc
deleted file mode 100644
index 47903f32db..0000000000
--- a/chromium/patches/patch-chrome_browser_net_connection__tester.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_browser_net_connection__tester.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/net/connection_tester.cc.orig 2011-04-13 08:01:40.000000000 +0000
-+++ chrome/browser/net/connection_tester.cc
-@@ -189,7 +189,7 @@ class ExperimentURLRequestContext : publ
- // Otherwise returns a network error code.
- int CreateSystemProxyConfigService(
- scoped_ptr<net::ProxyConfigService>* config_service) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // TODO(eroman): This is not supported on Linux yet, because of how
- // construction needs ot happen on the UI thread.
- return net::ERR_NOT_IMPLEMENTED;
diff --git a/chromium/patches/patch-chrome_browser_notifications_balloon__collection__impl.h b/chromium/patches/patch-chrome_browser_notifications_balloon__collection__impl.h
deleted file mode 100644
index 6b20c21c17..0000000000
--- a/chromium/patches/patch-chrome_browser_notifications_balloon__collection__impl.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_browser_notifications_balloon__collection__impl.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/notifications/balloon_collection_impl.h.orig 2011-04-13 08:01:44.000000000 +0000
-+++ chrome/browser/notifications/balloon_collection_impl.h
-@@ -57,7 +57,7 @@ class BalloonCollectionImpl : public Bal
- virtual void WillProcessMessage(const MSG& event) {}
- virtual void DidProcessMessage(const MSG& event);
- #endif
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- virtual void WillProcessEvent(GdkEvent* event) {}
- virtual void DidProcessEvent(GdkEvent* event);
- #endif
diff --git a/chromium/patches/patch-chrome_browser_process__singleton.h b/chromium/patches/patch-chrome_browser_process__singleton.h
deleted file mode 100644
index 9f4d16bc1d..0000000000
--- a/chromium/patches/patch-chrome_browser_process__singleton.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_browser_process__singleton.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/process_singleton.h.orig 2011-04-13 08:01:44.000000000 +0000
-+++ chrome/browser/process_singleton.h
-@@ -67,7 +67,7 @@ class ProcessSingleton : public base::No
- // instance.
- NotifyResult NotifyOtherProcessOrCreate();
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // Exposed for testing. We use a timeout on Linux, and in tests we want
- // this timeout to be short.
- NotifyResult NotifyOtherProcessWithTimeout(const CommandLine& command_line,
diff --git a/chromium/patches/patch-chrome_browser_process__singleton__linux.cc b/chromium/patches/patch-chrome_browser_process__singleton__linux.cc
deleted file mode 100644
index a9bf7a6a08..0000000000
--- a/chromium/patches/patch-chrome_browser_process__singleton__linux.cc
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-chrome_browser_process__singleton__linux.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/process_singleton_linux.cc.orig 2011-04-13 08:01:44.000000000 +0000
-+++ chrome/browser/process_singleton_linux.cc
-@@ -55,6 +55,13 @@
- #include <set>
- #include <string>
-
-+#if defined(OS_OPENBSD) || defined(OS_NETBSD)
-+#include <sys/param.h>
-+#include <sys/sysctl.h>
-+#include <kvm.h>
-+#include <libgen.h>
-+#endif
-+
- #include "base/base_paths.h"
- #include "base/basictypes.h"
- #include "base/command_line.h"
-@@ -314,10 +321,46 @@ void DisplayProfileInUseError(const std:
- }
-
- bool IsChromeProcess(pid_t pid) {
-+#if defined(OS_OPENBSD) || defined(OS_NETBSD)
-+ int i, nproc;
-+#if defined(OS_OPENBSD)
-+ struct kinfo_proc *plist, *kp;
-+#else
-+ struct kinfo_proc2 *plist, *kp;
-+#endif
-+ char buf[_POSIX2_LINE_MAX], **pargv;
-+ char *p;
-+ kvm_t *kd;
-+
-+ if ((kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, buf)) == NULL) {
-+ LOG(ERROR) << "kvm_openfiles(): failed";
-+ return false;
-+ }
-+
-+ plist = kvm_getproc2(kd, KERN_PROC_PID, pid, sizeof(*plist), &nproc);
-+ CHECK(plist != NULL);
-+
-+ for (i = 0, kp = plist; i < nproc; i++, kp++) {
-+ if ((kp->p_flag & P_SYSTEM) != 0)
-+ continue;
-+ if ((pargv = kvm_getargv2(kd, kp, 0)) == NULL)
-+ continue;
-+ p = basename(pargv[0]);
-+ if (!strcmp(p, "chrome")) {
-+ LOG(ERROR) << pid << " is chrome";
-+ kvm_close(kd);
-+ return true;
-+ }
-+ }
-+
-+ kvm_close(kd);
-+ return false;
-+#else
- FilePath other_chrome_path(base::GetProcessExecutablePath(pid));
- return (!other_chrome_path.empty() &&
- other_chrome_path.BaseName() ==
- FilePath(chrome::kBrowserProcessExecutableName));
-+#endif
- }
-
- // Return true if the given pid is one of our child processes.
diff --git a/chromium/patches/patch-chrome_browser_renderer__host_browser__render__process__host.cc b/chromium/patches/patch-chrome_browser_renderer__host_browser__render__process__host.cc
deleted file mode 100644
index 12202d1fd1..0000000000
--- a/chromium/patches/patch-chrome_browser_renderer__host_browser__render__process__host.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_browser_renderer__host_browser__render__process__host.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/browser/renderer_host/browser_render_process_host.cc.orig 2011-05-24 08:01:42.000000000 +0000
-+++ chrome/browser/renderer_host/browser_render_process_host.cc
-@@ -903,7 +903,7 @@ TransportDIB* BrowserRenderProcessHost::
- HANDLE section = chrome::GetSectionFromProcess(
- dib_id.handle, GetHandle(), false /* read write */);
- return TransportDIB::Map(section);
--#elif defined(OS_MACOSX)
-+#elif defined(OS_MACOSX) || defined(OS_BSD)
- // On OSX, the browser allocates all DIBs and keeps a file descriptor around
- // for each.
- return widget_helper_->MapTransportDIB(dib_id);
diff --git a/chromium/patches/patch-chrome_browser_shell__integration__linux.cc b/chromium/patches/patch-chrome_browser_shell__integration__linux.cc
deleted file mode 100644
index c634a3fb76..0000000000
--- a/chromium/patches/patch-chrome_browser_shell__integration__linux.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-chrome_browser_shell__integration__linux.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/browser/shell_integration_linux.cc.orig 2011-05-24 08:01:43.000000000 +0000
-+++ chrome/browser/shell_integration_linux.cc
-@@ -117,11 +117,23 @@ void CreateShortcutOnDesktop(const FileP
- if (!PathService::Get(chrome::DIR_USER_DESKTOP, &desktop_path))
- return;
-
-+#if defined(OS_BSD)
-+ int desktop_fd = open(desktop_path.value().c_str(), O_RDONLY);
-+#else
- int desktop_fd = open(desktop_path.value().c_str(), O_RDONLY | O_DIRECTORY);
-+#endif
- if (desktop_fd < 0)
- return;
-
-+#if defined(OS_BSD)
-+ const char* path = shortcut_filename.value().c_str();
-+ if (path[0] != '/')
-+ path = strcat((char*)desktop_path.value().c_str(), path);
-+
-+ int fd = open(path,
-+#else
- int fd = openat(desktop_fd, shortcut_filename.value().c_str(),
-+#endif
- O_CREAT | O_EXCL | O_WRONLY,
- S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH);
- if (fd < 0) {
-@@ -140,7 +152,15 @@ void CreateShortcutOnDesktop(const FileP
- // to make sure we're deleting the file in the directory we think we are.
- // Even if an attacker manager to put something other at
- // |shortcut_filename| we'll just undo his action.
-+#if defined(OS_BSD)
-+ path = shortcut_filename.value().c_str();
-+ if (path[0] != '/')
-+ path = strcat((char*)desktop_path.value().c_str(), path);
-+
-+ unlink(path);
-+#else
- unlinkat(desktop_fd, shortcut_filename.value().c_str(), 0);
-+#endif
- }
-
- if (HANDLE_EINTR(close(desktop_fd)) < 0)
diff --git a/chromium/patches/patch-chrome_browser_shell__integration__unittest.cc b/chromium/patches/patch-chrome_browser_shell__integration__unittest.cc
deleted file mode 100644
index af602b08bc..0000000000
--- a/chromium/patches/patch-chrome_browser_shell__integration__unittest.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-chrome_browser_shell__integration__unittest.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/shell_integration_unittest.cc.orig 2011-04-13 08:01:44.000000000 +0000
-+++ chrome/browser/shell_integration_unittest.cc
-@@ -21,13 +21,13 @@
-
- #if defined(OS_WIN)
- #include "chrome/installer/util/browser_distribution.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #include "base/environment.h"
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
-
- #define FPL FILE_PATH_LITERAL
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- namespace {
-
- // Provides mock environment variables values based on a stored map.
diff --git a/chromium/patches/patch-chrome_browser_sync_engine_syncer__thread.cc b/chromium/patches/patch-chrome_browser_sync_engine_syncer__thread.cc
deleted file mode 100644
index 934514eaf3..0000000000
--- a/chromium/patches/patch-chrome_browser_sync_engine_syncer__thread.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-chrome_browser_sync_engine_syncer__thread.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/sync/engine/syncer_thread.cc.orig 2011-04-13 08:01:39.000000000 +0000
-+++ chrome/browser/sync/engine/syncer_thread.cc
-@@ -263,7 +263,7 @@ void SyncerThread::ThreadMainLoop() {
- bool initial_sync_for_thread = true;
- bool continue_sync_cycle = false;
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- idle_query_.reset(new IdleQueryLinux());
- #endif
-
-@@ -358,7 +358,7 @@ void SyncerThread::ThreadMainLoop() {
- static_cast<int>(vault_.current_wait_interval_.poll_delta.InSeconds()),
- &user_idle_milliseconds, &continue_sync_cycle, nudged);
- }
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- idle_query_.reset();
- #endif
- }
-@@ -832,7 +832,7 @@ int SyncerThread::UserIdleTime() {
- return 0;
- }
- return idle_time / 1000000; // nano to milli
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- if (idle_query_.get())
- return idle_query_->IdleTime();
- return 0;
diff --git a/chromium/patches/patch-chrome_browser_sync_engine_syncer__thread.h b/chromium/patches/patch-chrome_browser_sync_engine_syncer__thread.h
deleted file mode 100644
index 06dcc84bce..0000000000
--- a/chromium/patches/patch-chrome_browser_sync_engine_syncer__thread.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-chrome_browser_sync_engine_syncer__thread.h,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/browser/sync/engine/syncer_thread.h.orig 2011-05-24 08:01:38.000000000 +0000
-+++ chrome/browser/sync/engine/syncer_thread.h
-@@ -26,7 +26,7 @@
- #include "chrome/browser/sync/syncable/model_type.h"
- #include "chrome/common/deprecated/event_sys-inl.h"
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "chrome/browser/sync/engine/idle_query_linux.h"
- #endif
-
-@@ -339,7 +339,7 @@ class SyncerThread : public base::RefCou
- NudgeSource source,
- const sessions::TypePayloadMap& model_types_with_payloads);
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // On Linux, we need this information in order to query idle time.
- scoped_ptr<IdleQueryLinux> idle_query_;
- #endif
diff --git a/chromium/patches/patch-chrome_browser_sync_glue_sync__backend__host.cc b/chromium/patches/patch-chrome_browser_sync_glue_sync__backend__host.cc
deleted file mode 100644
index faf7373b9d..0000000000
--- a/chromium/patches/patch-chrome_browser_sync_glue_sync__backend__host.cc
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-chrome_browser_sync_glue_sync__backend__host.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/sync/glue/sync_backend_host.cc.orig 2011-04-13 08:01:39.000000000 +0000
-+++ chrome/browser/sync/glue/sync_backend_host.cc
-@@ -551,8 +551,12 @@ std::string MakeUserAgentForSyncapi() {
- user_agent += "WIN ";
- #elif defined(OS_LINUX)
- user_agent += "LINUX ";
-+#elif defined(OS_DRAGONFLY)
-+ user_agent += "DRAGONFLY ";
- #elif defined(OS_FREEBSD)
- user_agent += "FREEBSD ";
-+#elif defined(OS_NETBSD)
-+ user_agent += "NETBSD ";
- #elif defined(OS_OPENBSD)
- user_agent += "OPENBSD ";
- #elif defined(OS_MACOSX)
diff --git a/chromium/patches/patch-chrome_browser_sync_syncable_directory__backing__store.cc b/chromium/patches/patch-chrome_browser_sync_syncable_directory__backing__store.cc
deleted file mode 100644
index 05ee9b79c2..0000000000
--- a/chromium/patches/patch-chrome_browser_sync_syncable_directory__backing__store.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-chrome_browser_sync_syncable_directory__backing__store.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/sync/syncable/directory_backing_store.cc.orig 2011-04-13 08:01:39.000000000 +0000
-+++ chrome/browser/sync/syncable/directory_backing_store.cc
-@@ -304,13 +304,13 @@ bool DirectoryBackingStore::BeginLoad()
- #else
- UMA_HISTOGRAM_COUNTS_100("Sync.DirectoryOpenFailedNotWinMac", bucket);
-
--#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#if (defined(OS_LINUX) || defined(OS_BSD)) && !defined(OS_CHROMEOS)
- UMA_HISTOGRAM_COUNTS_100("Sync.DirectoryOpenFailedLinux", bucket);
- #elif defined(OS_CHROMEOS)
- UMA_HISTOGRAM_COUNTS_100("Sync.DirectoryOpenFailedCros", bucket);
- #else
- UMA_HISTOGRAM_COUNTS_100("Sync.DirectoryOpenFailedOther", bucket);
--#endif // OS_LINUX && !OS_CHROMEOS
-+#endif // (OS_LINUX || OS_BSD) && !OS_CHROMEOS
- #endif // OS_WIN
- return !failed_again;
- }
diff --git a/chromium/patches/patch-chrome_browser_task__manager_task__manager__resource__providers.cc b/chromium/patches/patch-chrome_browser_task__manager_task__manager__resource__providers.cc
deleted file mode 100644
index a9097623af..0000000000
--- a/chromium/patches/patch-chrome_browser_task__manager_task__manager__resource__providers.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_browser_task__manager_task__manager__resource__providers.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/task_manager/task_manager_resource_providers.cc.orig 2011-04-13 08:01:40.000000000 +0000
-+++ chrome/browser/task_manager/task_manager_resource_providers.cc
-@@ -1240,7 +1240,7 @@ TaskManagerBrowserProcessResource::TaskM
- default_icon_ = IconUtil::CreateSkBitmapFromHICON(icon, icon_size);
- }
- }
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- if (!default_icon_) {
- ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- default_icon_ = rb.GetBitmapNamed(IDR_PRODUCT_LOGO_16);
diff --git a/chromium/patches/patch-chrome_browser_ui_browser.cc b/chromium/patches/patch-chrome_browser_ui_browser.cc
deleted file mode 100644
index 7322579beb..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_browser.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_browser.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/ui/browser.cc.orig 2011-04-13 08:01:42.000000000 +0000
-+++ chrome/browser/ui/browser.cc
-@@ -263,7 +263,7 @@ Browser::~Browser() {
-
- BrowserList::RemoveBrowser(this);
-
--#if defined(OS_WIN) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
- if (!BrowserList::HasBrowserWithProfile(profile_)) {
- // We're the last browser window with this profile. We need to nuke the
- // TabRestoreService, which will start the shutdown of the
-@@ -810,7 +810,7 @@ string16 Browser::GetWindowTitleForCurre
- // On Mac or ChromeOS, we don't want to suffix the page title with
- // the application name.
- return title;
--#elif defined(OS_WIN) || defined(OS_LINUX)
-+#elif defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
- int string_id = IDS_BROWSER_WINDOW_TITLE_FORMAT;
- // Don't append the app name to window titles on app frames and app popups
- if (type_ & TYPE_APP)
-@@ -1459,7 +1459,7 @@ void Browser::ToggleFullscreenMode() {
- window_->SetFullscreen(!window_->IsFullscreen());
- // On Linux, setting fullscreen mode is an async call to the X server, which
- // may or may not support fullscreen mode.
--#if !defined(OS_LINUX)
-+#if !defined(OS_LINUX) && !defined(OS_BSD)
- UpdateCommandsForFullscreenMode(window_->IsFullscreen());
- #endif
- }
-@@ -1706,7 +1706,7 @@ void Browser::OpenFile() {
-
- void Browser::OpenCreateShortcutsDialog() {
- UserMetrics::RecordAction(UserMetricsAction("CreateShortcut"), profile_);
--#if defined(OS_WIN) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
- TabContentsWrapper* current_tab = GetSelectedTabContentsWrapper();
- DCHECK(current_tab &&
- web_app::IsValidUrl(current_tab->tab_contents()->GetURL())) <<
-@@ -2516,7 +2516,7 @@ void Browser::DuplicateContentsAt(int in
- }
-
- void Browser::CloseFrameAfterDragSession() {
--#if defined(OS_WIN) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
- // This is scheduled to run after we return to the message loop because
- // otherwise the frame will think the drag session is still active and ignore
- // the request.
diff --git a/chromium/patches/patch-chrome_browser_ui_browser__list.cc b/chromium/patches/patch-chrome_browser_ui_browser__list.cc
deleted file mode 100644
index bf3f3b0929..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_browser__list.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_browser__list.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/ui/browser_list.cc.orig 2011-04-13 08:01:42.000000000 +0000
-+++ chrome/browser/ui/browser_list.cc
-@@ -430,7 +430,7 @@ void BrowserList::SessionEnding() {
- // At this point the message loop is still running yet we've shut everything
- // down. If any messages are processed we'll likely crash. Exit now.
- ExitProcess(ResultCodes::NORMAL_EXIT);
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- _exit(ResultCodes::NORMAL_EXIT);
- #else
- NOTIMPLEMENTED();
diff --git a/chromium/patches/patch-chrome_browser_ui_toolbar_wrench__menu__model.cc b/chromium/patches/patch-chrome_browser_ui_toolbar_wrench__menu__model.cc
deleted file mode 100644
index 6354cb4ba0..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_toolbar_wrench__menu__model.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_toolbar_wrench__menu__model.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/browser/ui/toolbar/wrench_menu_model.cc.orig 2011-05-24 08:01:42.000000000 +0000
-+++ chrome/browser/ui/toolbar/wrench_menu_model.cc
-@@ -38,7 +38,7 @@
- #include "ui/base/models/button_menu_item_model.h"
- #include "ui/base/resource/resource_bundle.h"
-
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- #include <gtk/gtk.h>
- #include "chrome/browser/ui/gtk/gtk_util.h"
- #endif
-@@ -359,7 +359,7 @@ void WrenchMenuModel::Build() {
- #endif
-
- AddSeparator();
--#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(TOOLKIT_VIEWS))
-+#if defined(OS_MACOSX) || defined(TOOLKIT_USES_GTK)
- // WARNING: Mac does not use the ButtonMenuItemModel, but instead defines the
- // layout for this menu item in Toolbar.xib. It does, however, use the
- // command_id value from AddButtonItem() to identify this special item.
-@@ -374,7 +374,7 @@ void WrenchMenuModel::Build() {
- #endif
-
- AddSeparator();
--#if defined(OS_MACOSX) || (defined(OS_LINUX) && !defined(TOOLKIT_VIEWS))
-+#if defined(OS_MACOSX) || defined(TOOLKIT_USES_GTK)
- // WARNING: See above comment.
- zoom_menu_item_model_.reset(
- new ui::ButtonMenuItemModel(IDS_ZOOM_MENU, this));
diff --git a/chromium/patches/patch-chrome_browser_ui_views_create__application__shortcut__view.cc b/chromium/patches/patch-chrome_browser_ui_views_create__application__shortcut__view.cc
deleted file mode 100644
index 6a42e26638..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_views_create__application__shortcut__view.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_views_create__application__shortcut__view.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/ui/views/create_application_shortcut_view.cc.orig 2011-04-13 08:01:42.000000000 +0000
-+++ chrome/browser/ui/views/create_application_shortcut_view.cc
-@@ -256,7 +256,7 @@ void CreateApplicationShortcutView::Init
- UTF16ToWide(l10n_util::GetStringUTF16(
- IDS_CREATE_SHORTCUTS_QUICK_LAUNCH_BAR_CHKBOX)),
- profile_->GetPrefs()->GetBoolean(prefs::kWebAppCreateInQuickLaunchBar));
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- menu_check_box_ = AddCheckbox(
- UTF16ToWide(l10n_util::GetStringUTF16(IDS_CREATE_SHORTCUTS_MENU_CHKBOX)),
- profile_->GetPrefs()->GetBoolean(prefs::kWebAppCreateInAppsMenu));
diff --git a/chromium/patches/patch-chrome_browser_ui_views_dropdown__bar__host.cc b/chromium/patches/patch-chrome_browser_ui_views_dropdown__bar__host.cc
deleted file mode 100644
index 85d757f860..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_views_dropdown__bar__host.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_views_dropdown__bar__host.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/ui/views/dropdown_bar_host.cc.orig 2011-04-13 08:01:42.000000000 +0000
-+++ chrome/browser/ui/views/dropdown_bar_host.cc
-@@ -19,7 +19,7 @@
-
- #if defined(OS_WIN)
- #include "base/win/scoped_gdi_object.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #include "ui/base/gtk/scoped_handle_gtk.h"
- #endif
-
-@@ -27,7 +27,7 @@ namespace {
-
- #if defined(OS_WIN)
- typedef base::win::ScopedRegion ScopedPlatformRegion;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- typedef ui::ScopedRegion ScopedPlatformRegion;
- #endif
-
diff --git a/chromium/patches/patch-chrome_browser_ui_views_extensions_extension__popup.cc b/chromium/patches/patch-chrome_browser_ui_views_extensions_extension__popup.cc
deleted file mode 100644
index 8db0bec48f..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_views_extensions_extension__popup.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_views_extensions_extension__popup.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/browser/ui/views/extensions/extension_popup.cc.orig 2011-05-24 08:01:41.000000000 +0000
-+++ chrome/browser/ui/views/extensions/extension_popup.cc
-@@ -23,7 +23,7 @@
- #include "views/widget/root_view.h"
- #include "views/window/window.h"
-
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_GTK)
- #include "views/widget/widget_gtk.h"
- #endif
-
-@@ -94,7 +94,7 @@ ExtensionPopup::ExtensionPopup(Extension
-
- // The bubble chrome requires a separate window, so construct it here.
- gfx::NativeView native_window = frame->GetNativeView();
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_GTK)
- border_widget_ = new views::WidgetGtk(views::WidgetGtk::TYPE_WINDOW);
- static_cast<views::WidgetGtk*>(border_widget_)->MakeTransparent();
- static_cast<views::WidgetGtk*>(border_widget_)->make_transient_to_parent();
diff --git a/chromium/patches/patch-chrome_browser_ui_views_extensions_extension__view.cc b/chromium/patches/patch-chrome_browser_ui_views_extensions_extension__view.cc
deleted file mode 100644
index ab370b3cf3..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_views_extensions_extension__view.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_views_extensions_extension__view.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/ui/views/extensions/extension_view.cc.orig 2011-04-13 08:01:42.000000000 +0000
-+++ chrome/browser/ui/views/extensions/extension_view.cc
-@@ -14,7 +14,7 @@
- #include "chrome/browser/renderer_host/render_widget_host_view_win.h"
- #elif defined(TOUCH_UI)
- #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
- #endif
-
diff --git a/chromium/patches/patch-chrome_browser_ui_views_find__bar__view.cc b/chromium/patches/patch-chrome_browser_ui_views_find__bar__view.cc
deleted file mode 100644
index adb2520075..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_views_find__bar__view.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_views_find__bar__view.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/ui/views/find_bar_view.cc.orig 2011-04-13 08:01:42.000000000 +0000
-+++ chrome/browser/ui/views/find_bar_view.cc
-@@ -85,7 +85,7 @@ static const int kDefaultCharWidth = 43;
-
- FindBarView::FindBarView(FindBarHost* host)
- : DropdownBarView(host),
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- ignore_contents_changed_(false),
- #endif
- find_text_(NULL),
-@@ -176,11 +176,11 @@ FindBarView::~FindBarView() {
- }
-
- void FindBarView::SetFindText(const string16& find_text) {
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- ignore_contents_changed_ = true;
- #endif
- find_text_->SetText(find_text);
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- ignore_contents_changed_ = false;
- #endif
- }
-@@ -467,7 +467,7 @@ void FindBarView::ButtonPressed(
-
- void FindBarView::ContentsChanged(views::Textfield* sender,
- const string16& new_contents) {
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- // On gtk setting the text in the find view causes a notification.
- if (ignore_contents_changed_)
- return;
diff --git a/chromium/patches/patch-chrome_browser_ui_views_find__bar__view.h b/chromium/patches/patch-chrome_browser_ui_views_find__bar__view.h
deleted file mode 100644
index 1b309efa0b..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_views_find__bar__view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_views_find__bar__view.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/ui/views/find_bar_view.h.orig 2011-04-13 08:01:42.000000000 +0000
-+++ chrome/browser/ui/views/find_bar_view.h
-@@ -125,7 +125,7 @@ class FindBarView : public DropdownBarVi
- // between us and the TabContentsView.
- FindBarHost* find_bar_host() const;
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // In GTK we get changed signals if we programmatically set the text. If we
- // don't ignore them we run into problems. For example, switching tabs back
- // to one with the find bar visible will cause a search to the next found
diff --git a/chromium/patches/patch-chrome_browser_ui_views_frame_app__panel__browser__frame__view.cc b/chromium/patches/patch-chrome_browser_ui_views_frame_app__panel__browser__frame__view.cc
deleted file mode 100644
index a84fafb949..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_views_frame_app__panel__browser__frame__view.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_views_frame_app__panel__browser__frame__view.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc.orig 2011-04-13 08:01:42.000000000 +0000
-+++ chrome/browser/ui/views/frame/app_panel_browser_frame_view.cc
-@@ -22,7 +22,7 @@
- #include "views/window/window.h"
- #include "views/window/window_resources.h"
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "views/window/hit_test.h"
- #endif
-
diff --git a/chromium/patches/patch-chrome_browser_ui_views_frame_browser__view.cc b/chromium/patches/patch-chrome_browser_ui_views_frame_browser__view.cc
deleted file mode 100644
index ef0a4deb43..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_views_frame_browser__view.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_views_frame_browser__view.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/browser/ui/views/frame/browser_view.cc.orig 2011-05-24 08:01:42.000000000 +0000
-+++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -4,7 +4,7 @@
-
- #include "chrome/browser/ui/views/frame/browser_view.h"
-
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- #include <gtk/gtk.h>
- #endif
-
-@@ -90,7 +90,7 @@
- #include "chrome/browser/jumplist_win.h"
- #include "ui/base/message_box_win.h"
- #include "ui/base/view_prop.h"
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_USES_GTK)
- #include "chrome/browser/ui/views/accelerator_table_gtk.h"
- #include "views/window/hit_test.h"
- #include "views/window/window_gtk.h"
-@@ -1162,7 +1162,7 @@ void BrowserView::ShowProfileErrorDialog
- string16 message = l10n_util::GetStringUTF16(message_id);
- ui::MessageBox(GetNativeHandle(), message, title,
- MB_OK | MB_ICONWARNING | MB_TOPMOST);
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_USES_GTK)
- std::string title = l10n_util::GetStringUTF8(IDS_PRODUCT_NAME);
- std::string message = l10n_util::GetStringUTF8(message_id);
- GtkWidget* dialog = gtk_message_dialog_new(GetNativeHandle(),
-@@ -1256,7 +1256,7 @@ bool BrowserView::PreHandleKeyboardEvent
- views::FocusManager* focus_manager = GetFocusManager();
- DCHECK(focus_manager);
-
--#if defined(OS_LINUX) && !defined(TOUCH_UI)
-+#if defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI)
- // Views and WebKit use different tables for GdkEventKey -> views::KeyEvent
- // conversion. We need to use View's conversion table here to keep consistent
- // behavior with views::FocusManager::OnKeyEvent() method.
-@@ -1303,7 +1303,7 @@ bool BrowserView::PreHandleKeyboardEvent
- return false;
-
- // Executing the command may cause |this| object to be destroyed.
--#if defined(OS_LINUX) && !defined(TOUCH_UI)
-+#if defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI)
- if (browser_->IsReservedCommandOrKey(id, event) &&
- !event.match_edit_command) {
- #else
-@@ -1320,7 +1320,7 @@ bool BrowserView::PreHandleKeyboardEvent
- }
-
- void BrowserView::HandleKeyboardEvent(const NativeWebKeyboardEvent& event) {
--#if defined(OS_LINUX) && !defined(TOUCH_UI)
-+#if defined(TOOLKIT_USES_GTK) && !defined(TOUCH_UI)
- views::Window* window = GetWidget()->GetWindow();
- if (window && event.os_event && !event.skip_in_browser)
- static_cast<views::WindowGtk*>(window)->HandleKeyboardEvent(event.os_event);
-@@ -2247,7 +2247,7 @@ void BrowserView::ProcessFullscreen(bool
- #endif // No need to invoke SetFullscreen for linux as this code is executed
- // once we're already fullscreen on linux.
-
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- // Updating of commands for fullscreen mode is called from SetFullScreen on
- // Wndows (see just above), but for ChromeOS, this method (ProcessFullScreen)
- // is called after full screen has happened successfully (via GTK's
diff --git a/chromium/patches/patch-chrome_browser_ui_views_frame_browser__view__layout.cc b/chromium/patches/patch-chrome_browser_ui_views_frame_browser__view__layout.cc
deleted file mode 100644
index 8777240c73..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_views_frame_browser__view__layout.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_views_frame_browser__view__layout.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/ui/views/frame/browser_view_layout.cc.orig 2011-04-13 08:01:42.000000000 +0000
-+++ chrome/browser/ui/views/frame/browser_view_layout.cc
-@@ -21,7 +21,7 @@
- #include "views/controls/single_split_view.h"
- #include "views/window/window.h"
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "views/window/hit_test.h"
- #endif
-
diff --git a/chromium/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/chromium/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
deleted file mode 100644
index 1acc3bd60e..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2011-04-13 08:01:42.000000000 +0000
-+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
-@@ -29,7 +29,7 @@
- #include "views/window/window_resources.h"
- #include "views/window/window_shape.h"
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "views/window/hit_test.h"
- #endif
-
diff --git a/chromium/patches/patch-chrome_browser_ui_views_fullscreen__exit__bubble.cc b/chromium/patches/patch-chrome_browser_ui_views_fullscreen__exit__bubble.cc
deleted file mode 100644
index be77ce4fa8..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_views_fullscreen__exit__bubble.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_views_fullscreen__exit__bubble.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/ui/views/fullscreen_exit_bubble.cc.orig 2011-04-13 08:01:42.000000000 +0000
-+++ chrome/browser/ui/views/fullscreen_exit_bubble.cc
-@@ -19,7 +19,7 @@
- #if defined(OS_WIN)
- #include "ui/base/l10n/l10n_util_win.h"
- #include "views/widget/widget_win.h"
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
- #include "views/widget/widget_gtk.h"
- #endif
-
-@@ -123,7 +123,7 @@ class FullscreenExitBubble::FullscreenEx
- return MA_NOACTIVATE;
- }
- };
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
- // TODO: figure out the equivalent of MA_NOACTIVATE for gtk.
- #endif
-
-@@ -159,7 +159,7 @@ FullscreenExitBubble::FullscreenExitBubb
- popup_->set_window_style(WS_POPUP);
- popup_->set_window_ex_style(WS_EX_LAYERED | WS_EX_TOOLWINDOW |
- l10n_util::GetExtendedTooltipStyles());
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
- popup_ = new views::WidgetGtk(views::WidgetGtk::TYPE_POPUP);
- popup_->MakeTransparent();
- #endif
-@@ -207,7 +207,7 @@ void FullscreenExitBubble::AnimationProg
- #if defined(OS_WIN)
- popup_->MoveWindow(popup_rect.x(), popup_rect.y(), popup_rect.width(),
- popup_rect.height());
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
- popup_->SetBounds(popup_rect);
- #endif
- popup_->Show();
diff --git a/chromium/patches/patch-chrome_browser_ui_views_fullscreen__exit__bubble.h b/chromium/patches/patch-chrome_browser_ui_views_fullscreen__exit__bubble.h
deleted file mode 100644
index 59ce7d0896..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_views_fullscreen__exit__bubble.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_views_fullscreen__exit__bubble.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/ui/views/fullscreen_exit_bubble.h.orig 2011-04-13 08:01:42.000000000 +0000
-+++ chrome/browser/ui/views/fullscreen_exit_bubble.h
-@@ -16,7 +16,7 @@ namespace ui {
- class SlideAnimation;
- }
-
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_GTK)
- namespace views {
- class WidgetGtk;
- }
-@@ -78,7 +78,7 @@ class FullscreenExitBubble : public view
- // The popup itself, which is a slightly modified WidgetWin. We need to use
- // a WidgetWin (and thus an HWND) to make the popup float over other HWNDs.
- FullscreenExitPopup* popup_;
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
- views::WidgetGtk* popup_;
- #endif
-
diff --git a/chromium/patches/patch-chrome_browser_ui_views_info__bubble.cc b/chromium/patches/patch-chrome_browser_ui_views_info__bubble.cc
deleted file mode 100644
index 14198bb37e..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_views_info__bubble.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_views_info__bubble.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/ui/views/info_bubble.cc.orig 2011-04-13 08:01:42.000000000 +0000
-+++ chrome/browser/ui/views/info_bubble.cc
-@@ -314,7 +314,7 @@ void InfoBubble::AnimationProgressed(con
-
- InfoBubble::InfoBubble()
- :
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_GTK)
- WidgetGtk(TYPE_WINDOW),
- border_contents_(NULL),
- #elif defined(OS_WIN)
-@@ -386,7 +386,7 @@ void InfoBubble::Init(views::Widget* par
- WidgetWin::Init(border_->GetNativeView(), gfx::Rect());
-
- SetWindowText(GetNativeView(), delegate_->accessible_name().c_str());
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_USES_GTK)
- MakeTransparent();
- make_transient_to_parent();
- WidgetGtk::InitWithWidget(parent, gfx::Rect());
-@@ -462,7 +462,7 @@ void InfoBubble::Init(views::Widget* par
- ShowWindow(SW_SHOW);
- if (fade_in)
- FadeIn();
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_USES_GTK)
- views::WidgetGtk::Show();
- #endif
- }
-@@ -502,7 +502,7 @@ void InfoBubble::OnActivate(UINT action,
- GetRootView()->GetChildViewAt(0)->RequestFocus();
- }
- }
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
- void InfoBubble::IsActiveChanged() {
- if (!IsActive())
- Close();
-@@ -521,7 +521,7 @@ void InfoBubble::DoClose(bool closed_by_
- #if defined(OS_WIN)
- border_->Close();
- WidgetWin::Close();
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
- WidgetGtk::Close();
- #endif
- }
diff --git a/chromium/patches/patch-chrome_browser_ui_views_info__bubble.h b/chromium/patches/patch-chrome_browser_ui_views_info__bubble.h
deleted file mode 100644
index 549ae1597a..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_views_info__bubble.h
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_views_info__bubble.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/ui/views/info_bubble.h.orig 2011-04-13 08:01:42.000000000 +0000
-+++ chrome/browser/ui/views/info_bubble.h
-@@ -14,7 +14,7 @@
-
- #if defined(OS_WIN)
- #include "views/widget/widget_win.h"
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
- #include "views/widget/widget_gtk.h"
- #endif
-
-@@ -180,7 +180,7 @@ class InfoBubbleDelegate {
- class InfoBubble
- #if defined(OS_WIN)
- : public views::WidgetWin,
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
- : public views::WidgetGtk,
- #endif
- public views::AcceleratorTarget,
-@@ -258,7 +258,7 @@ class InfoBubble
- #if defined(OS_WIN)
- // Overridden from WidgetWin:
- virtual void OnActivate(UINT action, BOOL minimized, HWND window);
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
- // Overridden from WidgetGtk:
- virtual void IsActiveChanged();
- #endif
-@@ -266,7 +266,7 @@ class InfoBubble
- #if defined(OS_WIN)
- // The window used to render the padding, border and arrow.
- BorderWidget* border_;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- // The view displaying the border.
- BorderContents* border_contents_;
- #endif
diff --git a/chromium/patches/patch-chrome_browser_ui_views_location__bar_location__bar__view.cc b/chromium/patches/patch-chrome_browser_ui_views_location__bar_location__bar__view.cc
deleted file mode 100644
index bfe71c4f88..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_views_location__bar_location__bar__view.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_views_location__bar_location__bar__view.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/ui/views/location_bar/location_bar_view.cc.orig 2011-04-13 08:01:42.000000000 +0000
-+++ chrome/browser/ui/views/location_bar/location_bar_view.cc
-@@ -4,7 +4,7 @@
-
- #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
-
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- #include <gtk/gtk.h>
- #endif
-
diff --git a/chromium/patches/patch-chrome_browser_ui_views_location__bar_location__bar__view.h b/chromium/patches/patch-chrome_browser_ui_views_location__bar_location__bar__view.h
deleted file mode 100644
index 92d1a688b8..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_views_location__bar_location__bar__view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_views_location__bar_location__bar__view.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/ui/views/location_bar/location_bar_view.h.orig 2011-04-13 08:01:42.000000000 +0000
-+++ chrome/browser/ui/views/location_bar/location_bar_view.h
-@@ -25,7 +25,7 @@
-
- #if defined(OS_WIN)
- #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h"
- #endif
-
diff --git a/chromium/patches/patch-chrome_browser_ui_views_notifications_balloon__view.cc b/chromium/patches/patch-chrome_browser_ui_views_notifications_balloon__view.cc
deleted file mode 100644
index e133c827b0..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_views_notifications_balloon__view.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_views_notifications_balloon__view.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/ui/views/notifications/balloon_view.cc.orig 2011-04-13 08:01:42.000000000 +0000
-+++ chrome/browser/ui/views/notifications/balloon_view.cc
-@@ -39,7 +39,7 @@
- #if defined(OS_WIN)
- #include "views/widget/widget_win.h"
- #endif
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_GTK)
- #include "views/widget/widget_gtk.h"
- #endif
-
diff --git a/chromium/patches/patch-chrome_browser_ui_views_notifications_balloon__view__host.cc b/chromium/patches/patch-chrome_browser_ui_views_notifications_balloon__view__host.cc
deleted file mode 100644
index cf502867b6..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_views_notifications_balloon__view__host.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_views_notifications_balloon__view__host.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/ui/views/notifications/balloon_view_host.cc.orig 2011-04-13 08:01:42.000000000 +0000
-+++ chrome/browser/ui/views/notifications/balloon_view_host.cc
-@@ -10,7 +10,7 @@
- #if defined(OS_WIN)
- #include "chrome/browser/renderer_host/render_widget_host_view_win.h"
- #endif
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #if defined(TOUCH_UI)
- #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
- #else
-@@ -21,7 +21,7 @@
- #if defined(OS_WIN)
- #include "views/widget/widget_win.h"
- #endif
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_GTK)
- #include "views/widget/widget_gtk.h"
- #endif
-
-@@ -74,7 +74,7 @@ void BalloonViewHost::InitRenderWidgetHo
- HWND hwnd = view_win->Create(parent_native_view_);
- view_win->ShowWindow(SW_SHOW);
- native_host_->Attach(hwnd);
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #if defined(TOUCH_UI)
- RenderWidgetHostViewViews* view_views =
- static_cast<RenderWidgetHostViewViews*>(render_widget_host_view_);
diff --git a/chromium/patches/patch-chrome_browser_ui_views_tabs_dragged__tab__view.cc b/chromium/patches/patch-chrome_browser_ui_views_tabs_dragged__tab__view.cc
deleted file mode 100644
index 45f76c2265..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_views_tabs_dragged__tab__view.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_views_tabs_dragged__tab__view.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/ui/views/tabs/dragged_tab_view.cc.orig 2011-04-13 08:01:42.000000000 +0000
-+++ chrome/browser/ui/views/tabs/dragged_tab_view.cc
-@@ -11,7 +11,7 @@
-
- #if defined(OS_WIN)
- #include "views/widget/widget_win.h"
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
- #include "views/widget/widget_gtk.h"
- #endif
-
diff --git a/chromium/patches/patch-chrome_browser_ui_views_tabs_dragged__tab__view.h b/chromium/patches/patch-chrome_browser_ui_views_tabs_dragged__tab__view.h
deleted file mode 100644
index 97bce26b26..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_views_tabs_dragged__tab__view.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_views_tabs_dragged__tab__view.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/ui/views/tabs/dragged_tab_view.h.orig 2011-04-13 08:01:42.000000000 +0000
-+++ chrome/browser/ui/views/tabs/dragged_tab_view.h
-@@ -14,7 +14,7 @@
- namespace views {
- #if defined(OS_WIN)
- class WidgetWin;
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
- class WidgetGtk;
- #endif
- }
-@@ -71,7 +71,7 @@ class DraggedTabView : public views::Vie
- // The window that contains the DraggedTabView.
- #if defined(OS_WIN)
- scoped_ptr<views::WidgetWin> container_;
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
- scoped_ptr<views::WidgetGtk> container_;
- #endif
-
diff --git a/chromium/patches/patch-chrome_browser_ui_views_tabs_tab__strip.cc b/chromium/patches/patch-chrome_browser_ui_views_tabs_tab__strip.cc
deleted file mode 100644
index 552ba4a347..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_views_tabs_tab__strip.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_views_tabs_tab__strip.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/browser/ui/views/tabs/tab_strip.cc.orig 2011-05-24 08:01:42.000000000 +0000
-+++ chrome/browser/ui/views/tabs/tab_strip.cc
-@@ -31,7 +31,7 @@
- #if defined(OS_WIN)
- #include "views/widget/monitor_win.h"
- #include "views/widget/widget_win.h"
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_GTK)
- #include "views/widget/widget_gtk.h"
- #endif
-
diff --git a/chromium/patches/patch-chrome_browser_ui_views_tabs_tab__strip.h b/chromium/patches/patch-chrome_browser_ui_views_tabs_tab__strip.h
deleted file mode 100644
index 3b32098d46..0000000000
--- a/chromium/patches/patch-chrome_browser_ui_views_tabs_tab__strip.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_browser_ui_views_tabs_tab__strip.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/browser/ui/views/tabs/tab_strip.h.orig 2011-04-13 08:01:42.000000000 +0000
-+++ chrome/browser/ui/views/tabs/tab_strip.h
-@@ -19,7 +19,7 @@ class Tab;
-
- namespace views {
- class ImageView;
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_GTK)
- class WidgetGtk;
- #elif defined(OS_WIN)
- class WidgetWin;
diff --git a/chromium/patches/patch-chrome_browser_web__applications_web__app.cc b/chromium/patches/patch-chrome_browser_web__applications_web__app.cc
deleted file mode 100644
index 101c3dfe71..0000000000
--- a/chromium/patches/patch-chrome_browser_web__applications_web__app.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-chrome_browser_web__applications_web__app.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/browser/web_applications/web_app.cc.orig 2011-05-24 08:01:39.000000000 +0000
-+++ chrome/browser/web_applications/web_app.cc
-@@ -34,9 +34,9 @@
- #include "content/browser/browser_thread.h"
- #include "content/browser/tab_contents/tab_contents.h"
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "base/environment.h"
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
-
- #if defined(OS_WIN)
- #include "base/win/win_util.h"
-@@ -274,7 +274,7 @@ void CreateShortcutTask::Run() {
- bool CreateShortcutTask::CreateShortcut() {
- DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- scoped_ptr<base::Environment> env(base::Environment::Create());
-
- std::string shortcut_template;
diff --git a/chromium/patches/patch-chrome_chrome.gyp b/chromium/patches/patch-chrome_chrome.gyp
deleted file mode 100644
index 912854dbea..0000000000
--- a/chromium/patches/patch-chrome_chrome.gyp
+++ /dev/null
@@ -1,85 +0,0 @@
-$NetBSD: patch-chrome_chrome.gyp,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/chrome.gyp.orig 2011-05-24 08:01:58.000000000 +0000
-+++ chrome/chrome.gyp
-@@ -82,7 +82,7 @@
- 'platform_locale_settings_grd':
- 'app/resources/locale_settings_win.grd',
- },],
-- ['OS=="linux"', {
-+ ['OS=="linux"or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'nacl_defines': [
- 'NACL_WINDOWS=0',
- 'NACL_LINUX=1',
-@@ -537,7 +537,7 @@
- 'browser/debugger/inspectable_tab_proxy.h',
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
-@@ -601,7 +601,7 @@
- '<(DEPTH)/third_party/wtl/include',
- ],
- }],
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
-@@ -625,7 +625,7 @@
- '..',
- ],
- 'conditions': [
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
-@@ -748,7 +748,7 @@
- 'gpu/media/mft_angle_video_device.h',
- ],
- }],
-- ['OS=="linux" and target_arch!="arm"', {
-+ ['(OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd") and target_arch!="arm"', {
- 'sources': [
- 'gpu/x_util.cc',
- 'gpu/x_util.h',
-@@ -842,7 +842,7 @@
- 'sync_notifier',
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'dependencies': [
- '../build/linux/system.gyp:nss'
- ],
-@@ -1027,7 +1027,7 @@
- 'browser/sync/util/data_encryption.h',
- ],
- }],
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- '../build/linux/system.gyp:nss'
-@@ -1150,7 +1150,7 @@
- 'service/cloud_print/print_system_win.cc',
- ],
- }],
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
-@@ -1824,7 +1824,7 @@
- },
- ]}, # 'targets'
- ], # OS=="win"
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'targets': [{
- 'target_name': 'packed_resources',
- 'type': 'none',
diff --git a/chromium/patches/patch-chrome_chrome__browser.gypi b/chromium/patches/patch-chrome_chrome__browser.gypi
deleted file mode 100644
index 9734174832..0000000000
--- a/chromium/patches/patch-chrome_chrome__browser.gypi
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-chrome_chrome__browser.gypi,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/chrome_browser.gypi.orig 2011-05-24 08:01:58.000000000 +0000
-+++ chrome/chrome_browser.gypi
-@@ -3455,7 +3455,7 @@
- ['exclude', '^browser/views/tab_contents/tab_contents_view_gtk.h'],
- ],
- }],
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:dbus-glib',
- '../build/linux/system.gyp:gconf',
-@@ -3467,8 +3467,6 @@
- ],
- 'link_settings': {
- 'libraries': [
-- # For dlsym() in 'browser/zygote_main_linux.cc'
-- '-ldl',
- ],
- },
- 'sources!': [
-@@ -3527,7 +3525,22 @@
- 'browser/ui/webui/options/certificate_manager_handler.h',
- ],
- }],
-- ['OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux"', {
-+ 'link_settings': {
-+ 'libraries': [
-+ # For dlsym() in 'browser/zygote_main_linux.cc'
-+ '-ldl',
-+ ],
-+ },
-+ }],
-+ ['OS=="netbsd" or OS=="openbsd"', {
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lkvm',
-+ ],
-+ },
-+ }],
-+ ['OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- '../build/linux/system.gyp:gtkprint',
-@@ -4118,7 +4131,7 @@
- ],
- }],
- # GTK build only
-- ['OS=="linux" and toolkit_views==0', {
-+ ['(OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd") and toolkit_views==0', {
- 'sources/': [
- ['include', '^browser/printing/print_dialog_gtk.cc'],
- ['include', '^browser/printing/print_dialog_gtk.h'],
-@@ -4196,7 +4209,7 @@
- },
- ],
- }],
-- ['OS=="linux" and gcc_version==45', {
-+ ['(OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd") and gcc_version==45', {
- # Avoid gcc 4.5 miscompilation of template_url.cc
- # as per http://crbug.com/41887
- 'cflags': [
diff --git a/chromium/patches/patch-chrome_chrome__common.gypi b/chromium/patches/patch-chrome_chrome__common.gypi
deleted file mode 100644
index eb1156ee74..0000000000
--- a/chromium/patches/patch-chrome_chrome__common.gypi
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-chrome_chrome__common.gypi,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/chrome_common.gypi.orig 2011-05-24 08:01:58.000000000 +0000
-+++ chrome/chrome_common.gypi
-@@ -156,6 +156,14 @@
- 'common/win_safe_util.cc',
- 'common/win_safe_util.h',
- ],
-+ 'conditions': [
-+ ['OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
-+ 'sources!': [
-+ 'common/set_process_title_linux.cc',
-+ 'common/set_process_title_linux.h',
-+ ],
-+ }],
-+ ],
- }],
- ],
- },
-@@ -368,7 +376,7 @@
- 'common/zip.h',
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
-@@ -384,7 +392,7 @@
- ],
- },
- },],
-- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
-+ [ 'OS == "linux" or OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or OS == "openbsd" or OS == "solaris"', {
- 'include_dirs': [
- '<(SHARED_INTERMEDIATE_DIR)',
- ],
-@@ -510,7 +518,7 @@
- '../third_party/icu/icu.gyp:icuuc',
- ],
- 'conditions': [
-- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
-+ [ 'OS == "linux" or OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or OS == "openbsd"', {
- 'conditions': [
- ['use_openssl==1', {
- 'dependencies': [
diff --git a/chromium/patches/patch-chrome_chrome__exe.gypi b/chromium/patches/patch-chrome_chrome__exe.gypi
deleted file mode 100644
index ff8fc819b0..0000000000
--- a/chromium/patches/patch-chrome_chrome__exe.gypi
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_chrome__exe.gypi,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/chrome_exe.gypi.orig 2011-04-13 08:01:59.000000000 +0000
-+++ chrome/chrome_exe.gypi
-@@ -144,7 +144,7 @@
- 'use_system_xdg_utils%': 0,
- },
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'actions': [
- {
- 'action_name': 'manpage',
diff --git a/chromium/patches/patch-chrome_chrome__renderer.gypi b/chromium/patches/patch-chrome_chrome__renderer.gypi
deleted file mode 100644
index a3863b45f2..0000000000
--- a/chromium/patches/patch-chrome_chrome__renderer.gypi
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-chrome_chrome__renderer.gypi,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/chrome_renderer.gypi.orig 2011-04-13 08:01:59.000000000 +0000
-+++ chrome/chrome_renderer.gypi
-@@ -294,7 +294,15 @@
- ],
- }],
- # BSD-specific rules.
-- ['OS=="openbsd" or OS=="freebsd"', {
-+ ['OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
-+ 'conditions': [
-+ [ 'linux_use_tcmalloc==1', {
-+ 'dependencies': [
-+ '../base/allocator/allocator.gyp:allocator',
-+ ],
-+ },
-+ ],
-+ ],
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
diff --git a/chromium/patches/patch-chrome_chrome__tests.gypi b/chromium/patches/patch-chrome_chrome__tests.gypi
deleted file mode 100644
index fdf224db5a..0000000000
--- a/chromium/patches/patch-chrome_chrome__tests.gypi
+++ /dev/null
@@ -1,255 +0,0 @@
-$NetBSD: patch-chrome_chrome__tests.gypi,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/chrome_tests.gypi.orig 2011-05-24 08:01:58.000000000 +0000
-+++ chrome/chrome_tests.gypi
-@@ -185,7 +185,7 @@
- '../content/common/notification_observer_mock.h',
- ],
- 'conditions': [
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- '../build/linux/system.gyp:nss',
-@@ -239,7 +239,7 @@
- 'chrome.gyp:crash_service', # run time dependency
- ],
- }],
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
-@@ -279,7 +279,7 @@
- 'test/unit/run_all_unittests.cc',
- ],
- 'conditions': [
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- # Needed for the following #include chain:
- # test/unit/run_all_unittests.cc
-@@ -325,7 +325,7 @@
- },
- },
- },],
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
- ],
-@@ -398,14 +398,14 @@
- 'test/unit/chrome_test_suite.h',
- ],
- 'conditions': [
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- '../build/linux/system.gyp:nss',
- '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
- ],
- }],
-- ['OS=="linux" and toolkit_views==0', {
-+ ['(OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd") and toolkit_views==0', {
- 'sources!': [
- # TODO(port)
- 'browser/ui/views/bookmarks/bookmark_bar_view_test.cc',
-@@ -606,7 +606,7 @@
- '../webkit/webkit.gyp:copy_npapi_test_plugin',
- ],
- }],
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-@@ -672,7 +672,7 @@
- 'browser/printing/printing_layout_uitest.cc',
- ],
- }],
-- ['OS=="linux" or OS=="freebsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'conditions': [
- ['linux_use_tcmalloc==1', {
- 'dependencies': [
-@@ -782,7 +782,7 @@
- 'test/webdriver/commands/webelement_commands.cc',
- ],
- 'conditions': [
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-@@ -793,7 +793,7 @@
- '../views/views.gyp:views',
- ],
- }],
-- ['OS=="linux" or OS=="freebsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'conditions': [
- ['linux_use_tcmalloc==1', {
- 'dependencies': [
-@@ -939,7 +939,7 @@
- ],
- },],
- # Set fPIC in case it isn't set.
-- ['(OS=="linux" or OS=="openbsd" or OS=="freebsd" or OS=="solaris")'
-+ ['(OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris")'
- 'and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', {
- 'cflags': ['-fPIC'],
- },],
-@@ -1893,7 +1893,7 @@
- ['exclude', '^browser/chromeos/'],
- ],
- }],
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'conditions': [
- ['gcc_version==44', {
- # Avoid gcc 4.4 strict aliasing issues in stl_tree.h when
-@@ -1937,7 +1937,7 @@
- '../views/focus/accelerator_handler_gtk_unittest.cc',
- ],
- }],
-- ['OS=="linux" or OS=="freebsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'conditions': [
- ['linux_use_tcmalloc==1', {
- 'dependencies': [
-@@ -2362,7 +2362,7 @@
- 'test/plugin/pdf_browsertest.cc',
- ],
- }],
-- ['OS!="linux" or toolkit_views==1', {
-+ ['(OS!="linux" and OS!="dragonfly" and OS!="freebsd" and OS!="netbsd" and OS!="openbsd") or toolkit_views==1', {
- 'sources!': [
- 'browser/extensions/browser_action_test_util_gtk.cc',
- 'browser/ui/gtk/view_id_util_browsertest.cc',
-@@ -2420,7 +2420,7 @@
- '../content/browser/renderer_host/render_view_host_manager_browsertest.cc',
- ],
- }],
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- '../build/linux/system.gyp:nss',
-@@ -2458,7 +2458,7 @@
- 'browser/extensions/browser_action_test_util_mac.mm',
- ],
- }],
-- ['OS=="linux" or OS=="freebsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'conditions': [
- ['linux_use_tcmalloc==1', {
- 'dependencies': [
-@@ -2589,7 +2589,7 @@
- },
- },
- },],
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-@@ -2620,7 +2620,7 @@
- },
- },
- },],
-- ['OS=="linux" or OS=="freebsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'conditions': [
- ['linux_use_tcmalloc==1', {
- 'dependencies': [
-@@ -2690,7 +2690,7 @@
- },
- },
- },],
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
-@@ -2727,7 +2727,7 @@
- },
- },
- },],
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-@@ -2764,7 +2764,7 @@
- 'test/tab_switching/tab_switching_test.cc',
- ],
- 'conditions': [
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-@@ -2798,7 +2798,7 @@
- 'test/memory_test/memory_test.cc',
- ],
- 'conditions': [
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-@@ -2961,7 +2961,7 @@
- 'browser/sync/util/data_encryption_unittest.cc',
- ],
- }],
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- '../build/linux/system.gyp:nss',
-@@ -3075,7 +3075,7 @@
- ],
- 'conditions': [
- # Plugin code.
-- ['OS=="linux" or OS=="win"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="win"', {
- 'dependencies': [
- 'plugin',
- ],
-@@ -3083,7 +3083,7 @@
- 'plugin',
- ],
- }],
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- '../build/linux/system.gyp:nss',
-@@ -3228,7 +3228,7 @@
- # See comments about "xcode_settings" elsewhere in this file.
- 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
- }],
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- '../build/linux/system.gyp:nss',
-@@ -3311,7 +3311,7 @@
- 'test/perf/url_parse_perftest.cc',
- ],
- 'conditions': [
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
-@@ -3705,7 +3705,7 @@
- '../courgette/courgette.gyp:courgette_unittests',
- 'browser_tests',
- ]}],
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- # Reason for disabling UI tests on non-Linux above.
- 'ui_tests',
diff --git a/chromium/patches/patch-chrome_common__constants.gypi b/chromium/patches/patch-chrome_common__constants.gypi
deleted file mode 100644
index 4f1fba235b..0000000000
--- a/chromium/patches/patch-chrome_common__constants.gypi
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_common__constants.gypi,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/common_constants.gypi.orig 2011-04-13 08:01:59.000000000 +0000
-+++ chrome/common_constants.gypi
-@@ -67,7 +67,7 @@
- '../base/base.gyp:base',
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': ['../build/linux/system.gyp:gtk'],
- }],
- ],
diff --git a/chromium/patches/patch-chrome_common_chrome__constants.cc b/chromium/patches/patch-chrome_common_chrome__constants.cc
deleted file mode 100644
index ebaf95046c..0000000000
--- a/chromium/patches/patch-chrome_common_chrome__constants.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-chrome_common_chrome__constants.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/common/chrome_constants.cc.orig 2011-04-13 08:01:58.000000000 +0000
-+++ chrome/common/chrome_constants.cc
-@@ -27,7 +27,7 @@ const char kChromeVersionEnvVar[] = "CHR
- #if defined(OS_WIN)
- const FilePath::CharType kBrowserProcessExecutableName[] = FPL("chrome.exe");
- const FilePath::CharType kHelperProcessExecutableName[] = FPL("chrome.exe");
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- const FilePath::CharType kBrowserProcessExecutableName[] = FPL("chrome");
- // Helper processes end up with a name of "exe" due to execing via
- // /proc/self/exe. See bug 22703.
-@@ -40,7 +40,7 @@ const FilePath::CharType kHelperProcessE
- #if defined(OS_WIN)
- const FilePath::CharType kBrowserProcessExecutablePath[] = FPL("chrome.exe");
- const FilePath::CharType kHelperProcessExecutablePath[] = FPL("chrome.exe");
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- const FilePath::CharType kBrowserProcessExecutablePath[] = FPL("chrome");
- const FilePath::CharType kHelperProcessExecutablePath[] = FPL("chrome");
- #elif defined(OS_MACOSX)
diff --git a/chromium/patches/patch-chrome_common_chrome__paths.cc b/chromium/patches/patch-chrome_common_chrome__paths.cc
deleted file mode 100644
index dba50eb435..0000000000
--- a/chromium/patches/patch-chrome_common_chrome__paths.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_common_chrome__paths.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/common/chrome_paths.cc.orig 2011-04-13 08:01:58.000000000 +0000
-+++ chrome/common/chrome_paths.cc
-@@ -164,7 +164,7 @@ bool PathProvider(int key, FilePath* res
- cur = cur.Append(FILE_PATH_LITERAL("inspector"));
- break;
- case chrome::DIR_APP_DICTIONARIES:
--#if defined(OS_LINUX) || defined(OS_MACOSX)
-+#if defined(OS_POSIX)
- // We can't write into the EXE dir on Linux, so keep dictionaries
- // alongside the safe browsing database in the user data dir.
- // And we don't want to write into the bundle on the Mac, so push
diff --git a/chromium/patches/patch-chrome_common_chrome__switches.cc b/chromium/patches/patch-chrome_common_chrome__switches.cc
deleted file mode 100644
index 7c189cc40a..0000000000
--- a/chromium/patches/patch-chrome_common_chrome__switches.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_common_chrome__switches.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/common/chrome_switches.cc.orig 2011-05-24 08:01:58.000000000 +0000
-+++ chrome/common/chrome_switches.cc
-@@ -1174,7 +1174,7 @@ const char kEnableMediaPlayer[]
- const char kEnableAdvancedFileSystem[] = "enable-advanced-fs";
- #endif
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // Specify the amount the trackpad should scroll by.
- const char kScrollPixels[] = "scroll-pixels";
- #endif
diff --git a/chromium/patches/patch-chrome_common_chrome__switches.h b/chromium/patches/patch-chrome_common_chrome__switches.h
deleted file mode 100644
index 224c75b506..0000000000
--- a/chromium/patches/patch-chrome_common_chrome__switches.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_common_chrome__switches.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/common/chrome_switches.h.orig 2011-04-13 08:01:58.000000000 +0000
-+++ chrome/common/chrome_switches.h
-@@ -369,7 +369,7 @@ extern const char kEnableMediaPlayer[];
- extern const char kEnableAdvancedFileSystem[];
- #endif
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- extern const char kScrollPixels[];
- #endif
-
diff --git a/chromium/patches/patch-chrome_common_multi__process__lock.h b/chromium/patches/patch-chrome_common_multi__process__lock.h
deleted file mode 100644
index 4b782f9eec..0000000000
--- a/chromium/patches/patch-chrome_common_multi__process__lock.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_common_multi__process__lock.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/common/multi_process_lock.h.orig 2011-04-13 08:01:58.000000000 +0000
-+++ chrome/common/multi_process_lock.h
-@@ -18,7 +18,7 @@ class MultiProcessLock {
- // The length of a multi-process lock name is limited on Linux, so
- // it is limited it on all platforms for consistency. This length does
- // not include a terminator.
-- static const size_t MULTI_PROCESS_LOCK_NAME_MAX_LEN = 106;
-+ static const size_t MULTI_PROCESS_LOCK_NAME_MAX_LEN = 102;
-
- // Factory method for creating a multi-process lock.
- // |name| is the name of the lock. The name has special meaning on Windows
diff --git a/chromium/patches/patch-chrome_common_native__web__keyboard__event.h b/chromium/patches/patch-chrome_common_native__web__keyboard__event.h
deleted file mode 100644
index a0f99908ed..0000000000
--- a/chromium/patches/patch-chrome_common_native__web__keyboard__event.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_common_native__web__keyboard__event.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/common/native_web_keyboard_event.h.orig 2011-04-13 08:01:58.000000000 +0000
-+++ chrome/common/native_web_keyboard_event.h
-@@ -60,7 +60,7 @@ struct NativeWebKeyboardEvent : public W
- // Currently, it's only used by Linux and Mac ports.
- bool skip_in_browser;
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // True if the key event matches an edit command. In order to ensure the edit
- // command always work in web page, the browser should not pre-handle this key
- // event as a reserved accelerator. See http://crbug.com/54573
diff --git a/chromium/patches/patch-chrome_common_plugin__messages.cc b/chromium/patches/patch-chrome_common_plugin__messages.cc
deleted file mode 100644
index 26f097dcb6..0000000000
--- a/chromium/patches/patch-chrome_common_plugin__messages.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-chrome_common_plugin__messages.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/common/plugin_messages.cc.orig 2011-04-13 08:01:58.000000000 +0000
-+++ chrome/common/plugin_messages.cc
-@@ -56,7 +56,7 @@ NPVariant_Param::~NPVariant_Param() {
-
- PluginMsg_UpdateGeometry_Param::PluginMsg_UpdateGeometry_Param()
- : transparent(false),
--#if !defined(OS_MACOSX)
-+#if !defined(OS_MACOSX) && !defined(OS_BSD)
- windowless_buffer(TransportDIB::DefaultHandleValue()),
- background_buffer(TransportDIB::DefaultHandleValue())
- #else
-@@ -271,7 +271,7 @@ void ParamTraits<PluginMsg_UpdateGeometr
- WriteParam(m, p.windowless_buffer);
- WriteParam(m, p.background_buffer);
- WriteParam(m, p.transparent);
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- WriteParam(m, p.ack_key);
- #endif
- }
-@@ -285,7 +285,7 @@ bool ParamTraits<PluginMsg_UpdateGeometr
- ReadParam(m, iter, &r->windowless_buffer) &&
- ReadParam(m, iter, &r->background_buffer) &&
- ReadParam(m, iter, &r->transparent)
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- &&
- ReadParam(m, iter, &r->ack_key)
- #endif
-@@ -304,7 +304,7 @@ void ParamTraits<PluginMsg_UpdateGeometr
- LogParam(p.background_buffer, l);
- l->append(", ");
- LogParam(p.transparent, l);
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- l->append(", ");
- LogParam(p.ack_key, l);
- #endif
diff --git a/chromium/patches/patch-chrome_common_plugin__messages.h b/chromium/patches/patch-chrome_common_plugin__messages.h
deleted file mode 100644
index b13c98985c..0000000000
--- a/chromium/patches/patch-chrome_common_plugin__messages.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_common_plugin__messages.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/common/plugin_messages.h.orig 2011-04-13 08:01:58.000000000 +0000
-+++ chrome/common/plugin_messages.h
-@@ -116,7 +116,7 @@ struct PluginMsg_UpdateGeometry_Param {
- TransportDIB::Handle windowless_buffer;
- TransportDIB::Handle background_buffer;
-
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- // This field contains a key that the plug-in process is expected to return
- // to the renderer in its ACK message, unless the value is -1, in which case
- // no ACK message is required. Other than the special -1 value, the values
diff --git a/chromium/patches/patch-chrome_common_render__messages__internal.h b/chromium/patches/patch-chrome_common_render__messages__internal.h
deleted file mode 100644
index ddb0a256d6..0000000000
--- a/chromium/patches/patch-chrome_common_render__messages__internal.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_common_render__messages__internal.h,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/common/render_messages_internal.h.orig 2011-05-24 08:01:58.000000000 +0000
-+++ chrome/common/render_messages_internal.h
-@@ -1931,7 +1931,7 @@ IPC_MESSAGE_ROUTED3(ViewHostMsg_CommandS
- bool /* is_enabled */,
- int /* checked_state */)
-
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- // On OSX, we cannot allocated shared memory from within the sandbox, so
- // this call exists for the renderer to ask the browser to allocate memory
- // on its behalf. We return a file descriptor to the POSIX shared memory.
diff --git a/chromium/patches/patch-chrome_common_service__process__util__posix.h b/chromium/patches/patch-chrome_common_service__process__util__posix.h
deleted file mode 100644
index 2e340549b9..0000000000
--- a/chromium/patches/patch-chrome_common_service__process__util__posix.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-chrome_common_service__process__util__posix.h,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/common/service_process_util_posix.h.orig 2011-05-24 08:01:58.000000000 +0000
-+++ chrome/common/service_process_util_posix.h
-@@ -14,7 +14,7 @@
- #include "base/message_pump_libevent.h"
- #include "base/scoped_ptr.h"
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "chrome/common/multi_process_lock.h"
- MultiProcessLock* TakeServiceRunningLock(bool waiting);
- #endif // OS_LINUX
-@@ -65,7 +65,7 @@ struct ServiceProcessState::StateData
- FilePathWatcher executable_watcher_;
- ServiceProcessState* state_;
- #endif // OS_MACOSX
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- scoped_ptr<MultiProcessLock> initializing_lock_;
- scoped_ptr<MultiProcessLock> running_lock_;
- #endif // OS_LINUX
diff --git a/chromium/patches/patch-chrome_default__plugin_default__plugin.gyp b/chromium/patches/patch-chrome_default__plugin_default__plugin.gyp
deleted file mode 100644
index 6b226534b1..0000000000
--- a/chromium/patches/patch-chrome_default__plugin_default__plugin.gyp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_default__plugin_default__plugin.gyp,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/default_plugin/default_plugin.gyp.orig 2011-04-13 08:01:59.000000000 +0000
-+++ chrome/default_plugin/default_plugin.gyp
-@@ -54,7 +54,7 @@
- 'plugin_install_job_monitor.h',
- ],
- }],
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '<(DEPTH)/build/linux/system.gyp:gtk',
- ],
diff --git a/chromium/patches/patch-chrome_gpu_x__util.h b/chromium/patches/patch-chrome_gpu_x__util.h
deleted file mode 100644
index 7fe6d0c625..0000000000
--- a/chromium/patches/patch-chrome_gpu_x__util.h
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-chrome_gpu_x__util.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/gpu/x_util.h.orig 2011-04-13 08:01:44.000000000 +0000
-+++ chrome/gpu/x_util.h
-@@ -12,7 +12,7 @@
- #include "build/build_config.h"
- #include "chrome/gpu/gpu_config.h"
-
--#if defined(OS_LINUX)
-+#if defined(USE_X11)
-
- // Forward declares ------------------------------------------------------------
- //
-@@ -42,6 +42,6 @@ class ScopedPtrXFree {
- void operator()(void* x) const;
- };
-
--#endif // OS_LINUX
-+#endif // USE_X11
-
- #endif // CHROME_GPU_X_UTIL_H_
diff --git a/chromium/patches/patch-chrome_nacl_nacl__main.cc b/chromium/patches/patch-chrome_nacl_nacl__main.cc
deleted file mode 100644
index 0fa08f18ed..0000000000
--- a/chromium/patches/patch-chrome_nacl_nacl__main.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_nacl_nacl__main.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/nacl/nacl_main.cc.orig 2011-04-13 08:01:59.000000000 +0000
-+++ chrome/nacl/nacl_main.cc
-@@ -114,7 +114,7 @@ int NaClMain(const MainFunctionParams& p
- ui::SystemMonitor system_monitor;
- HighResolutionTimerManager hi_res_timer_manager;
-
--#if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_POSIX)
- NaClMainPlatformDelegate platform(parameters);
-
- platform.PlatformInitialize();
diff --git a/chromium/patches/patch-chrome_plugin_plugin__main__linux.cc b/chromium/patches/patch-chrome_plugin_plugin__main__linux.cc
deleted file mode 100644
index 297518ac24..0000000000
--- a/chromium/patches/patch-chrome_plugin_plugin__main__linux.cc
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-chrome_plugin_plugin__main__linux.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/plugin/plugin_main_linux.cc.orig 2011-04-13 08:01:44.000000000 +0000
-+++ chrome/plugin/plugin_main_linux.cc
-@@ -5,13 +5,13 @@
- #include <signal.h>
- #include <string.h>
- #include <sys/types.h>
--#include <syscall.h>
-+#include <sys/syscall.h>
- #include <unistd.h>
-
- #include "build/build_config.h"
-
- // This whole file is only useful on 64-bit architectures.
--#if defined(ARCH_CPU_64_BITS)
-+#if defined(ARCH_CPU_64_BITS) && !defined(OS_BSD)
-
- namespace {
-
diff --git a/chromium/patches/patch-chrome_plugin_plugin__thread.cc b/chromium/patches/patch-chrome_plugin_plugin__thread.cc
deleted file mode 100644
index 4a4ae9ff43..0000000000
--- a/chromium/patches/patch-chrome_plugin_plugin__thread.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-chrome_plugin_plugin__thread.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/plugin/plugin_thread.cc.orig 2011-04-13 08:01:44.000000000 +0000
-+++ chrome/plugin/plugin_thread.cc
-@@ -6,7 +6,7 @@
-
- #include "build/build_config.h"
-
--#if defined(USE_X11)
-+#if defined(TOOLKIT_USES_GTK)
- #include <gtk/gtk.h>
- #elif defined(OS_MACOSX)
- #include <CoreFoundation/CoreFoundation.h>
-@@ -57,7 +57,7 @@ PluginThread::PluginThread()
- switches::kPluginPath);
-
- lazy_tls.Pointer()->Set(this);
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_GTK)
- {
- // XEmbed plugins assume they are hosted in a Gtk application, so we need
- // to initialize Gtk in the plugin process.
diff --git a/chromium/patches/patch-chrome_plugin_webplugin__delegate__stub.cc b/chromium/patches/patch-chrome_plugin_webplugin__delegate__stub.cc
deleted file mode 100644
index efc88630a7..0000000000
--- a/chromium/patches/patch-chrome_plugin_webplugin__delegate__stub.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_plugin_webplugin__delegate__stub.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/plugin/webplugin_delegate_stub.cc.orig 2011-04-13 08:01:44.000000000 +0000
-+++ chrome/plugin/webplugin_delegate_stub.cc
-@@ -314,7 +314,7 @@ void WebPluginDelegateStub::OnUpdateGeom
- param.window_rect, param.clip_rect,
- param.windowless_buffer, param.background_buffer,
- param.transparent
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- ,
- param.ack_key
- #endif
diff --git a/chromium/patches/patch-chrome_plugin_webplugin__proxy.cc b/chromium/patches/patch-chrome_plugin_webplugin__proxy.cc
deleted file mode 100644
index b7eced4178..0000000000
--- a/chromium/patches/patch-chrome_plugin_webplugin__proxy.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_plugin_webplugin__proxy.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/plugin/webplugin_proxy.cc.orig 2011-04-13 08:01:44.000000000 +0000
-+++ chrome/plugin/webplugin_proxy.cc
-@@ -483,7 +483,7 @@ void WebPluginProxy::UpdateGeometry(
- const TransportDIB::Handle& windowless_buffer,
- const TransportDIB::Handle& background_buffer,
- bool transparent
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- ,
- int ack_key
- #endif
diff --git a/chromium/patches/patch-chrome_plugin_webplugin__proxy.h b/chromium/patches/patch-chrome_plugin_webplugin__proxy.h
deleted file mode 100644
index 28f64996ad..0000000000
--- a/chromium/patches/patch-chrome_plugin_webplugin__proxy.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_plugin_webplugin__proxy.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/plugin/webplugin_proxy.h.orig 2011-04-13 08:01:44.000000000 +0000
-+++ chrome/plugin/webplugin_proxy.h
-@@ -132,7 +132,7 @@ class WebPluginProxy : public webkit::np
- const TransportDIB::Handle& windowless_buffer,
- const TransportDIB::Handle& background_buffer,
- bool transparent
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- ,
- int ack_key
- #endif
diff --git a/chromium/patches/patch-chrome_renderer_nacl__desc__wrapper__chrome.cc b/chromium/patches/patch-chrome_renderer_nacl__desc__wrapper__chrome.cc
deleted file mode 100644
index bbe40b7923..0000000000
--- a/chromium/patches/patch-chrome_renderer_nacl__desc__wrapper__chrome.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-chrome_renderer_nacl__desc__wrapper__chrome.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/renderer/nacl_desc_wrapper_chrome.cc.orig 2011-04-13 08:01:45.000000000 +0000
-+++ chrome/renderer/nacl_desc_wrapper_chrome.cc
-@@ -14,7 +14,7 @@ namespace nacl {
- DescWrapper* DescWrapperFactory::ImportPepperSharedMemory(intptr_t shm_int,
- size_t size) {
- base::SharedMemory* shm = reinterpret_cast<base::SharedMemory*>(shm_int);
--#if defined(OS_LINUX) || defined(OS_MACOSX)
-+#if defined(OS_POSIX)
- return ImportShmHandle(shm->handle().fd, size);
- #elif defined(OS_WIN)
- return ImportShmHandle(shm->handle(), size);
-@@ -28,7 +28,7 @@ DescWrapper* DescWrapperFactory::ImportP
- #if defined(OS_LINUX)
- // TransportDIBs use SysV (X) shared memory on Linux.
- return ImportSysvShm(dib->handle(), dib->size());
--#elif defined(OS_MACOSX)
-+#elif defined(OS_MACOSX) || defined(OS_BSD)
- // TransportDIBs use mmap shared memory on OSX.
- return ImportShmHandle(dib->handle().fd, dib->size());
- #elif defined(OS_WIN)
diff --git a/chromium/patches/patch-chrome_renderer_pepper__devices.cc b/chromium/patches/patch-chrome_renderer_pepper__devices.cc
deleted file mode 100644
index 37f534ad53..0000000000
--- a/chromium/patches/patch-chrome_renderer_pepper__devices.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_renderer_pepper__devices.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/renderer/pepper_devices.cc.orig 2011-04-13 08:01:45.000000000 +0000
-+++ chrome/renderer/pepper_devices.cc
-@@ -52,7 +52,7 @@ NPError Graphics2DDeviceContext::Initial
- uint32 buffer_size = width * height * kBytesPerPixel;
-
- // Allocate the transport DIB and the PlatformCanvas pointing to it.
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- // On the Mac, shared memory has to be created in the browser in order to
- // work in the sandbox. Do this by sending a message to the browser
- // requesting a TransportDIB (see also
diff --git a/chromium/patches/patch-chrome_renderer_pepper__plugin__delegate__impl.cc b/chromium/patches/patch-chrome_renderer_pepper__plugin__delegate__impl.cc
deleted file mode 100644
index f1fa9d33e1..0000000000
--- a/chromium/patches/patch-chrome_renderer_pepper__plugin__delegate__impl.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-chrome_renderer_pepper__plugin__delegate__impl.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/renderer/pepper_plugin_delegate_impl.cc.orig 2011-05-24 08:01:44.000000000 +0000
-+++ chrome/renderer/pepper_plugin_delegate_impl.cc
-@@ -54,7 +54,7 @@
- #include "webkit/plugins/ppapi/ppb_flash_impl.h"
- #include "webkit/plugins/ppapi/ppb_flash_net_connector_impl.h"
-
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- #include "chrome/renderer/render_thread.h"
- #endif
-
-@@ -81,7 +81,7 @@ class PlatformImage2DImpl
- dib_(dib) {
- }
-
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- // On Mac, we have to tell the browser to free the transport DIB.
- virtual ~PlatformImage2DImpl() {
- if (dib_.get()) {
-@@ -99,7 +99,7 @@ class PlatformImage2DImpl
- *byte_count = dib_->size();
- #if defined(OS_WIN)
- return reinterpret_cast<intptr_t>(dib_->handle());
--#elif defined(OS_MACOSX)
-+#elif defined(OS_MACOSX) || defined(OS_BSD)
- return static_cast<intptr_t>(dib_->handle().fd);
- #elif defined(OS_LINUX)
- return static_cast<intptr_t>(dib_->handle());
-@@ -499,7 +499,7 @@ PepperPluginDelegateImpl::CreateImage2D(
- uint32 buffer_size = width * height * 4;
-
- // Allocate the transport DIB and the PlatformCanvas pointing to it.
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- // On the Mac, shared memory has to be created in the browser in order to
- // work in the sandbox. Do this by sending a message to the browser
- // requesting a TransportDIB (see also
diff --git a/chromium/patches/patch-chrome_renderer_pepper__scrollbar__widget.h b/chromium/patches/patch-chrome_renderer_pepper__scrollbar__widget.h
deleted file mode 100644
index 635c04c4f0..0000000000
--- a/chromium/patches/patch-chrome_renderer_pepper__scrollbar__widget.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_renderer_pepper__scrollbar__widget.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/renderer/pepper_scrollbar_widget.h.orig 2011-04-13 08:01:45.000000000 +0000
-+++ chrome/renderer/pepper_scrollbar_widget.h
-@@ -38,7 +38,7 @@ class PepperScrollbarWidget : public Pep
- virtual void getTickmarks(WebKit::WebScrollbar*,
- WebKit::WebVector<WebKit::WebRect>*) const;
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- static void SetScrollbarColors(unsigned inactive_color,
- unsigned active_color,
- unsigned track_color);
diff --git a/chromium/patches/patch-chrome_renderer_render__process__impl.cc b/chromium/patches/patch-chrome_renderer_render__process__impl.cc
deleted file mode 100644
index ff52bdfe51..0000000000
--- a/chromium/patches/patch-chrome_renderer_render__process__impl.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-chrome_renderer_render__process__impl.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/renderer/render_process_impl.cc.orig 2011-04-13 08:01:45.000000000 +0000
-+++ chrome/renderer/render_process_impl.cc
-@@ -244,7 +244,7 @@ TransportDIB* RenderProcessImpl::CreateT
- #if defined(OS_WIN) || defined(OS_LINUX)
- // Windows and Linux create transport DIBs inside the renderer
- return TransportDIB::Create(size, transport_dib_next_sequence_number_++);
--#elif defined(OS_MACOSX) // defined(OS_WIN) || defined(OS_LINUX)
-+#elif defined(OS_MACOSX) || defined(OS_BSD) // defined(OS_WIN) || defined(OS_LINUX)
- // Mac creates transport DIBs in the browser, so we need to do a sync IPC to
- // get one. The TransportDIB is cached in the browser.
- TransportDIB::Handle handle;
-@@ -261,7 +261,7 @@ void RenderProcessImpl::FreeTransportDIB
- if (!dib)
- return;
-
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- // On Mac we need to tell the browser that it can drop a reference to the
- // shared memory.
- IPC::Message* msg = new ViewHostMsg_FreeTransportDIB(dib->id());
-@@ -279,7 +279,7 @@ skia::PlatformCanvas* RenderProcessImpl:
- int width = rect.width();
- int height = rect.height();
- const size_t stride = skia::PlatformCanvas::StrideForWidth(rect.width());
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- const size_t max_size = base::SysInfo::MaxSharedMemorySize();
- #else
- const size_t max_size = 0;
diff --git a/chromium/patches/patch-chrome_renderer_render__thread.cc b/chromium/patches/patch-chrome_renderer_render__thread.cc
deleted file mode 100644
index 9d74528073..0000000000
--- a/chromium/patches/patch-chrome_renderer_render__thread.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-chrome_renderer_render__thread.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/renderer/render_thread.cc.orig 2011-04-13 08:01:45.000000000 +0000
-+++ chrome/renderer/render_thread.cc
-@@ -984,7 +984,7 @@ void RenderThread::EnsureWebKitInitializ
- }
-
- void RenderThread::IdleHandler() {
--#if (defined(OS_WIN) || defined(OS_LINUX)) && defined(USE_TCMALLOC)
-+#if !defined(OS_MACOSX) && defined(USE_TCMALLOC)
- MallocExtension::instance()->ReleaseFreeMemory();
- #endif
-
-@@ -1060,7 +1060,7 @@ void RenderThread::OnPurgeMemory() {
- while (!v8::V8::IdleNotification()) {
- }
-
--#if (defined(OS_WIN) || defined(OS_LINUX)) && defined(USE_TCMALLOC)
-+#if !defined(OS_MACOSX) && defined(USE_TCMALLOC)
- // Tell tcmalloc to release any free pages it's still holding.
- MallocExtension::instance()->ReleaseFreeMemory();
- #endif
diff --git a/chromium/patches/patch-chrome_renderer_render__view.h b/chromium/patches/patch-chrome_renderer_render__view.h
deleted file mode 100644
index fa7594de1d..0000000000
--- a/chromium/patches/patch-chrome_renderer_render__view.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_renderer_render__view.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/renderer/render_view.h.orig 2011-04-13 08:01:45.000000000 +0000
-+++ chrome/renderer/render_view.h
-@@ -1112,7 +1112,7 @@ class RenderView : public RenderWidget,
- // periodic timer so we don't send too many messages.
- void SyncNavigationState();
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- void UpdateFontRenderingFromRendererPrefs();
- #else
- void UpdateFontRenderingFromRendererPrefs() {}
diff --git a/chromium/patches/patch-chrome_renderer_render__widget.cc b/chromium/patches/patch-chrome_renderer_render__widget.cc
deleted file mode 100644
index 21ddc1446a..0000000000
--- a/chromium/patches/patch-chrome_renderer_render__widget.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_renderer_render__widget.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/renderer/render_widget.cc.orig 2011-04-13 08:01:45.000000000 +0000
-+++ chrome/renderer/render_widget.cc
-@@ -888,7 +888,7 @@ void RenderWidget::OnMsgPaintAtSize(cons
- // Close our unused handle.
- #if defined(OS_WIN)
- ::CloseHandle(dib_handle);
--#elif defined(OS_MACOSX)
-+#elif defined(OS_MACOSX) || defined(OS_BSD)
- base::SharedMemory::CloseHandle(dib_handle);
- #endif
- }
diff --git a/chromium/patches/patch-chrome_renderer_renderer__glue.cc b/chromium/patches/patch-chrome_renderer_renderer__glue.cc
deleted file mode 100644
index 2a03510215..0000000000
--- a/chromium/patches/patch-chrome_renderer_renderer__glue.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-chrome_renderer_renderer__glue.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/renderer/renderer_glue.cc.orig 2011-04-13 08:01:45.000000000 +0000
-+++ chrome/renderer/renderer_glue.cc
-@@ -43,7 +43,7 @@
-
- #if defined(OS_WIN)
- #include <strsafe.h> // note: per msdn docs, this must *follow* other includes
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #include "chrome/renderer/renderer_sandbox_support_linux.h"
- #endif
-
-@@ -305,7 +305,7 @@ bool LaunchSelLdr(const char* alleged_ur
- }
- #endif
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- int MatchFontWithFallback(const std::string& face, bool bold,
- bool italic, int charset) {
- return renderer_sandbox_support::MatchFontWithFallback(
diff --git a/chromium/patches/patch-chrome_renderer_renderer__main.cc b/chromium/patches/patch-chrome_renderer_renderer__main.cc
deleted file mode 100644
index e26272521d..0000000000
--- a/chromium/patches/patch-chrome_renderer_renderer__main.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-chrome_renderer_renderer__main.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/renderer/renderer_main.cc.orig 2011-04-13 08:01:45.000000000 +0000
-+++ chrome/renderer/renderer_main.cc
-@@ -272,7 +272,7 @@ int RendererMain(const MainFunctionParam
- PepperPluginRegistry::GetInstance();
-
- {
--#if !defined(OS_LINUX)
-+#if !defined(OS_LINUX) && !defined(OS_BSD)
- // TODO(markus): Check if it is OK to unconditionally move this
- // instruction down.
- RenderProcessImpl render_process;
-@@ -284,7 +284,7 @@ int RendererMain(const MainFunctionParam
- } else {
- LOG(ERROR) << "Running without renderer sandbox";
- }
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- RenderProcessImpl render_process;
- render_process.set_main_thread(new RenderThread());
- #endif
diff --git a/chromium/patches/patch-chrome_renderer_renderer__main__platform__delegate__linux.cc b/chromium/patches/patch-chrome_renderer_renderer__main__platform__delegate__linux.cc
deleted file mode 100644
index c5e4140ee9..0000000000
--- a/chromium/patches/patch-chrome_renderer_renderer__main__platform__delegate__linux.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_renderer_renderer__main__platform__delegate__linux.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/renderer/renderer_main_platform_delegate_linux.cc.orig 2011-04-13 08:01:45.000000000 +0000
-+++ chrome/renderer/renderer_main_platform_delegate_linux.cc
-@@ -36,7 +36,7 @@ bool RendererMainPlatformDelegate::Enabl
- // The seccomp sandbox is started in the renderer.
- // http://code.google.com/p/seccompsandbox/
- #if defined(ARCH_CPU_X86_FAMILY) && !defined(CHROMIUM_SELINUX) && \
-- !defined(__clang__)
-+ !defined(__clang__) && !defined(OS_BSD)
- // N.b. SupportsSeccompSandbox() returns a cached result, as we already
- // called it earlier in the zygote. Thus, it is OK for us to not pass in
- // a file descriptor for "/proc".
diff --git a/chromium/patches/patch-chrome_renderer_renderer__webkitclient__impl.cc b/chromium/patches/patch-chrome_renderer_renderer__webkitclient__impl.cc
deleted file mode 100644
index 8c468a2cfe..0000000000
--- a/chromium/patches/patch-chrome_renderer_renderer__webkitclient__impl.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-chrome_renderer_renderer__webkitclient__impl.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/renderer/renderer_webkitclient_impl.cc.orig 2011-05-24 08:01:44.000000000 +0000
-+++ chrome/renderer/renderer_webkitclient_impl.cc
-@@ -55,7 +55,7 @@
- #include "third_party/WebKit/Source/WebKit/chromium/public/mac/WebSandboxSupport.h"
- #endif
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include <string>
- #include <map>
-
-@@ -113,7 +113,7 @@ class RendererWebKitClientImpl::SandboxS
- virtual bool ensureFontLoaded(HFONT);
- #elif defined(OS_MACOSX)
- virtual bool loadFont(NSFont* srcFont, ATSFontContainerRef* out);
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- virtual WebKit::WebString getFontFamilyForCharacters(
- const WebKit::WebUChar* characters,
- size_t numCharacters,
-@@ -430,7 +430,7 @@ bool RendererWebKitClientImpl::SandboxSu
- return RenderThread::current()->Send(new ViewHostMsg_PreCacheFont(logfont));
- }
-
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
-
- WebString RendererWebKitClientImpl::SandboxSupport::getFontFamilyForCharacters(
- const WebKit::WebUChar* characters,
diff --git a/chromium/patches/patch-chrome_renderer_webplugin__delegate__pepper.cc b/chromium/patches/patch-chrome_renderer_webplugin__delegate__pepper.cc
deleted file mode 100644
index 23de7aa5d7..0000000000
--- a/chromium/patches/patch-chrome_renderer_webplugin__delegate__pepper.cc
+++ /dev/null
@@ -1,94 +0,0 @@
-$NetBSD: patch-chrome_renderer_webplugin__delegate__pepper.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/renderer/webplugin_delegate_pepper.cc.orig 2011-05-24 08:01:44.000000000 +0000
-+++ chrome/renderer/webplugin_delegate_pepper.cc
-@@ -9,7 +9,7 @@
- #include <string>
- #include <vector>
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include <unistd.h>
- #endif
-
-@@ -53,7 +53,7 @@
- #if defined(OS_MACOSX)
- #include "base/mac/mac_util.h"
- #include "base/mac/scoped_cftyperef.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #include "chrome/renderer/renderer_sandbox_support_linux.h"
- #include "printing/pdf_ps_metafile_cairo.h"
- #elif defined(OS_WIN)
-@@ -414,7 +414,7 @@ bool WebPluginDelegatePepper::SetCursor(
- NPError NPMatchFontWithFallback(NPP instance,
- const NPFontDescription* description,
- NPFontID* id) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- int fd = renderer_sandbox_support::MatchFontWithFallback(
- description->face, description->weight >= 700, description->italic,
- description->charset);
-@@ -433,7 +433,7 @@ NPError GetFontTable(NPP instance,
- uint32_t table,
- void* output,
- size_t* output_length) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- bool rv = renderer_sandbox_support::GetFontTable(
- id, table, static_cast<uint8_t*>(output), output_length);
- return rv ? NPERR_NO_ERROR : NPERR_GENERIC_ERROR;
-@@ -444,7 +444,7 @@ NPError GetFontTable(NPP instance,
- }
-
- NPError NPDestroyFont(NPP instance, NPFontID id) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- close(id);
- return NPERR_NO_ERROR;
- #else
-@@ -823,7 +823,7 @@ int WebPluginDelegatePepper::PrintBegin(
- current_printer_dpi_ = printer_dpi;
- }
- }
--#if defined (OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- num_pages_ = num_pages;
- pdf_output_done_ = false;
- #endif // (OS_LINUX)
-@@ -852,7 +852,7 @@ bool WebPluginDelegatePepper::VectorPrin
- unsigned char* pdf_output = NULL;
- int32 output_size = 0;
- NPPrintPageNumberRange page_range;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // On Linux we will try and output all pages as PDF in the first call to
- // PrintPage. This is a temporary hack.
- // TODO(sanjeevr): Remove this hack and fix this by changing the print
-@@ -871,7 +871,7 @@ bool WebPluginDelegatePepper::VectorPrin
- return false;
-
- bool ret = false;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // On Linux we need to get the backing PdfPsMetafile and write the bits
- // directly.
- cairo_t* context = canvas->beginPlatformPaint();
-@@ -1026,7 +1026,7 @@ void WebPluginDelegatePepper::PrintEnd()
- current_printer_dpi_ = -1;
- #if defined(OS_MACOSX)
- last_printed_page_ = SkBitmap();
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- num_pages_ = 0;
- pdf_output_done_ = false;
- #endif // defined(OS_LINUX)
-@@ -1039,7 +1039,7 @@ WebPluginDelegatePepper::WebPluginDelega
- plugin_(NULL),
- instance_(instance),
- current_printer_dpi_(-1),
--#if defined (OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- num_pages_(0),
- pdf_output_done_(false),
- #endif // (OS_LINUX)
diff --git a/chromium/patches/patch-chrome_renderer_webplugin__delegate__pepper.h b/chromium/patches/patch-chrome_renderer_webplugin__delegate__pepper.h
deleted file mode 100644
index ab191dc6bb..0000000000
--- a/chromium/patches/patch-chrome_renderer_webplugin__delegate__pepper.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-chrome_renderer_webplugin__delegate__pepper.h,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/renderer/webplugin_delegate_pepper.h.orig 2011-05-24 08:01:44.000000000 +0000
-+++ chrome/renderer/webplugin_delegate_pepper.h
-@@ -281,7 +281,7 @@ class WebPluginDelegatePepper : public w
- // variable to hold on to the pixels.
- SkBitmap last_printed_page_;
- #endif // defined(OS_MACOSX)
--#if defined (OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // On Linux, we always send all pages from the renderer to the browser.
- // So, if the plugin supports printPagesAsPDF we print the entire output
- // in one shot in the first call to PrintPage.
-@@ -292,7 +292,7 @@ class WebPluginDelegatePepper : public w
- // Specifies whether we have already output all pages. This is used to ignore
- // subsequent PrintPage requests.
- bool pdf_output_done_;
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
-
- // The id of the current find operation, or -1 if none is in process.
- int find_identifier_;
diff --git a/chromium/patches/patch-chrome_renderer_webplugin__delegate__proxy.cc b/chromium/patches/patch-chrome_renderer_webplugin__delegate__proxy.cc
deleted file mode 100644
index fedb03b15b..0000000000
--- a/chromium/patches/patch-chrome_renderer_webplugin__delegate__proxy.cc
+++ /dev/null
@@ -1,64 +0,0 @@
-$NetBSD: patch-chrome_renderer_webplugin__delegate__proxy.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/renderer/webplugin_delegate_proxy.cc.orig 2011-04-13 08:01:45.000000000 +0000
-+++ chrome/renderer/webplugin_delegate_proxy.cc
-@@ -158,7 +158,7 @@ class ResourceClientProxy : public webki
- bool multibyte_response_expected_;
- };
-
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- static void ReleaseTransportDIB(TransportDIB* dib) {
- if (dib) {
- IPC::Message* message = new ViewHostMsg_FreeTransportDIB(dib->id());
-@@ -184,7 +184,7 @@ WebPluginDelegateProxy::WebPluginDelegat
- }
-
- WebPluginDelegateProxy::~WebPluginDelegateProxy() {
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- // Ask the browser to release old TransportDIB objects for which no
- // PluginHostMsg_UpdateGeometry_ACK was ever received from the plugin
- // process.
-@@ -530,7 +530,7 @@ void WebPluginDelegateProxy::UpdateGeome
- bool bitmaps_changed = false;
-
- PluginMsg_UpdateGeometry_Param param;
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- param.ack_key = -1;
- #endif
-
-@@ -542,7 +542,7 @@ void WebPluginDelegateProxy::UpdateGeome
- bitmaps_changed = true;
-
- bool needs_background_store = transparent_;
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- // We don't support transparency under QuickDraw, and CoreGraphics
- // preserves transparency information (and does the compositing itself)
- // so plugins don't need access to the page background.
-@@ -614,7 +614,7 @@ void WebPluginDelegateProxy::UpdateGeome
- }
-
- void WebPluginDelegateProxy::ResetWindowlessBitmaps() {
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- DCHECK(!background_store_.get());
- // The Mac TransportDIB implementation uses base::SharedMemory, which
- // cannot be disposed of if an in-flight UpdateGeometry message refers to
-@@ -675,12 +675,12 @@ bool WebPluginDelegateProxy::CreateShare
- scoped_ptr<TransportDIB>* memory,
- scoped_ptr<skia::PlatformCanvas>* canvas) {
- const size_t size = BitmapSizeForPluginRect(plugin_rect_);
--#if defined(OS_POSIX) && !defined(OS_MACOSX)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
- memory->reset(TransportDIB::Create(size, 0));
- if (!memory->get())
- return false;
- #endif
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- TransportDIB::Handle handle;
- IPC::Message* msg = new ViewHostMsg_AllocTransportDIB(size, true, &handle);
- if (!RenderThread::current()->Send(msg))
diff --git a/chromium/patches/patch-chrome_renderer_webplugin__delegate__proxy.h b/chromium/patches/patch-chrome_renderer_webplugin__delegate__proxy.h
deleted file mode 100644
index a0a74b7f0b..0000000000
--- a/chromium/patches/patch-chrome_renderer_webplugin__delegate__proxy.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-chrome_renderer_webplugin__delegate__proxy.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/renderer/webplugin_delegate_proxy.h.orig 2011-04-13 08:01:45.000000000 +0000
-+++ chrome/renderer/webplugin_delegate_proxy.h
-@@ -21,7 +21,7 @@
- #include "webkit/plugins/npapi/webplugininfo.h"
- #include "webkit/plugins/npapi/webplugin_delegate.h"
-
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- #include "base/hash_tables.h"
- #include "base/linked_ptr.h"
- #endif
-@@ -216,7 +216,7 @@ class WebPluginDelegateProxy
- // point the window has already been destroyed).
- void WillDestroyWindow();
-
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- // Synthesize a fake window handle for the plug-in to identify the instance
- // to the browser, allowing mapping to a surface for hardware acceleration
- // of plug-in content. The browser generates the handle which is then set on
diff --git a/chromium/patches/patch-chrome_test_automation_automation__proxy__uitest.cc b/chromium/patches/patch-chrome_test_automation_automation__proxy__uitest.cc
deleted file mode 100644
index fe6e8ec02b..0000000000
--- a/chromium/patches/patch-chrome_test_automation_automation__proxy__uitest.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-chrome_test_automation_automation__proxy__uitest.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/test/automation/automation_proxy_uitest.cc.orig 2011-04-13 08:01:56.000000000 +0000
-+++ chrome/test/automation/automation_proxy_uitest.cc
-@@ -1376,7 +1376,7 @@ TEST_F(ExternalTabUITestPopupEnabled, MA
- #endif // defined(OS_WIN)
-
- // TODO(port): Need to port autocomplete_edit_proxy.* first.
--#if defined(OS_WIN) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
- TEST_F(AutomationProxyTest, AutocompleteGetSetText) {
- scoped_refptr<BrowserProxy> browser(automation()->GetBrowserWindow(0));
- ASSERT_TRUE(browser.get());
-@@ -1420,7 +1420,7 @@ TEST_F(AutomationProxyTest, Autocomplete
- EXPECT_EQ(text_to_set2, actual_text2);
- }
-
--#endif // defined(OS_WIN) || defined(OS_LINUX)
-+#endif // defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
-
- #if defined(OS_MACOSX)
- // Disabled, http://crbug.com/48601.
diff --git a/chromium/patches/patch-chrome_test_automation_proxy__launcher.cc b/chromium/patches/patch-chrome_test_automation_proxy__launcher.cc
deleted file mode 100644
index 7899c9940b..0000000000
--- a/chromium/patches/patch-chrome_test_automation_proxy__launcher.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-chrome_test_automation_proxy__launcher.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/test/automation/proxy_launcher.cc.orig 2011-04-13 08:01:56.000000000 +0000
-+++ chrome/test/automation/proxy_launcher.cc
-@@ -4,6 +4,10 @@
-
- #include "chrome/test/automation/proxy_launcher.h"
-
-+#if defined(OS_POSIX)
-+#include <signal.h>
-+#endif
-+
- #include "app/sql/connection.h"
- #include "base/file_util.h"
- #include "base/string_number_conversions.h"
diff --git a/chromium/patches/patch-chrome_test_chrome__process__util.cc b/chromium/patches/patch-chrome_test_chrome__process__util.cc
deleted file mode 100644
index 1b11623691..0000000000
--- a/chromium/patches/patch-chrome_test_chrome__process__util.cc
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-chrome_test_chrome__process__util.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/test/chrome_process_util.cc.orig 2011-04-13 08:01:56.000000000 +0000
-+++ chrome/test/chrome_process_util.cc
-@@ -61,7 +61,7 @@ ChromeProcessList GetRunningChromeProces
- result.push_back(process_entry->pid());
- }
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // On Linux we might be running with a zygote process for the renderers.
- // Because of that we sweep the list of processes again and pick those which
- // are children of one of the processes that we've already seen.
-@@ -72,9 +72,9 @@ ChromeProcessList GetRunningChromeProces
- while (const base::ProcessEntry* process_entry = it.NextProcessEntry())
- result.push_back(process_entry->pid());
- }
--#endif // defined(OS_LINUX)
-+#endif // defined(OS_LINUX) || defined(OS_BSD)
-
--#if defined(OS_LINUX) || defined(OS_MACOSX)
-+#if defined(OS_POSIX)
- // On Mac OS X we run the subprocesses with a different bundle, and
- // on Linux via /proc/self/exe, so they end up with a different
- // name. We must collect them in a second pass.
diff --git a/chromium/patches/patch-chrome_test_gpu_gpu__pixel__browsertest.cc b/chromium/patches/patch-chrome_test_gpu_gpu__pixel__browsertest.cc
deleted file mode 100644
index f1851b35ca..0000000000
--- a/chromium/patches/patch-chrome_test_gpu_gpu__pixel__browsertest.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_test_gpu_gpu__pixel__browsertest.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/test/gpu/gpu_pixel_browsertest.cc.orig 2011-04-13 08:01:45.000000000 +0000
-+++ chrome/test/gpu/gpu_pixel_browsertest.cc
-@@ -206,7 +206,7 @@ class GpuPixelBrowserTest : public InPro
- const char* os_label = "win";
- #elif defined(OS_MACOSX)
- const char* os_label = "mac";
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- const char* os_label = "linux";
- #else
- #error "Not implemented for this platform"
diff --git a/chromium/patches/patch-chrome_test_in__process__browser__test.cc b/chromium/patches/patch-chrome_test_in__process__browser__test.cc
deleted file mode 100644
index aaa4e16578..0000000000
--- a/chromium/patches/patch-chrome_test_in__process__browser__test.cc
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-chrome_test_in__process__browser__test.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/test/in_process_browser_test.cc.orig 2011-04-13 08:01:56.000000000 +0000
-+++ chrome/test/in_process_browser_test.cc
-@@ -4,6 +4,10 @@
-
- #include "chrome/test/in_process_browser_test.h"
-
-+#if defined(OS_POSIX)
-+#include <signal.h>
-+#endif
-+
- #include "base/command_line.h"
- #include "base/file_path.h"
- #include "base/file_util.h"
diff --git a/chromium/patches/patch-chrome_test_page__cycler_page__cycler__test.cc b/chromium/patches/patch-chrome_test_page__cycler_page__cycler__test.cc
deleted file mode 100644
index 9b336addca..0000000000
--- a/chromium/patches/patch-chrome_test_page__cycler_page__cycler__test.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_test_page__cycler_page__cycler__test.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/test/page_cycler/page_cycler_test.cc.orig 2011-04-13 08:01:56.000000000 +0000
-+++ chrome/test/page_cycler/page_cycler_test.cc
-@@ -318,7 +318,7 @@ class PageCyclerReferenceTest : public P
- dir = dir.AppendASCII("reference_build");
- #if defined(OS_WIN)
- dir = dir.AppendASCII("chrome");
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- dir = dir.AppendASCII("chrome_linux");
- #elif defined(OS_MACOSX)
- dir = dir.AppendASCII("chrome_mac");
diff --git a/chromium/patches/patch-chrome_test_reliability_page__load__test.cc b/chromium/patches/patch-chrome_test_reliability_page__load__test.cc
deleted file mode 100644
index 324f92bfa2..0000000000
--- a/chromium/patches/patch-chrome_test_reliability_page__load__test.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_test_reliability_page__load__test.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/test/reliability/page_load_test.cc.orig 2011-04-13 08:01:56.000000000 +0000
-+++ chrome/test/reliability/page_load_test.cc
-@@ -186,7 +186,7 @@ class PageLoadTest : public UITest {
- file_info.reset(
- FileVersionInfo::CreateFileVersionInfo(FilePath(kChromeDll)));
- last_change = WideToASCII(file_info->last_change());
--#elif defined(OS_LINUX) || defined(OS_MACOSX)
-+#elif defined(OS_LINUX) || defined(OS_BSD) || defined(OS_MACOSX)
- // TODO(fmeawad): On Mac, the version retrieved here belongs to the test
- // module and not the chrome binary, need to be changed to chrome binary
- // instead.
diff --git a/chromium/patches/patch-chrome_test_startup_feature__startup__test.cc b/chromium/patches/patch-chrome_test_startup_feature__startup__test.cc
deleted file mode 100644
index 53c0904fe1..0000000000
--- a/chromium/patches/patch-chrome_test_startup_feature__startup__test.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_test_startup_feature__startup__test.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/test/startup/feature_startup_test.cc.orig 2011-04-13 08:01:45.000000000 +0000
-+++ chrome/test/startup/feature_startup_test.cc
-@@ -198,7 +198,7 @@ TEST_F(NewTabUIStartupTest, FLAKY_NewTab
- RunNewTabTimingTest();
- }
-
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_GTK)
- TEST_F(NewTabUIStartupTest, GtkThemeCold) {
- RunStartupTest("tab_gtk_theme_cold", false /* cold */,
- false /* not important */,
diff --git a/chromium/patches/patch-chrome_test_testing__browser__process.cc b/chromium/patches/patch-chrome_test_testing__browser__process.cc
deleted file mode 100644
index cc768d4464..0000000000
--- a/chromium/patches/patch-chrome_test_testing__browser__process.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_test_testing__browser__process.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/test/testing_browser_process.cc.orig 2011-05-24 08:01:56.000000000 +0000
-+++ chrome/test/testing_browser_process.cc
-@@ -40,7 +40,7 @@ IOThread* TestingBrowserProcess::io_thre
- return NULL;
- }
-
--#if defined(OS_LINUX)
-+#if defined(USE_X11)
- base::Thread* TestingBrowserProcess::background_x11_thread() {
- return NULL;
- }
diff --git a/chromium/patches/patch-chrome_test_testing__browser__process.h b/chromium/patches/patch-chrome_test_testing__browser__process.h
deleted file mode 100644
index 1cbbd263a2..0000000000
--- a/chromium/patches/patch-chrome_test_testing__browser__process.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_test_testing__browser__process.h,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- chrome/test/testing_browser_process.h.orig 2011-05-24 08:01:56.000000000 +0000
-+++ chrome/test/testing_browser_process.h
-@@ -49,7 +49,7 @@ class TestingBrowserProcess : public Bro
-
- virtual IOThread* io_thread();
-
--#if defined(OS_LINUX)
-+#if defined(USE_X11)
- virtual base::Thread* background_x11_thread();
- #endif
-
diff --git a/chromium/patches/patch-chrome_test_ui__test__utils.cc b/chromium/patches/patch-chrome_test_ui__test__utils.cc
deleted file mode 100644
index 4ba513be03..0000000000
--- a/chromium/patches/patch-chrome_test_ui__test__utils.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_test_ui__test__utils.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/test/ui_test_utils.cc.orig 2011-04-13 08:01:56.000000000 +0000
-+++ chrome/test/ui_test_utils.cc
-@@ -357,7 +357,7 @@ void RunMessageLoop() {
- #if defined(TOOLKIT_VIEWS)
- views::AcceleratorHandler handler;
- loop->Run(&handler);
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- loop->Run(NULL);
- #else
- loop->Run();
diff --git a/chromium/patches/patch-chrome_test_ui_sunspider__uitest.cc b/chromium/patches/patch-chrome_test_ui_sunspider__uitest.cc
deleted file mode 100644
index 1e757979bf..0000000000
--- a/chromium/patches/patch-chrome_test_ui_sunspider__uitest.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_test_ui_sunspider__uitest.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/test/ui/sunspider_uitest.cc.orig 2011-04-13 08:01:56.000000000 +0000
-+++ chrome/test/ui/sunspider_uitest.cc
-@@ -129,7 +129,7 @@ class SunSpiderReferenceTest : public Su
- dir = dir.AppendASCII("reference_build");
- #if defined(OS_WIN)
- dir = dir.AppendASCII("chrome");
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- dir = dir.AppendASCII("chrome_linux");
- #elif defined(OS_MACOSX)
- dir = dir.AppendASCII("chrome_mac");
diff --git a/chromium/patches/patch-chrome_test_ui_ui__layout__test.cc b/chromium/patches/patch-chrome_test_ui_ui__layout__test.cc
deleted file mode 100644
index 66b6bed857..0000000000
--- a/chromium/patches/patch-chrome_test_ui_ui__layout__test.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_test_ui_ui__layout__test.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/test/ui/ui_layout_test.cc.orig 2011-04-13 08:01:56.000000000 +0000
-+++ chrome/test/ui/ui_layout_test.cc
-@@ -19,7 +19,7 @@
- static const char kPlatformName[] = "chromium-win";
- #elif defined(OS_MACOSX)
- static const char kPlatformName[] = "chromium-mac";
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- static const char kPlatformName[] = "chromium-linux";
- #else
- #error No known OS defined
diff --git a/chromium/patches/patch-chrome_test_ui_ui__test.cc b/chromium/patches/patch-chrome_test_ui_ui__test.cc
deleted file mode 100644
index af47399678..0000000000
--- a/chromium/patches/patch-chrome_test_ui_ui__test.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_test_ui_ui__test.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/test/ui/ui_test.cc.orig 2011-04-13 08:01:56.000000000 +0000
-+++ chrome/test/ui/ui_test.cc
-@@ -66,7 +66,7 @@ const wchar_t UITestBase::kFailedNoCrash
- L"NOTE: This test is expected to fail if crash_service.exe is not "
- L"running. Start it manually before running this test (see the build "
- L"output directory).";
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- L"NOTE: This test is expected to fail if breakpad is not built in "
- L"or if chromium is not running headless (try CHROME_HEADLESS=1).";
- #else
diff --git a/chromium/patches/patch-chrome_test_ui_v8__benchmark__uitest.cc b/chromium/patches/patch-chrome_test_ui_v8__benchmark__uitest.cc
deleted file mode 100644
index 0952d4f281..0000000000
--- a/chromium/patches/patch-chrome_test_ui_v8__benchmark__uitest.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_test_ui_v8__benchmark__uitest.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/test/ui/v8_benchmark_uitest.cc.orig 2011-04-13 08:01:56.000000000 +0000
-+++ chrome/test/ui/v8_benchmark_uitest.cc
-@@ -131,7 +131,7 @@ class V8BenchmarkReferenceTest : public
- dir = dir.AppendASCII("reference_build");
- #if defined(OS_WIN)
- dir = dir.AppendASCII("chrome");
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- dir = dir.AppendASCII("chrome_linux");
- #elif defined(OS_MACOSX)
- dir = dir.AppendASCII("chrome_mac");
diff --git a/chromium/patches/patch-chrome_test_url__fetch__test_url__fetch__test.cc b/chromium/patches/patch-chrome_test_url__fetch__test_url__fetch__test.cc
deleted file mode 100644
index 248ebd02e4..0000000000
--- a/chromium/patches/patch-chrome_test_url__fetch__test_url__fetch__test.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-chrome_test_url__fetch__test_url__fetch__test.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- chrome/test/url_fetch_test/url_fetch_test.cc.orig 2011-04-13 08:01:56.000000000 +0000
-+++ chrome/test/url_fetch_test/url_fetch_test.cc
-@@ -39,7 +39,7 @@ class UrlFetchTest : public UITest {
- dir = dir.AppendASCII("reference_build");
- #if defined(OS_WIN)
- dir = dir.AppendASCII("chrome");
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- dir = dir.AppendASCII("chrome_linux");
- #elif defined(OS_MACOSX)
- dir = dir.AppendASCII("chrome_mac");
diff --git a/chromium/patches/patch-content_browser_browser__child__process__host.cc b/chromium/patches/patch-content_browser_browser__child__process__host.cc
deleted file mode 100644
index 8bb03ba0fb..0000000000
--- a/chromium/patches/patch-content_browser_browser__child__process__host.cc
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-content_browser_browser__child__process__host.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- content/browser/browser_child_process_host.cc.orig 2011-05-24 08:01:07.000000000 +0000
-+++ content/browser/browser_child_process_host.cc
-@@ -25,9 +25,9 @@
- #include "chrome/installer/util/google_update_settings.h"
- #include "content/browser/browser_thread.h"
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "base/linux_util.h"
--#endif // OS_LINUX
-+#endif // OS_LINUX || OS_BSD
-
- namespace {
-
diff --git a/chromium/patches/patch-content_browser_child__process__launcher.cc b/chromium/patches/patch-content_browser_child__process__launcher.cc
deleted file mode 100644
index 9b069853c0..0000000000
--- a/chromium/patches/patch-content_browser_child__process__launcher.cc
+++ /dev/null
@@ -1,109 +0,0 @@
-$NetBSD: patch-content_browser_child__process__launcher.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- content/browser/child_process_launcher.cc.orig 2011-05-24 08:01:07.000000000 +0000
-+++ content/browser/child_process_launcher.cc
-@@ -20,7 +20,7 @@
- #if defined(OS_WIN)
- #include "base/file_path.h"
- #include "chrome/common/sandbox_policy.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #include "base/singleton.h"
- #include "chrome/browser/crash_handler_host_linux.h"
- #include "content/browser/zygote_host_linux.h"
-@@ -45,7 +45,7 @@ class ChildProcessLauncher::Context
- : client_(NULL),
- client_thread_id_(BrowserThread::UI),
- starting_(true)
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- , zygote_(false)
- #endif
- {
-@@ -110,7 +110,7 @@ class ChildProcessLauncher::Context
- handle = sandbox::StartProcessWithAccess(cmd_line, exposed_dir);
- #elif defined(OS_POSIX)
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- if (use_zygote) {
- base::GlobalDescriptors::Mapping mapping;
- mapping.push_back(std::pair<uint32_t, int>(kPrimaryIPCChannel, ipcfd));
-@@ -131,7 +131,7 @@ class ChildProcessLauncher::Context
- ipcfd,
- kPrimaryIPCChannel + base::GlobalDescriptors::kBaseDescriptor));
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // On Linux, we need to add some extra file descriptors for crash handling
- // and the sandbox.
- bool is_renderer =
-@@ -205,20 +205,20 @@ class ChildProcessLauncher::Context
- NewRunnableMethod(
- this,
- &ChildProcessLauncher::Context::Notify,
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- use_zygote,
- #endif
- handle));
- }
-
- void Notify(
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- bool zygote,
- #endif
- base::ProcessHandle handle) {
- starting_ = false;
- process_.set_handle(handle);
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- zygote_ = zygote;
- #endif
- if (client_) {
-@@ -238,7 +238,7 @@ class ChildProcessLauncher::Context
- BrowserThread::PROCESS_LAUNCHER, FROM_HERE,
- NewRunnableFunction(
- &ChildProcessLauncher::Context::TerminateInternal,
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- zygote_,
- #endif
- process_.handle()));
-@@ -246,7 +246,7 @@ class ChildProcessLauncher::Context
- }
-
- static void TerminateInternal(
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- bool zygote,
- #endif
- base::ProcessHandle handle) {
-@@ -256,7 +256,7 @@ class ChildProcessLauncher::Context
- process.Terminate(ResultCodes::NORMAL_EXIT);
- // On POSIX, we must additionally reap the child.
- #if defined(OS_POSIX)
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- if (zygote) {
- // If the renderer was created via a zygote, we have to proxy the reaping
- // through the zygote process.
-@@ -275,7 +275,7 @@ class ChildProcessLauncher::Context
- base::Process process_;
- bool starting_;
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- bool zygote_;
- #endif
- };
-@@ -321,7 +321,7 @@ base::TerminationStatus ChildProcessLaun
- int* exit_code) {
- base::TerminationStatus status;
- base::ProcessHandle handle = context_->process_.handle();
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- if (context_->zygote_) {
- status = ZygoteHost::GetInstance()->GetTerminationStatus(handle, exit_code);
- } else
diff --git a/chromium/patches/patch-content_browser_geolocation_empty__device__data__provider.cc b/chromium/patches/patch-content_browser_geolocation_empty__device__data__provider.cc
deleted file mode 100644
index 8b6de4fd88..0000000000
--- a/chromium/patches/patch-content_browser_geolocation_empty__device__data__provider.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-content_browser_geolocation_empty__device__data__provider.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- content/browser/geolocation/empty_device_data_provider.cc.orig 2011-05-24 08:01:07.000000000 +0000
-+++ content/browser/geolocation/empty_device_data_provider.cc
-@@ -12,7 +12,7 @@ RadioDataProviderImplBase* RadioDataProv
- }
-
- // Only define for platforms that lack a real wifi data provider.
--#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_LINUX)
-+#if !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(OS_LINUX) && !defined(OS_BSD)
- // static
- template<>
- WifiDataProviderImplBase* WifiDataProvider::DefaultFactoryFunction() {
diff --git a/chromium/patches/patch-content_browser_geolocation_location__provider.cc b/chromium/patches/patch-content_browser_geolocation_location__provider.cc
deleted file mode 100644
index 06f30677e5..0000000000
--- a/chromium/patches/patch-content_browser_geolocation_location__provider.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-content_browser_geolocation_location__provider.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- content/browser/geolocation/location_provider.cc.orig 2011-05-24 08:01:07.000000000 +0000
-+++ content/browser/geolocation/location_provider.cc
-@@ -56,7 +56,7 @@ void LocationProviderBase::UpdateListene
- }
- }
-
--#if !defined(OS_LINUX) && !defined(OS_MACOSX) && !defined(OS_WIN)
-+#if !defined(OS_POSIX) && !defined(OS_WIN)
- LocationProviderBase* NewSystemLocationProvider() {
- return NULL;
- }
diff --git a/chromium/patches/patch-content_browser_renderer__host_backing__store__x.cc b/chromium/patches/patch-content_browser_renderer__host_backing__store__x.cc
deleted file mode 100644
index 91f433ad15..0000000000
--- a/chromium/patches/patch-content_browser_renderer__host_backing__store__x.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-content_browser_renderer__host_backing__store__x.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- content/browser/renderer_host/backing_store_x.cc.orig 2011-05-24 08:01:07.000000000 +0000
-+++ content/browser/renderer_host/backing_store_x.cc
-@@ -10,7 +10,7 @@
- #include <sys/ipc.h>
- #include <sys/shm.h>
-
--#if defined(OS_OPENBSD) || defined(OS_FREEBSD)
-+#if defined(OS_BSD)
- #include <sys/endian.h>
- #endif
-
-@@ -70,7 +70,7 @@ BackingStoreX::BackingStoreX(RenderWidge
- visual_(visual),
- visual_depth_(depth),
- root_window_(ui::GetX11RootWindow()) {
--#if defined(OS_OPENBSD) || defined(OS_FREEBSD)
-+#if defined(OS_BSD)
- COMPILE_ASSERT(_BYTE_ORDER == _LITTLE_ENDIAN, assumes_little_endian);
- #else
- COMPILE_ASSERT(__BYTE_ORDER == __LITTLE_ENDIAN, assumes_little_endian);
diff --git a/chromium/patches/patch-content_browser_renderer__host_mock__render__process__host.cc b/chromium/patches/patch-content_browser_renderer__host_mock__render__process__host.cc
deleted file mode 100644
index 0bba9b1928..0000000000
--- a/chromium/patches/patch-content_browser_renderer__host_mock__render__process__host.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-content_browser_renderer__host_mock__render__process__host.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- content/browser/renderer_host/mock_render_process_host.cc.orig 2011-05-24 08:01:07.000000000 +0000
-+++ content/browser/renderer_host/mock_render_process_host.cc
-@@ -106,7 +106,7 @@ TransportDIB* MockRenderProcessHost::Get
- DuplicateHandle(GetCurrentProcess(), dib_id.handle, GetCurrentProcess(),
- &duped, 0, TRUE, DUPLICATE_SAME_ACCESS);
- transport_dib_ = TransportDIB::Map(duped);
--#elif defined(OS_MACOSX)
-+#elif defined(OS_MACOSX) || defined(OS_BSD)
- // On Mac, TransportDIBs are always created in the browser, so we cannot map
- // one from a dib_id.
- transport_dib_ = TransportDIB::Create(100 * 100 * 4, 0);
diff --git a/chromium/patches/patch-content_browser_renderer__host_p2p__socket__host__posix.cc b/chromium/patches/patch-content_browser_renderer__host_p2p__socket__host__posix.cc
deleted file mode 100644
index 81bb31dd3e..0000000000
--- a/chromium/patches/patch-content_browser_renderer__host_p2p__socket__host__posix.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-content_browser_renderer__host_p2p__socket__host__posix.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- content/browser/renderer_host/p2p_socket_host_posix.cc.orig 2011-05-24 08:01:07.000000000 +0000
-+++ content/browser/renderer_host/p2p_socket_host_posix.cc
-@@ -50,7 +50,7 @@ bool GetLocalAddress(sockaddr_in* addr)
-
- struct ifreq* ptr = reinterpret_cast<struct ifreq*>(ifc.ifc_buf);
- struct ifreq* end =
-- reinterpret_cast<struct ifreq*>(ifc.ifc_buf + ifc.ifc_len);
-+ reinterpret_cast<struct ifreq*>((char *)ifc.ifc_buf + ifc.ifc_len);
-
- bool found = false;
- while (ptr < end) {
diff --git a/chromium/patches/patch-content_browser_renderer__host_render__message__filter.cc b/chromium/patches/patch-content_browser_renderer__host_render__message__filter.cc
deleted file mode 100644
index 44b580acc0..0000000000
--- a/chromium/patches/patch-content_browser_renderer__host_render__message__filter.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-content_browser_renderer__host_render__message__filter.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- content/browser/renderer_host/render_message_filter.cc.orig 2011-05-24 08:01:07.000000000 +0000
-+++ content/browser/renderer_host/render_message_filter.cc
-@@ -416,7 +416,7 @@ bool RenderMessageFilter::OnMessageRecei
- IPC_MESSAGE_HANDLER(ViewHostMsg_V8HeapStats, OnV8HeapStats)
- IPC_MESSAGE_HANDLER(ViewHostMsg_DidZoomURL, OnDidZoomURL)
- IPC_MESSAGE_HANDLER_DELAY_REPLY(ViewHostMsg_ResolveProxy, OnResolveProxy)
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- IPC_MESSAGE_HANDLER(ViewHostMsg_AllocTransportDIB, OnAllocTransportDIB)
- IPC_MESSAGE_HANDLER(ViewHostMsg_FreeTransportDIB, OnFreeTransportDIB)
- #endif
-@@ -1111,7 +1111,7 @@ void RenderMessageFilter::OnRendererHist
- HistogramSynchronizer::DeserializeHistogramList(sequence_number, histograms);
- }
-
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- void RenderMessageFilter::OnAllocTransportDIB(
- size_t size, bool cache_in_browser, TransportDIB::Handle* handle) {
- render_widget_helper_->AllocTransportDIB(size, cache_in_browser, handle);
diff --git a/chromium/patches/patch-content_browser_renderer__host_render__sandbox__host__linux.cc b/chromium/patches/patch-content_browser_renderer__host_render__sandbox__host__linux.cc
deleted file mode 100644
index 21f64259e9..0000000000
--- a/chromium/patches/patch-content_browser_renderer__host_render__sandbox__host__linux.cc
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-content_browser_renderer__host_render__sandbox__host__linux.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- content/browser/renderer_host/render_sandbox_host_linux.cc.orig 2011-05-24 08:01:07.000000000 +0000
-+++ content/browser/renderer_host/render_sandbox_host_linux.cc
-@@ -335,7 +335,7 @@ class SandboxIPCProcess {
- return;
- }
-
-- uint64_t inode;
-+ uint64 inode;
- if (!pickle.ReadUInt64(&iter, &inode))
- return;
-
-@@ -665,7 +665,12 @@ void RenderSandboxHostLinux::Init(const
- // inherit some sockets. With PF_UNIX+SOCK_DGRAM, it can call sendmsg to send
- // a datagram to any (abstract) socket on the same system. With
- // SOCK_SEQPACKET, this is prevented.
-+#if defined(OS_BSD)
-+ if (socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds) != 0)
-+ CHECK(socketpair(AF_UNIX, SOCK_DGRAM, 0, fds) == 0);
-+#else
- CHECK(socketpair(AF_UNIX, SOCK_SEQPACKET, 0, fds) == 0);
-+#endif
-
- renderer_socket_ = fds[0];
- const int browser_socket = fds[1];
diff --git a/chromium/patches/patch-content_browser_renderer__host_render__widget__helper.cc b/chromium/patches/patch-content_browser_renderer__host_render__widget__helper.cc
deleted file mode 100644
index dbddf5d168..0000000000
--- a/chromium/patches/patch-content_browser_renderer__host_render__widget__helper.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-content_browser_renderer__host_render__widget__helper.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- content/browser/renderer_host/render_widget_helper.cc.orig 2011-05-24 08:01:07.000000000 +0000
-+++ content/browser/renderer_host/render_widget_helper.cc
-@@ -58,7 +58,7 @@ RenderWidgetHelper::~RenderWidgetHelper(
- // object, so we should not be destroyed unless pending_paints_ is empty!
- DCHECK(pending_paints_.empty());
-
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- ClearAllocatedDIBs();
- #endif
- }
-@@ -277,7 +277,7 @@ void RenderWidgetHelper::OnCreateFullscr
- host->CreateNewFullscreenWidget(route_id);
- }
-
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- TransportDIB* RenderWidgetHelper::MapTransportDIB(TransportDIB::Id dib_id) {
- base::AutoLock locked(allocated_dibs_lock_);
-
diff --git a/chromium/patches/patch-content_browser_renderer__host_render__widget__helper.h b/chromium/patches/patch-content_browser_renderer__host_render__widget__helper.h
deleted file mode 100644
index d98483dc13..0000000000
--- a/chromium/patches/patch-content_browser_renderer__host_render__widget__helper.h
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-content_browser_renderer__host_render__widget__helper.h,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- content/browser/renderer_host/render_widget_helper.h.orig 2011-05-24 08:01:07.000000000 +0000
-+++ content/browser/renderer_host/render_widget_helper.h
-@@ -112,7 +112,7 @@ class RenderWidgetHelper
- const base::TimeDelta& max_delay,
- IPC::Message* msg);
-
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- // Given the id of a transport DIB, return a mapping to it or NULL on error.
- TransportDIB* MapTransportDIB(TransportDIB::Id dib_id);
- #endif
-@@ -131,7 +131,7 @@ class RenderWidgetHelper
- int* route_id);
- void CreateNewFullscreenWidget(int opener_id, int* route_id);
-
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- // Called on the IO thread to handle the allocation of a TransportDIB. If
- // |cache_in_browser| is |true|, then a copy of the shmem is kept by the
- // browser, and it is the caller's repsonsibility to call
-@@ -184,7 +184,7 @@ class RenderWidgetHelper
- // Called on the IO thread to resume a cross-site response.
- void OnCrossSiteClosePageACK(const ViewMsg_ClosePage_Params& params);
-
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_BSD)
- // Called on destruction to release all allocated transport DIBs
- void ClearAllocatedDIBs();
-
diff --git a/chromium/patches/patch-content_browser_renderer__host_render__widget__host__unittest.cc b/chromium/patches/patch-content_browser_renderer__host_render__widget__host__unittest.cc
deleted file mode 100644
index 28f72890a5..0000000000
--- a/chromium/patches/patch-content_browser_renderer__host_render__widget__host__unittest.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-content_browser_renderer__host_render__widget__host__unittest.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- content/browser/renderer_host/render_widget_host_unittest.cc.orig 2011-05-24 08:01:07.000000000 +0000
-+++ content/browser/renderer_host/render_widget_host_unittest.cc
-@@ -425,7 +425,7 @@ TEST_F(RenderWidgetHostTest, ResizeThenC
-
- // Tests setting custom background
- TEST_F(RenderWidgetHostTest, Background) {
--#if defined(OS_WIN) || defined(OS_LINUX)
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_BSD)
- scoped_ptr<RenderWidgetHostView> view(
- RenderWidgetHostView::CreateViewForWidget(host_.get()));
- host_->set_view(view.get());
diff --git a/chromium/patches/patch-content_browser_tab__contents_tab__contents.cc b/chromium/patches/patch-content_browser_tab__contents_tab__contents.cc
deleted file mode 100644
index 27b1d7904e..0000000000
--- a/chromium/patches/patch-content_browser_tab__contents_tab__contents.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-content_browser_tab__contents_tab__contents.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- content/browser/tab_contents/tab_contents.cc.orig 2011-05-24 08:01:07.000000000 +0000
-+++ content/browser/tab_contents/tab_contents.cc
-@@ -301,7 +301,7 @@ TabContents::TabContents(Profile* profil
-
- registrar_.Add(this, NotificationType::RENDER_WIDGET_HOST_DESTROYED,
- NotificationService::AllSources());
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_GTK)
- registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
- NotificationService::AllSources());
- #endif
-@@ -2723,7 +2723,7 @@ void TabContents::Observe(NotificationTy
- break;
- }
-
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_GTK)
- case NotificationType::BROWSER_THEME_CHANGED: {
- renderer_preferences_util::UpdateFromSystemSettings(
- &renderer_preferences_, profile());
diff --git a/chromium/patches/patch-content_browser_zygote__host__linux.cc b/chromium/patches/patch-content_browser_zygote__host__linux.cc
deleted file mode 100644
index cb09fe61f1..0000000000
--- a/chromium/patches/patch-content_browser_zygote__host__linux.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-content_browser_zygote__host__linux.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- content/browser/zygote_host_linux.cc.orig 2011-05-24 08:01:07.000000000 +0000
-+++ content/browser/zygote_host_linux.cc
-@@ -61,7 +61,12 @@ ZygoteHost::ZygoteHost()
- }
-
- ZygoteHost::~ZygoteHost() {
-+ Pickle pickle;
- if (init_)
-+#if defined(OS_BSD)
-+ pickle.WriteInt(kCmdEnd);
-+ HANDLE_EINTR(write(control_fd_, pickle.data(), pickle.size()));
-+#endif
- close(control_fd_);
- }
-
-@@ -81,7 +86,12 @@ void ZygoteHost::Init(const std::string&
- cmd_line.AppendSwitchASCII(switches::kProcessType, switches::kZygoteProcess);
-
- int fds[2];
-+#if defined(OS_BSD)
-+ if (socketpair(PF_UNIX, SOCK_SEQPACKET, 0, fds) != 0)
-+ CHECK(socketpair(PF_UNIX, SOCK_DGRAM, 0, fds) == 0);
-+#else
- CHECK(socketpair(PF_UNIX, SOCK_SEQPACKET, 0, fds) == 0);
-+#endif
- base::file_handle_mapping_vector fds_to_map;
- fds_to_map.push_back(std::make_pair(fds[1], 3));
-
-@@ -149,6 +159,7 @@ void ZygoteHost::Init(const std::string&
- // We need to look for it.
- // But first, wait for the zygote to tell us it's running.
- // The sending code is in chrome/browser/zygote_main_linux.cc.
-+#if defined(OS_LINUX)
- std::vector<int> fds_vec;
- const int kExpectedLength = sizeof(kZygoteMagic);
- char buf[kExpectedLength];
-@@ -179,6 +190,7 @@ void ZygoteHost::Init(const std::string&
- // Reap the sandbox.
- ProcessWatcher::EnsureProcessGetsReaped(process);
- }
-+#endif // defined(OS_LINUX)
- } else {
- // Not using the SUID sandbox.
- pid_ = process;
-@@ -246,12 +258,15 @@ pid_t ZygoteHost::ForkRenderer(
- return base::kNullProcessHandle;
- }
-
-+#if defined(OS_LINUX)
- const int kRendererScore = 5;
- AdjustRendererOOMScore(pid, kRendererScore);
-+#endif
-
- return pid;
- }
-
-+#if defined(OS_LINUX)
- void ZygoteHost::AdjustRendererOOMScore(base::ProcessHandle pid, int score) {
- // 1) You can't change the oom_adj of a non-dumpable process (EPERM) unless
- // you're root. Because of this, we can't set the oom_adj from the browser
-@@ -303,6 +318,7 @@ void ZygoteHost::AdjustRendererOOMScore(
- PLOG(ERROR) << "Failed to adjust OOM score of renderer with pid " << pid;
- }
- }
-+#endif // defined(OS_LINUX)
-
- void ZygoteHost::EnsureProcessTerminated(pid_t process) {
- DCHECK(init_);
diff --git a/chromium/patches/patch-content_browser_zygote__host__linux.h b/chromium/patches/patch-content_browser_zygote__host__linux.h
deleted file mode 100644
index 9a51c0d595..0000000000
--- a/chromium/patches/patch-content_browser_zygote__host__linux.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-content_browser_zygote__host__linux.h,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- content/browser/zygote_host_linux.h.orig 2011-05-24 08:01:07.000000000 +0000
-+++ content/browser/zygote_host_linux.h
-@@ -51,6 +51,9 @@ class ZygoteHost {
- kCmdReap = 1, // Reap a renderer child.
- kCmdGetTerminationStatus = 2, // Check what happend to a child process.
- kCmdGetSandboxStatus = 3, // Read a bitmask of kSandbox*
-+#if defined(OS_BSD)
-+ kCmdEnd = 5, // Kill zygote for SOCK_DGRAM.
-+#endif
- };
-
- // These form a bitmask which describes the conditions of the sandbox that
diff --git a/chromium/patches/patch-content_browser_zygote__main__linux.cc b/chromium/patches/patch-content_browser_zygote__main__linux.cc
deleted file mode 100644
index 941bac7259..0000000000
--- a/chromium/patches/patch-content_browser_zygote__main__linux.cc
+++ /dev/null
@@ -1,60 +0,0 @@
-$NetBSD: patch-content_browser_zygote__main__linux.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- content/browser/zygote_main_linux.cc.orig 2011-05-24 08:01:07.000000000 +0000
-+++ content/browser/zygote_main_linux.cc
-@@ -2,12 +2,18 @@
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
-
-+#include "build/build_config.h"
-+
- #include <dlfcn.h>
- #include <fcntl.h>
- #include <pthread.h>
-+#if defined(OS_BSD)
-+#include <signal.h>
-+#else
- #include <sys/epoll.h>
- #include <sys/prctl.h>
- #include <sys/signal.h>
-+#endif
- #include <sys/socket.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-@@ -51,7 +57,7 @@
- #include "unicode/timezone.h"
-
- #if defined(ARCH_CPU_X86_FAMILY) && !defined(CHROMIUM_SELINUX) && \
-- !defined(__clang__)
-+ !defined(__clang__) && !defined(OS_BSD)
- // The seccomp sandbox is enabled on all ia32 and x86-64 processor as long as
- // we aren't using SELinux or clang.
- #define SECCOMP_SANDBOX
-@@ -174,6 +180,11 @@ class Zygote {
- case ZygoteHost::kCmdGetSandboxStatus:
- HandleGetSandboxStatus(fd, pickle, iter);
- return false;
-+#if defined(OS_BSD)
-+ case ZygoteHost::kCmdEnd:
-+ _exit(0);
-+ return false;
-+#endif
- default:
- NOTREACHED();
- break;
-@@ -649,6 +660,7 @@ static bool EnterSandbox() {
- SkiaFontConfigSetImplementation(
- new FontConfigIPC(kMagicSandboxIPCDescriptor));
-
-+#if !defined(OS_BSD)
- // Previously, we required that the binary be non-readable. This causes the
- // kernel to mark the process as non-dumpable at startup. The thinking was
- // that, although we were putting the renderers into a PID namespace (with
-@@ -674,6 +686,7 @@ static bool EnterSandbox() {
- return false;
- }
- }
-+#endif
- } else if (CommandLine::ForCurrentProcess()->HasSwitch(
- switches::kEnableSeccompSandbox)) {
- PreSandboxInit();
diff --git a/chromium/patches/patch-content_common_file__path__watcher_file__path__watcher__stub.cc b/chromium/patches/patch-content_common_file__path__watcher_file__path__watcher__stub.cc
deleted file mode 100644
index 9ce57b245f..0000000000
--- a/chromium/patches/patch-content_common_file__path__watcher_file__path__watcher__stub.cc
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-content_common_file__path__watcher_file__path__watcher__stub.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- content/common/file_path_watcher/file_path_watcher_stub.cc.orig 2011-05-24 08:01:07.000000000 +0000
-+++ content/common/file_path_watcher/file_path_watcher_stub.cc
-@@ -5,15 +5,19 @@
- // This file exists for Unix systems which don't have the inotify headers, and
- // thus cannot build file_watcher_inotify.cc
-
--#include "chrome/common/file_path_watcher/file_path_watcher.h"
-+#include "content/common/file_path_watcher/file_path_watcher.h"
-
- class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate {
- public:
- virtual bool Watch(const FilePath& path,
-- FileWatcher::Delegate* delegate,
-- base::MessageLoopProxy*) OVERRIDE {
-+ FilePathWatcher::Delegate* delegate) OVERRIDE {
- return false;
- }
-+ virtual void Cancel() OVERRIDE {
-+ }
-+ virtual void CancelOnMessageLoopThread() OVERRIDE {
-+ }
-+
- };
-
- FilePathWatcher::FilePathWatcher() {
diff --git a/chromium/patches/patch-content_content__browser.gypi b/chromium/patches/patch-content_content__browser.gypi
deleted file mode 100644
index 39c3a811fa..0000000000
--- a/chromium/patches/patch-content_content__browser.gypi
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-content_content__browser.gypi,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- content/content_browser.gypi.orig 2011-05-24 08:01:07.000000000 +0000
-+++ content/content_browser.gypi
-@@ -324,7 +324,7 @@
- ['OS=="win"', {
- 'msvs_guid': '639DB58D-32C2-435A-A711-65A12F62E442',
- }],
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:dbus-glib',
- # For FcLangSetAdd call in render_sandbox_host_linux.cc
-@@ -340,6 +340,12 @@
- 'browser/certificate_manager_model.h',
- ],
- }],
-+ ['OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
-+ 'sources!': [
-+ 'browser/geolocation/gateway_data_provider_linux.cc',
-+ 'browser/geolocation/gateway_data_provider_linux.h',
-+ ],
-+ }],
- ['OS=="linux" and chromeos==1', {
- 'sources/': [
- ['exclude', '^browser/geolocation/wifi_data_provider_linux.cc'],
diff --git a/chromium/patches/patch-content_content__common.gypi b/chromium/patches/patch-content_content__common.gypi
deleted file mode 100644
index 4b8070da96..0000000000
--- a/chromium/patches/patch-content_content__common.gypi
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-content_content__common.gypi,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- content/content_common.gypi.orig 2011-05-24 08:01:07.000000000 +0000
-+++ content/content_common.gypi
-@@ -76,7 +76,7 @@
- 'common/file_path_watcher/file_path_watcher_inotify.cc',
- ],
- }],
-- ['OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'sources': [
- 'common/file_path_watcher/file_path_watcher_stub.cc',
- ],
diff --git a/chromium/patches/patch-gpu_demos_demos.gyp b/chromium/patches/patch-gpu_demos_demos.gyp
deleted file mode 100644
index 7cde58fbf1..0000000000
--- a/chromium/patches/patch-gpu_demos_demos.gyp
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-gpu_demos_demos.gyp,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- gpu/demos/demos.gyp.orig 2011-04-13 08:01:09.000000000 +0000
-+++ gpu/demos/demos.gyp
-@@ -14,7 +14,7 @@
- # also be compiled with -fPIC flag. Setting GYP_DEFINES="linux_fpic=1"
- # compiles everything with -fPIC. Disable pepper demos on linux/x64
- # unless linux_fpic is 1.
-- ['OS=="linux" and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', {
-+ ['(OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd") and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', {
- 'enable_pepper_demos%': 0,
- }, {
- 'enable_pepper_demos%': 1,
-@@ -51,7 +51,7 @@
- 'framework/window.h',
- ],
- 'conditions': [
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': ['../../build/linux/system.gyp:gtk'],
- }],
- ],
-@@ -171,7 +171,7 @@
- ],
- },
- 'conditions': [
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- # -gstabs, used in the official builds, causes an ICE. Remove it.
- 'cflags!': ['-gstabs'],
- }],
diff --git a/chromium/patches/patch-gpu_demos_framework_main__exe.cc b/chromium/patches/patch-gpu_demos_framework_main__exe.cc
deleted file mode 100644
index 4402a07828..0000000000
--- a/chromium/patches/patch-gpu_demos_framework_main__exe.cc
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-gpu_demos_framework_main__exe.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- gpu/demos/framework/main_exe.cc.orig 2011-04-13 08:01:09.000000000 +0000
-+++ gpu/demos/framework/main_exe.cc
-@@ -8,9 +8,9 @@
- #include "base/logging.h"
- #include "gpu/demos/framework/window.h"
-
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- #include <gtk/gtk.h>
--#endif // OS_LINUX
-+#endif // TOOLKIT_USES_GTK
-
- namespace {
- static const int kWindowWidth = 512;
-@@ -18,9 +18,9 @@ static const int kWindowHeight = 512;
- } // namespace.
-
- int main(int argc, char** argv) {
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- gtk_init(&argc, &argv);
--#endif // OS_LINUX
-+#endif // TOOLKIT_USES_GTK
-
- // AtExitManager is used by singleton classes to delete themselves when
- // the program terminates.
diff --git a/chromium/patches/patch-gpu_demos_framework_main__pepper.cc b/chromium/patches/patch-gpu_demos_framework_main__pepper.cc
deleted file mode 100644
index b9a2ed968c..0000000000
--- a/chromium/patches/patch-gpu_demos_framework_main__pepper.cc
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-gpu_demos_framework_main__pepper.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- gpu/demos/framework/main_pepper.cc.orig 2011-04-13 08:01:09.000000000 +0000
-+++ gpu/demos/framework/main_pepper.cc
-@@ -97,7 +97,7 @@ NPError NPP_GetValue(NPP instance, NPPVa
- NPError err = NPERR_NO_ERROR;
-
- switch (variable) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- case NPPVpluginNameString:
- *(static_cast<const char**>(value)) = "Pepper GPU Demo";
- break;
-@@ -153,14 +153,14 @@ EXPORT NPError API_CALL NP_GetEntryPoint
- }
-
- EXPORT NPError API_CALL NP_Initialize(NPNetscapeFuncs* browser_funcs
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- , NPPluginFuncs* plugin_funcs
- #endif // OS_LINUX
- ) {
- gpu::demos::g_browser = browser_funcs;
- pglInitialize();
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- NP_GetEntryPoints(plugin_funcs);
- #endif // OS_LINUX
- return NPERR_NO_ERROR;
-@@ -170,7 +170,7 @@ EXPORT void API_CALL NP_Shutdown() {
- pglTerminate();
- }
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- EXPORT NPError API_CALL NP_GetValue(NPP instance, NPPVariable variable,
- void* value) {
- return gpu::demos::NPP_GetValue(instance, variable, value);
diff --git a/chromium/patches/patch-gpu_gpu.gyp b/chromium/patches/patch-gpu_gpu.gyp
deleted file mode 100644
index b8e2d1513d..0000000000
--- a/chromium/patches/patch-gpu_gpu.gyp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-gpu_gpu.gyp,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- gpu/gpu.gyp.orig 2011-04-13 08:01:09.000000000 +0000
-+++ gpu/gpu.gyp
-@@ -214,7 +214,7 @@
- 'command_buffer/service/texture_manager.cc',
- ],
- 'conditions': [
-- ['OS == "linux"', {
-+ ['OS == "linux" or OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or OS == "openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
diff --git a/chromium/patches/patch-ipc_ipc.gyp b/chromium/patches/patch-ipc_ipc.gyp
deleted file mode 100644
index e2e1c1c955..0000000000
--- a/chromium/patches/patch-ipc_ipc.gyp
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ipc_ipc.gyp,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- ipc/ipc.gyp.orig 2011-04-13 08:01:34.000000000 +0000
-+++ ipc/ipc.gyp
-@@ -13,7 +13,7 @@
- ['exclude', '/win_[^/]*\\.cc$'],
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {'sources/': [
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {'sources/': [
- ['include', '_posix(_unittest)?\\.cc$'],
- ]}],
- ['OS=="mac"', {'sources/': [
-@@ -58,12 +58,10 @@
- 'sync_socket_unittest.cc',
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
-- }],
-- ['OS=="linux"', {
- 'conditions': [
- ['linux_use_tcmalloc==1', {
- 'dependencies': [
diff --git a/chromium/patches/patch-ipc_ipc__channel__posix.cc b/chromium/patches/patch-ipc_ipc__channel__posix.cc
deleted file mode 100644
index 6b8e7ff9c5..0000000000
--- a/chromium/patches/patch-ipc_ipc__channel__posix.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ipc_ipc__channel__posix.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- ipc/ipc_channel_posix.cc.orig 2011-04-13 08:01:34.000000000 +0000
-+++ ipc/ipc_channel_posix.cc
-@@ -10,6 +10,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/stat.h>
-+#include <sys/uio.h>
- #include <sys/un.h>
-
- #include <string>
diff --git a/chromium/patches/patch-ipc_ipc__channel__posix.h b/chromium/patches/patch-ipc_ipc__channel__posix.h
deleted file mode 100644
index 03070f5801..0000000000
--- a/chromium/patches/patch-ipc_ipc__channel__posix.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ipc_ipc__channel__posix.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- ipc/ipc_channel_posix.h.orig 2011-04-13 08:01:34.000000000 +0000
-+++ ipc/ipc_channel_posix.h
-@@ -125,7 +125,7 @@ class Channel::ChannelImpl : public Mess
- };
-
- // This is a control message buffer large enough to hold kMaxReadFDs
--#if defined(OS_MACOSX)
-+#if defined(OS_MACOSX) || defined(OS_NETBSD)
- // TODO(agl): OSX appears to have non-constant CMSG macros!
- char input_cmsg_buf_[1024];
- #else
diff --git a/chromium/patches/patch-jingle_jingle.gyp b/chromium/patches/patch-jingle_jingle.gyp
deleted file mode 100644
index 8169a174bd..0000000000
--- a/chromium/patches/patch-jingle_jingle.gyp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-jingle_jingle.gyp,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- jingle/jingle.gyp.orig 2011-04-13 08:01:33.000000000 +0000
-+++ jingle/jingle.gyp
-@@ -84,7 +84,7 @@
- '../third_party/libjingle/libjingle.gyp:libjingle',
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk'
- ],
-@@ -138,7 +138,7 @@
- # TODO(akalin): Remove this once we have our own test suite and
- # runner.
- 'conditions': [
-- ['OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
-+ ['OS == "linux" or OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or OS == "openbsd" or OS == "solaris"', {
- 'dependencies': [
- # Needed to handle the #include chain:
- # base/test/test_suite.h
diff --git a/chromium/patches/patch-media_audio_openbsd_audio__manager__openbsd.cc b/chromium/patches/patch-media_audio_openbsd_audio__manager__openbsd.cc
deleted file mode 100644
index cc8eb79b5d..0000000000
--- a/chromium/patches/patch-media_audio_openbsd_audio__manager__openbsd.cc
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-media_audio_openbsd_audio__manager__openbsd.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- media/audio/openbsd/audio_manager_openbsd.cc.orig 2011-05-24 08:01:03.000000000 +0000
-+++ media/audio/openbsd/audio_manager_openbsd.cc
-@@ -4,9 +4,13 @@
-
- #include "media/audio/openbsd/audio_manager_openbsd.h"
-
-+#include "base/command_line.h"
- #include "base/logging.h"
--
--static AudioManagerOpenBSD* g_audio_manager = NULL;
-+#include "media/audio/audio_output_dispatcher.h"
-+#include "media/audio/fake_audio_input_stream.h"
-+#include "media/audio/fake_audio_output_stream.h"
-+#include "media/base/limits.h"
-+#include "media/base/media_switches.h"
-
- // Implementation of AudioManager.
- bool AudioManagerOpenBSD::HasAudioOutputDevices() {
-@@ -49,6 +53,10 @@ void AudioManagerOpenBSD::UnMuteAll() {
- NOTIMPLEMENTED();
- }
-
-+void AudioManagerOpenBSD::ReleaseOutputStream(AlsaPcmOutputStream* stream) {
-+ NOTIMPLEMENTED();
-+}
-+
- // static
- AudioManager* AudioManager::CreateAudioManager() {
- return new AudioManagerOpenBSD();
diff --git a/chromium/patches/patch-media_audio_openbsd_audio__manager__openbsd.h b/chromium/patches/patch-media_audio_openbsd_audio__manager__openbsd.h
deleted file mode 100644
index 28a88bf1b2..0000000000
--- a/chromium/patches/patch-media_audio_openbsd_audio__manager__openbsd.h
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-media_audio_openbsd_audio__manager__openbsd.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- media/audio/openbsd/audio_manager_openbsd.h.orig 2011-04-13 08:01:06.000000000 +0000
-+++ media/audio/openbsd/audio_manager_openbsd.h
-@@ -5,7 +5,15 @@
- #ifndef MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_
- #define MEDIA_AUDIO_OPENBSD_AUDIO_MANAGER_OPENBSD_H_
-
--#include "media/audio/audio_io.h"
-+#include <map>
-+
-+#include "base/ref_counted.h"
-+#include "base/scoped_ptr.h"
-+#include "base/synchronization/lock.h"
-+#include "base/threading/thread.h"
-+#include "media/audio/audio_manager_base.h"
-+
-+class AlsaPcmOutputStream;
-
- class AudioManagerOpenBSD : public AudioManagerBase {
- public:
-@@ -19,9 +27,12 @@ class AudioManagerOpenBSD : public Audio
- virtual bool HasAudioInputDevices();
- virtual AudioOutputStream* MakeAudioOutputStream(AudioParameters params);
- virtual AudioInputStream* MakeAudioInputStream(AudioParameters params);
-+
- virtual void MuteAll();
- virtual void UnMuteAll();
-
-+ virtual void ReleaseOutputStream(AlsaPcmOutputStream* stream);
-+
- protected:
- virtual ~AudioManagerOpenBSD();
-
diff --git a/chromium/patches/patch-media_base_media__switches.cc b/chromium/patches/patch-media_base_media__switches.cc
deleted file mode 100644
index 0257f37481..0000000000
--- a/chromium/patches/patch-media_base_media__switches.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-media_base_media__switches.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- media/base/media_switches.cc.orig 2011-05-24 08:01:03.000000000 +0000
-+++ media/base/media_switches.cc
-@@ -6,7 +6,7 @@
-
- namespace switches {
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_DRAGONFLY)
- // The Alsa device to use when opening an audio stream.
- const char kAlsaOutputDevice[] = "alsa-output-device";
- // The Alsa device to use when opening an audio input stream.
diff --git a/chromium/patches/patch-media_base_media__switches.h b/chromium/patches/patch-media_base_media__switches.h
deleted file mode 100644
index d211bcc38f..0000000000
--- a/chromium/patches/patch-media_base_media__switches.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-media_base_media__switches.h,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- media/base/media_switches.h.orig 2011-05-24 08:01:03.000000000 +0000
-+++ media/base/media_switches.h
-@@ -11,7 +11,7 @@
-
- namespace switches {
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_DRAGONFLY)
- extern const char kAlsaOutputDevice[];
- extern const char kAlsaInputDevice[];
- #endif
diff --git a/chromium/patches/patch-media_ffmpeg_file__protocol.cc b/chromium/patches/patch-media_ffmpeg_file__protocol.cc
deleted file mode 100644
index b29aba9c42..0000000000
--- a/chromium/patches/patch-media_ffmpeg_file__protocol.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-media_ffmpeg_file__protocol.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- media/ffmpeg/file_protocol.cc.orig 2011-05-24 08:01:03.000000000 +0000
-+++ media/ffmpeg/file_protocol.cc
-@@ -56,7 +56,7 @@ static int WriteContext(URLContext* h, u
- return HANDLE_EINTR(write(GetHandle(h), buf, size));
- }
-
--static int64 SeekContext(URLContext* h, int64 offset, int whence) {
-+static int64_t SeekContext(URLContext* h, int64_t offset, int whence) {
- #if defined(OS_WIN)
- return _lseeki64(GetHandle(h), static_cast<__int64>(offset), whence);
- #else
diff --git a/chromium/patches/patch-media_filters_ffmpeg__glue.cc b/chromium/patches/patch-media_filters_ffmpeg__glue.cc
deleted file mode 100644
index 3af4adef3c..0000000000
--- a/chromium/patches/patch-media_filters_ffmpeg__glue.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-media_filters_ffmpeg__glue.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- media/filters/ffmpeg_glue.cc.orig 2011-05-24 08:01:03.000000000 +0000
-+++ media/filters/ffmpeg_glue.cc
-@@ -44,7 +44,7 @@ static int WriteContext(URLContext* h, u
- return AVERROR_IO;
- }
-
--static int64 SeekContext(URLContext* h, int64 offset, int whence) {
-+static int64_t SeekContext(URLContext* h, int64_t offset, int whence) {
- FFmpegURLProtocol* protocol = ToProtocol(h->priv_data);
- int64 new_offset = AVERROR_IO;
- switch (whence) {
diff --git a/chromium/patches/patch-media_media.gyp b/chromium/patches/patch-media_media.gyp
deleted file mode 100644
index 44beb12ab2..0000000000
--- a/chromium/patches/patch-media_media.gyp
+++ /dev/null
@@ -1,118 +0,0 @@
-$NetBSD: patch-media_media.gyp,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- media/media.gyp.orig 2011-05-24 08:01:03.000000000 +0000
-+++ media/media.gyp
-@@ -173,14 +173,14 @@
- 'video/mft_h264_decode_engine.h',
- ],
- }],
-- ['OS=="linux" or OS=="freebsd"', {
-+ ['OS=="linux" or OS=="freebsd" or OS=="dragonfly"', {
- 'link_settings': {
- 'libraries': [
- '-lasound',
- ],
- },
- }],
-- ['OS=="openbsd"', {
-+ ['OS=="openbsd" or OS=="netbsd"', {
- 'sources/': [ ['exclude', 'alsa_' ],
- ['exclude', 'audio_manager_linux' ],
- ['exclude', '\\.mm?$' ] ],
-@@ -189,13 +189,13 @@
- ],
- },
- }],
-- ['OS!="openbsd"', {
-+ ['OS!="openbsd" and OS!="netbsd"', {
- 'sources!': [
- 'audio/openbsd/audio_manager_openbsd.cc',
- 'audio/openbsd/audio_manager_openbsd.h',
- ],
- }],
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'sources': [
- 'filters/omx_video_decoder.cc',
- 'filters/omx_video_decoder.h',
-@@ -271,7 +271,7 @@
- '..',
- ],
- 'conditions': [
-- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
-+ [ 'OS == "linux" or OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or OS == "openbsd"', {
- 'cflags': [
- '-msse2',
- ],
-@@ -298,7 +298,7 @@
- 'ffmpeg/ffmpeg_unittest.cc',
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'dependencies': [
- # Needed for the following #include chain:
- # base/run_all_unittests.cc
-@@ -379,7 +379,12 @@
- 'video/ffmpeg_video_decode_engine_unittest.cc',
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="netbsd" or OS=="openbsd"', {
-+ 'sources!': [
-+ 'audio/linux/alsa_output_unittest.cc',
-+ ],
-+ }],
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'dependencies': [
- # Needed for the following #include chain:
- # base/run_all_unittests.cc
-@@ -580,7 +585,7 @@
- 'tools/shader_bench/window.h',
- ],
- 'conditions': [
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
-@@ -620,7 +625,7 @@
- },
- ],
- }],
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'targets': [
- {
- 'target_name': 'omx_test',
-@@ -652,7 +657,7 @@
- '../testing/gtest.gyp:gtest',
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
-@@ -692,12 +697,20 @@
- ],
- 'link_settings': {
- 'libraries': [
-- '-ldl',
- '-lX11',
- '-lXrender',
- '-lXext',
- ],
- },
-+ 'conditions': [
-+ ['OS=="linux"', {
-+ 'link_settings': {
-+ 'libraries': [
-+ '-ldl',
-+ ],
-+ },
-+ }],
-+ ],
- 'sources': [
- 'tools/player_x11/player_x11.cc',
- ],
diff --git a/chromium/patches/patch-media_tools_shader__bench_shader__bench.cc b/chromium/patches/patch-media_tools_shader__bench_shader__bench.cc
deleted file mode 100644
index 65be74956d..0000000000
--- a/chromium/patches/patch-media_tools_shader__bench_shader__bench.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-media_tools_shader__bench_shader__bench.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- media/tools/shader_bench/shader_bench.cc.orig 2011-05-24 08:01:03.000000000 +0000
-+++ media/tools/shader_bench/shader_bench.cc
-@@ -24,7 +24,7 @@
- #include "media/tools/shader_bench/window.h"
- #include "ui/gfx/native_widget_types.h"
-
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- #include <gtk/gtk.h>
- #endif
-
-@@ -97,7 +97,7 @@ int main(int argc, char** argv) {
- }
-
- // Read command line.
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- gtk_init(&argc, &argv);
- #endif
- CommandLine::Init(argc, argv);
diff --git a/chromium/patches/patch-native__client_build_common.gypi b/chromium/patches/patch-native__client_build_common.gypi
deleted file mode 100644
index b6574535b7..0000000000
--- a/chromium/patches/patch-native__client_build_common.gypi
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-native__client_build_common.gypi,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- native_client/build/common.gypi.orig 2011-05-24 08:19:29.000000000 +0000
-+++ native_client/build/common.gypi
-@@ -71,12 +71,12 @@
- # Compute the architecture that we're building for. Default to the
- # architecture that we're building on.
- 'conditions': [
-- [ 'OS=="linux" and nacl_standalone==0', {
-+ [ '(OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd") and nacl_standalone==0', {
- # This handles the Linux platforms we generally deal with. Anything
- # else gets passed through, which probably won't work very well; such
- # hosts should pass an explicit target_arch to gyp.
- 'target_arch%':
-- '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/arm.*/arm/")'
-+ '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/amd64/x64/;s/arm.*/arm/")'
- }, { # OS!="linux"
- 'target_arch%': 'ia32',
- }],
-@@ -358,7 +358,7 @@
- },
- },
- 'conditions': [
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'target_defaults': {
- # Enable -Werror by default, but put it in a variable so it can
- # be disabled in ~/.gyp/include.gypi on the valgrind builders.
-@@ -441,11 +441,20 @@
- 'NACL_OSX=0',
- 'NACL_WINDOWS=0',
- '_BSD_SOURCE=1',
-+ '_NETBSD_SOURCE=1',
- '_POSIX_C_SOURCE=199506',
- '_XOPEN_SOURCE=600',
- '_GNU_SOURCE=1',
- '__STDC_LIMIT_MACROS=1',
- ],
-+ 'conditions': [
-+ ['OS=="dragonfly"', {
-+ 'defines!': [
-+ '_POSIX_C_SOURCE=199506',
-+ '_XOPEN_SOURCE=600',
-+ ],
-+ }],
-+ ],
- 'link_settings': {
- 'libraries': [
- '-lrt',
diff --git a/chromium/patches/patch-native__client_src_include_nacl__platform.h b/chromium/patches/patch-native__client_src_include_nacl__platform.h
deleted file mode 100644
index 7185706f21..0000000000
--- a/chromium/patches/patch-native__client_src_include_nacl__platform.h
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-native__client_src_include_nacl__platform.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- native_client/src/include/nacl_platform.h.orig 2011-04-13 08:13:05.000000000 +0000
-+++ native_client/src/include/nacl_platform.h
-@@ -49,13 +49,11 @@
- /* mmap enums, e.g. PROT_READ, PROT_WRITE*/
- #if NACL_WINDOWS
- #include "native_client/src/include/win/mman.h"
--#elif NACL_OSX
-+#elif NACL_OSX || NACL_LINUX
- # include <sys/mman.h>
- #ifndef MAP_ANONYMOUS
- #define MAP_ANONYMOUS MAP_ANON
- #endif
--#elif NACL_LINUX
--# include <sys/mman.h>
- #endif
-
- #endif /* NATIVE_CLIENT_SRC_INCLUDE_NACL_PLATFORM_H_ */
diff --git a/chromium/patches/patch-native__client_src_shared_platform_linux_nacl__host__desc.c b/chromium/patches/patch-native__client_src_shared_platform_linux_nacl__host__desc.c
deleted file mode 100644
index e784e241ba..0000000000
--- a/chromium/patches/patch-native__client_src_shared_platform_linux_nacl__host__desc.c
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-native__client_src_shared_platform_linux_nacl__host__desc.c,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- native_client/src/shared/platform/linux/nacl_host_desc.c.orig 2011-05-24 08:19:24.000000000 +0000
-+++ native_client/src/shared/platform/linux/nacl_host_desc.c
-@@ -402,7 +402,11 @@ int NaClHostDescIoctl(struct NaClHostDes
- int NaClHostDescFstat(struct NaClHostDesc *d,
- nacl_host_stat_t *nhsp) {
- #if NACL_LINUX
-+#if defined(__NetBSD__) || defined(__DragonFly__)
-+ if (fstat(d->d, nhsp) == -1) {
-+#else
- if (fstat64(d->d, nhsp) == -1) {
-+#endif
- return -errno;
- }
- #elif NACL_OSX
-@@ -437,7 +441,11 @@ int NaClHostDescStat(char const *h
- nacl_host_stat_t *nhsp) {
-
- #if NACL_LINUX
-+#if defined(__NetBSD__) || defined(__DragonFly__)
-+ if (stat(host_os_pathname, nhsp) == -1) {
-+#else
- if (stat64(host_os_pathname, nhsp) == -1) {
-+#endif
- return -errno;
- }
- #elif NACL_OSX
diff --git a/chromium/patches/patch-native__client_src_shared_platform_linux_nacl__host__dir.c b/chromium/patches/patch-native__client_src_shared_platform_linux_nacl__host__dir.c
deleted file mode 100644
index 18acee537a..0000000000
--- a/chromium/patches/patch-native__client_src_shared_platform_linux_nacl__host__dir.c
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-native__client_src_shared_platform_linux_nacl__host__dir.c,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- native_client/src/shared/platform/linux/nacl_host_dir.c.orig 2011-05-24 08:19:24.000000000 +0000
-+++ native_client/src/shared/platform/linux/nacl_host_dir.c
-@@ -40,6 +40,7 @@
- #include "native_client/src/trusted/service_runtime/include/sys/mman.h"
- #include "native_client/src/trusted/service_runtime/include/sys/stat.h"
-
-+#if !defined(__NetBSD__) && !defined(__DragonFly__)
- #ifdef _syscall3
- _syscall3(int, getdents, uint, fd, struct dirent *, dirp, uint, count)
-
-@@ -50,6 +51,7 @@ int getdents(unsigned int fd, struct dir
- return syscall(SYS_getdents, fd, dirp, count);
- }
- #endif
-+#endif
-
- #define offsetof(T, member) (((char *) &((T *) 0)->member) - (char *) 0)
-
diff --git a/chromium/patches/patch-native__client_src_shared_platform_linux_nacl__threads.c b/chromium/patches/patch-native__client_src_shared_platform_linux_nacl__threads.c
deleted file mode 100644
index 2be3bb276b..0000000000
--- a/chromium/patches/patch-native__client_src_shared_platform_linux_nacl__threads.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-native__client_src_shared_platform_linux_nacl__threads.c,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- native_client/src/shared/platform/linux/nacl_threads.c.orig 2011-04-13 08:13:05.000000000 +0000
-+++ native_client/src/shared/platform/linux/nacl_threads.c
-@@ -24,6 +24,10 @@
- #include "native_client/src/shared/platform/nacl_threads.h"
- #include "native_client/src/trusted/service_runtime/nacl_config.h"
-
-+#if defined(__NetBSD__)
-+#define PTHREAD_STACK_MIN MINSIGSTKSZ
-+#endif
-+
- #if !defined(__native_client__) && NACL_KERN_STACK_SIZE < PTHREAD_STACK_MIN
- # error "NaCl service runtime stack size is smaller than PTHREAD_STACK_MIN"
- #endif
diff --git a/chromium/patches/patch-native__client_src_shared_platform_nacl__host__desc.h b/chromium/patches/patch-native__client_src_shared_platform_nacl__host__desc.h
deleted file mode 100644
index 54ea5fdf18..0000000000
--- a/chromium/patches/patch-native__client_src_shared_platform_nacl__host__desc.h
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-native__client_src_shared_platform_nacl__host__desc.h,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- native_client/src/shared/platform/nacl_host_desc.h.orig 2011-05-24 08:19:24.000000000 +0000
-+++ native_client/src/shared/platform/nacl_host_desc.h
-@@ -46,7 +46,11 @@ typedef int64_t nacl_off64_t;
- * compatible w/ nacl_off64_t above.
- */
- #if NACL_LINUX
-+#if defined(__NetBSD__) || defined(__DragonFly__)
-+typedef struct stat nacl_host_stat_t;
-+#else
- typedef struct stat64 nacl_host_stat_t;
-+#endif
- #elif NACL_OSX
- typedef struct stat nacl_host_stat_t;
- #elif NACL_WINDOWS
diff --git a/chromium/patches/patch-native__client_src_shared_platform_platform.gyp b/chromium/patches/patch-native__client_src_shared_platform_platform.gyp
deleted file mode 100644
index 8ac33ce738..0000000000
--- a/chromium/patches/patch-native__client_src_shared_platform_platform.gyp
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-native__client_src_shared_platform_platform.gyp,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- native_client/src/shared/platform/platform.gyp.orig 2011-04-13 08:13:05.000000000 +0000
-+++ native_client/src/shared/platform/platform.gyp
-@@ -60,7 +60,7 @@
- 'time.h',
- ],
- 'conditions': [
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'platform_sources': [
- 'linux/condition_variable.cc',
- 'linux/lock.cc',
-@@ -75,6 +75,11 @@
- 'linux/time_linux.cc',
- ],
- }],
-+ ['OS=="netbsd"', {
-+ 'platform_sources': [
-+ 'osx/strnlen_osx.c',
-+ ],
-+ }],
- ['OS=="mac"', {
- 'platform_sources': [
- 'linux/condition_variable.cc',
diff --git a/chromium/patches/patch-native__client_src_trusted_debug__stub_debug__stub.gyp b/chromium/patches/patch-native__client_src_trusted_debug__stub_debug__stub.gyp
deleted file mode 100644
index c240300c0f..0000000000
--- a/chromium/patches/patch-native__client_src_trusted_debug__stub_debug__stub.gyp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-native__client_src_trusted_debug__stub_debug__stub.gyp,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- native_client/src/trusted/debug_stub/debug_stub.gyp.orig 2011-04-13 08:13:06.000000000 +0000
-+++ native_client/src/trusted/debug_stub/debug_stub.gyp
-@@ -16,7 +16,7 @@
- 'transport_common.cc',
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="mac"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="mac"', {
- 'platform_sources': [
- 'posix/debug_stub_posix.cc',
- 'posix/mutex_impl.cc',
-@@ -40,7 +40,7 @@
- 'target_base': 'none',
- },
- 'target_conditions': [
-- ['OS=="linux" or OS=="mac"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="mac"', {
- 'cflags': [
- '-Wno-long-long',
- ],
diff --git a/chromium/patches/patch-native__client_src_trusted_debug__stub_posix_platform__impl.cc b/chromium/patches/patch-native__client_src_trusted_debug__stub_posix_platform__impl.cc
deleted file mode 100644
index a0ae0425ff..0000000000
--- a/chromium/patches/patch-native__client_src_trusted_debug__stub_posix_platform__impl.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-native__client_src_trusted_debug__stub_posix_platform__impl.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- native_client/src/trusted/debug_stub/posix/platform_impl.cc.orig 2011-05-24 08:19:25.000000000 +0000
-+++ native_client/src/trusted/debug_stub/posix/platform_impl.cc
-@@ -11,6 +11,9 @@
- #include <sys/types.h>
- #include <sys/syscall.h>
- #include <pthread.h>
-+#if defined(__NetBSD__)
-+#include <lwp.h>
-+#endif
-
- #include <map>
- #include <vector>
-@@ -49,13 +52,25 @@ struct StartInfo_t {
-
- // Get the OS id of this thread
- uint32_t IPlatform::GetCurrentThread() {
-+#if defined(__NetBSD__)
-+ return static_cast<uint32_t>(_lwp_self());
-+#elif defined(__DragonFly__)
-+ return static_cast<uint32_t>(lwp_gettid());
-+#else
- return static_cast<uint32_t>(syscall(SYS_gettid));
-+#endif
- }
-
- // Use start stub, to record thread id, and signal launcher
- static void *StartFunc(void* cookie) {
- StartInfo_t* info = reinterpret_cast<StartInfo_t*>(cookie);
-+#if defined(__NetBSD__)
-+ info->id_ = (uint32_t) _lwp_self();
-+#elif defined(__DragonFly__)
-+ info->id_ = (uint32_t) lwp_gettid();
-+#else
- info->id_ = (uint32_t) syscall(SYS_gettid);
-+#endif
-
- printf("Started thread...\n");
- GetLaunchEvent()->Signal();
diff --git a/chromium/patches/patch-native__client_src_trusted_debug__stub_transport__common.cc b/chromium/patches/patch-native__client_src_trusted_debug__stub_transport__common.cc
deleted file mode 100644
index f523375044..0000000000
--- a/chromium/patches/patch-native__client_src_trusted_debug__stub_transport__common.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-native__client_src_trusted_debug__stub_transport__common.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- native_client/src/trusted/debug_stub/transport_common.cc.orig 2011-05-24 08:19:25.000000000 +0000
-+++ native_client/src/trusted/debug_stub/transport_common.cc
-@@ -14,6 +14,7 @@
-
- #include <arpa/inet.h>
- #include <netdb.h>
-+#include <netinet/in.h>
- #include <sys/select.h>
- #include <sys/socket.h>
- #include <sys/types.h>
diff --git a/chromium/patches/patch-native__client_src_trusted_plugin_nacl__entry__points.cc b/chromium/patches/patch-native__client_src_trusted_plugin_nacl__entry__points.cc
deleted file mode 100644
index f8f6aa84a5..0000000000
--- a/chromium/patches/patch-native__client_src_trusted_plugin_nacl__entry__points.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-native__client_src_trusted_plugin_nacl__entry__points.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- native_client/src/trusted/plugin/nacl_entry_points.cc.orig 2011-04-13 08:13:07.000000000 +0000
-+++ native_client/src/trusted/plugin/nacl_entry_points.cc
-@@ -76,7 +76,7 @@ NPError API_CALL NaCl_NP_Shutdown() {
-
- static void RegisterCommon() {
- NPAPI::PluginEntryPoints entry_points = {
--#if !defined(OS_LINUX)
-+#if NACL_WINDOWS || NACL_OSX
- NaCl_NP_GetEntryPoints,
- #endif
- NaCl_NP_Initialize,
diff --git a/chromium/patches/patch-native__client_src_trusted_service__runtime_arch_x86_sel__ldr__x86.h b/chromium/patches/patch-native__client_src_trusted_service__runtime_arch_x86_sel__ldr__x86.h
deleted file mode 100644
index bc2f85757a..0000000000
--- a/chromium/patches/patch-native__client_src_trusted_service__runtime_arch_x86_sel__ldr__x86.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-native__client_src_trusted_service__runtime_arch_x86_sel__ldr__x86.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- native_client/src/trusted/service_runtime/arch/x86/sel_ldr_x86.h.orig 2011-04-13 08:13:10.000000000 +0000
-+++ native_client/src/trusted/service_runtime/arch/x86/sel_ldr_x86.h
-@@ -14,6 +14,9 @@
- # define LDT_ENTRIES 8192
- #elif NACL_LINUX
- # include <asm/ldt.h>
-+#ifndef LDT_ENTRIES
-+# define LDT_ENTRIES 8192
-+#endif
- #endif
-
- #include "native_client/src/trusted/service_runtime/arch/x86/nacl_ldt_x86.h"
diff --git a/chromium/patches/patch-native__client_src_trusted_service__runtime_service__runtime.gyp b/chromium/patches/patch-native__client_src_trusted_service__runtime_service__runtime.gyp
deleted file mode 100644
index c3f74d55dc..0000000000
--- a/chromium/patches/patch-native__client_src_trusted_service__runtime_service__runtime.gyp
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-native__client_src_trusted_service__runtime_service__runtime.gyp,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- native_client/src/trusted/service_runtime/service_runtime.gyp.orig 2011-04-13 08:13:10.000000000 +0000
-+++ native_client/src/trusted/service_runtime/service_runtime.gyp
-@@ -6,7 +6,7 @@
- {
- 'variables': {
- 'conditions': [
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'syscall_handler': [
- 'linux/nacl_syscall_impl.c'
- ],
-@@ -32,7 +32,7 @@
- 'target_base': 'none',
- },
- 'target_conditions': [
-- ['OS=="linux" or OS=="mac"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="mac"', {
- 'cflags': [
- '-fexceptions',
- ],
-@@ -162,7 +162,7 @@
- }],
- ],
- }],
-- ['OS=="linux" or OS=="mac" or OS=="FreeBSD"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="mac"', {
- 'sources': [
- 'posix/nacl_signal.c',
- ],
diff --git a/chromium/patches/patch-net_base_dnsrr__resolver.cc b/chromium/patches/patch-net_base_dnsrr__resolver.cc
deleted file mode 100644
index 6b97dd59a3..0000000000
--- a/chromium/patches/patch-net_base_dnsrr__resolver.cc
+++ /dev/null
@@ -1,37 +0,0 @@
-$NetBSD: patch-net_base_dnsrr__resolver.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- net/base/dnsrr_resolver.cc.orig 2011-04-13 08:01:17.000000000 +0000
-+++ net/base/dnsrr_resolver.cc
-@@ -4,6 +4,12 @@
-
- #include "net/base/dnsrr_resolver.h"
-
-+#if defined(OS_BSD)
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#endif
-+
- #if defined(OS_POSIX)
- #include <resolv.h>
- #endif
-@@ -185,16 +191,18 @@ class RRResolverWorker {
- }
-
- bool r = true;
-+#if !defined(OS_BSD)
- if ((_res.options & RES_INIT) == 0) {
- if (res_ninit(&_res) != 0)
- r = false;
- }
-+#endif
-
- if (r) {
- unsigned long saved_options = _res.options;
- r = Do();
-
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD)
- if (!r && DnsReloadTimerHasExpired()) {
- // When there's no network connection, _res may not be initialized by
- // getaddrinfo. Therefore, we call res_nclose only when there are ns
diff --git a/chromium/patches/patch-net_base_host__resolver__impl.cc b/chromium/patches/patch-net_base_host__resolver__impl.cc
deleted file mode 100644
index 06b8bba4b9..0000000000
--- a/chromium/patches/patch-net_base_host__resolver__impl.cc
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD: patch-net_base_host__resolver__impl.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- net/base/host_resolver_impl.cc.orig 2011-04-13 08:01:17.000000000 +0000
-+++ net/base/host_resolver_impl.cc
-@@ -199,13 +199,11 @@ class JobCreationParameters : public Net
- std::vector<int> GetAllGetAddrinfoOSErrors() {
- int os_errors[] = {
- #if defined(OS_POSIX)
-- EAI_ADDRFAMILY,
- EAI_AGAIN,
- EAI_BADFLAGS,
- EAI_FAIL,
- EAI_FAMILY,
- EAI_MEMORY,
-- EAI_NODATA,
- EAI_NONAME,
- EAI_SERVICE,
- EAI_SOCKTYPE,
-@@ -919,7 +917,7 @@ HostResolverImpl::HostResolverImpl(
- #if defined(OS_WIN)
- EnsureWinsockInit();
- #endif
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- if (HaveOnlyLoopbackAddresses())
- additional_resolver_flags_ |= HOST_RESOLVER_LOOPBACK_ONLY;
- #endif
-@@ -1447,7 +1445,7 @@ void HostResolverImpl::OnIPAddressChange
- ipv6_probe_job_ = new IPv6ProbeJob(this);
- ipv6_probe_job_->Start();
- }
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- if (HaveOnlyLoopbackAddresses()) {
- additional_resolver_flags_ |= HOST_RESOLVER_LOOPBACK_ONLY;
- } else {
diff --git a/chromium/patches/patch-net_base_host__resolver__proc.cc b/chromium/patches/patch-net_base_host__resolver__proc.cc
deleted file mode 100644
index edc7d183b7..0000000000
--- a/chromium/patches/patch-net_base_host__resolver__proc.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-net_base_host__resolver__proc.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- net/base/host_resolver_proc.cc.orig 2011-04-13 08:01:17.000000000 +0000
-+++ net/base/host_resolver_proc.cc
-@@ -6,6 +6,12 @@
-
- #include "build/build_config.h"
-
-+#if defined(OS_BSD)
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <netinet/in.h>
-+#endif
-+
- #if defined(OS_POSIX) && !defined(OS_MACOSX)
- #include <resolv.h>
- #endif
-@@ -156,7 +162,7 @@ int SystemHostResolverProc(const std::st
- hints.ai_family = AF_UNSPEC;
- }
-
--#if defined(OS_WIN) || defined(OS_OPENBSD)
-+#if defined(OS_WIN) || defined(OS_OPENBSD) || defined(OS_NETBSD)
- // DO NOT USE AI_ADDRCONFIG ON WINDOWS.
- //
- // The following comment in <winsock2.h> is the best documentation I found
-@@ -180,6 +186,7 @@ int SystemHostResolverProc(const std::st
- //
- // OpenBSD does not support it, either.
- hints.ai_flags = 0;
-+#define AI_ADDRCONFIG 0
- #else
- hints.ai_flags = AI_ADDRCONFIG;
- #endif
-@@ -198,7 +205,8 @@ int SystemHostResolverProc(const std::st
-
- int err = getaddrinfo(host.c_str(), NULL, &hints, &ai);
- bool should_retry = false;
--#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD)
-+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_OPENBSD) && \
-+ !defined(OS_NETBSD)
- // If we fail, re-initialise the resolver just in case there have been any
- // changes to /etc/resolv.conf and retry. See http://crbug.com/11380 for info.
- if (err && DnsReloadTimerHasExpired()) {
diff --git a/chromium/patches/patch-net_base_listen__socket.cc b/chromium/patches/patch-net_base_listen__socket.cc
deleted file mode 100644
index 6499d2c3e2..0000000000
--- a/chromium/patches/patch-net_base_listen__socket.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-net_base_listen__socket.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- net/base/listen_socket.cc.orig 2011-04-13 08:01:17.000000000 +0000
-+++ net/base/listen_socket.cc
-@@ -10,6 +10,7 @@
- #include <winsock2.h>
- #elif defined(OS_POSIX)
- #include <errno.h>
-+#include <sys/types.h>
- #include <netinet/in.h>
- #include <sys/socket.h>
- #include <arpa/inet.h>
diff --git a/chromium/patches/patch-net_base_listen__socket__unittest.cc b/chromium/patches/patch-net_base_listen__socket__unittest.cc
deleted file mode 100644
index 01961899a5..0000000000
--- a/chromium/patches/patch-net_base_listen__socket__unittest.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-net_base_listen__socket__unittest.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- net/base/listen_socket_unittest.cc.orig 2011-04-13 08:01:17.000000000 +0000
-+++ net/base/listen_socket_unittest.cc
-@@ -6,6 +6,9 @@
-
- #include <fcntl.h>
- #include <sys/types.h>
-+#if defined(OS_BSD)
-+#include <netinet/in.h>
-+#endif
-
- #include "base/eintr_wrapper.h"
- #include "net/base/net_util.h"
diff --git a/chromium/patches/patch-net_base_listen__socket__unittest.h b/chromium/patches/patch-net_base_listen__socket__unittest.h
deleted file mode 100644
index 27e4ccdc87..0000000000
--- a/chromium/patches/patch-net_base_listen__socket__unittest.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-net_base_listen__socket__unittest.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- net/base/listen_socket_unittest.h.orig 2011-04-13 08:01:17.000000000 +0000
-+++ net/base/listen_socket_unittest.h
-@@ -11,6 +11,7 @@
- #if defined(OS_WIN)
- #include <winsock2.h>
- #elif defined(OS_POSIX)
-+#include <sys/types.h>
- #include <sys/socket.h>
- #include <errno.h>
- #include <arpa/inet.h>
diff --git a/chromium/patches/patch-net_base_net__util.cc b/chromium/patches/patch-net_base_net__util.cc
deleted file mode 100644
index 68678a7483..0000000000
--- a/chromium/patches/patch-net_base_net__util.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-net_base_net__util.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- net/base/net_util.cc.orig 2011-05-24 08:01:14.000000000 +0000
-+++ net/base/net_util.cc
-@@ -24,6 +24,7 @@
- #include <fcntl.h>
- #include <ifaddrs.h>
- #include <netdb.h>
-+#include <sys/socket.h>
- #include <net/if.h>
- #include <netinet/in.h>
- #endif
diff --git a/chromium/patches/patch-net_base_net__util.h b/chromium/patches/patch-net_base_net__util.h
deleted file mode 100644
index 1d750398f8..0000000000
--- a/chromium/patches/patch-net_base_net__util.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-net_base_net__util.h,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- net/base/net_util.h.orig 2011-05-24 08:01:14.000000000 +0000
-+++ net/base/net_util.h
-@@ -12,6 +12,7 @@
- #include <windows.h>
- #include <ws2tcpip.h>
- #elif defined(OS_POSIX)
-+#include <sys/types.h>
- #include <sys/socket.h>
- #endif
-
diff --git a/chromium/patches/patch-net_base_network__change__notifier.cc b/chromium/patches/patch-net_base_network__change__notifier.cc
deleted file mode 100644
index 5901e0879c..0000000000
--- a/chromium/patches/patch-net_base_network__change__notifier.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-net_base_network__change__notifier.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- net/base/network_change_notifier.cc.orig 2011-04-13 08:01:17.000000000 +0000
-+++ net/base/network_change_notifier.cc
-@@ -42,7 +42,6 @@ NetworkChangeNotifier* NetworkChangeNoti
- #elif defined(OS_MACOSX)
- return new NetworkChangeNotifierMac();
- #else
-- NOTIMPLEMENTED();
- return NULL;
- #endif
- }
diff --git a/chromium/patches/patch-net_disk__cache_disk__format.h b/chromium/patches/patch-net_disk__cache_disk__format.h
deleted file mode 100644
index d39c0fff8f..0000000000
--- a/chromium/patches/patch-net_disk__cache_disk__format.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-net_disk__cache_disk__format.h,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- net/disk_cache/disk_format.h.orig 2011-04-13 08:01:17.000000000 +0000
-+++ net/disk_cache/disk_format.h
-@@ -156,7 +156,7 @@ struct RankingsNode {
- };
- #pragma pack(pop)
-
--COMPILE_ASSERT(sizeof(RankingsNode) == 36, bad_RankingsNode);
-+//COMPILE_ASSERT(sizeof(RankingsNode) == 36, bad_RankingsNode);
-
- const uint32 kBlockMagic = 0xC104CAC3;
- const int kBlockHeaderSize = 8192; // Two pages: almost 64k entries
diff --git a/chromium/patches/patch-net_net.gyp b/chromium/patches/patch-net_net.gyp
deleted file mode 100644
index 8dfab909f4..0000000000
--- a/chromium/patches/patch-net_net.gyp
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-net_net.gyp,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- net/net.gyp.orig 2011-05-24 08:01:15.000000000 +0000
-+++ net/net.gyp
-@@ -241,11 +241,23 @@
- },
- ],
- 'conditions': [
-- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
-+ [ 'OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or OS == "openbsd"', {
-+ 'sources!': [
-+ 'base/network_change_notifier_linux.cc',
-+ 'base/network_change_notifier_linux.h',
-+ 'base/network_change_notifier_netlink_linux.cc',
-+ 'base/network_change_notifier_netlink_linux.h',
-+ ],
-+ }],
-+ [ 'OS == "linux" or OS == "netbsd"', {
-+ 'dependencies': [
-+ '../build/linux/system.gyp:libresolv',
-+ ],
-+ }],
-+ [ 'OS == "linux" or OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or OS == "openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gconf',
- '../build/linux/system.gyp:gdk',
-- '../build/linux/system.gyp:libresolv',
- ],
- 'conditions': [
- ['use_openssl==1', {
-@@ -777,7 +789,7 @@
- ],
- },
- ],
-- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
-+ [ 'OS == "linux" or OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or OS == "openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gconf',
- '../build/linux/system.gyp:gdk',
-@@ -1011,7 +1023,7 @@
- 'proxy/proxy_config_service_linux_unittest.cc',
- ],
- }],
-- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
-+ [ 'OS == "linux" or OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or OS == "openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- '../build/linux/system.gyp:nss',
-@@ -1023,7 +1035,7 @@
- ],
- }
- ],
-- [ 'OS == "linux"', {
-+ [ 'OS == "linux" or OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or OS == "openbsd"', {
- 'conditions': [
- ['linux_use_tcmalloc==1', {
- 'dependencies': [
-@@ -1183,7 +1195,7 @@
- '../third_party/protobuf/protobuf.gyp:py_proto',
- ],
- }],
-- ['OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
-+ ['OS == "linux" or OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or OS == "openbsd"', {
- 'conditions': [
- ['use_openssl==1', {
- 'dependencies': [
-@@ -1195,8 +1207,6 @@
- ],
- }],
- ],
-- }],
-- ['OS == "linux"', {
- 'conditions': [
- ['linux_use_tcmalloc==1', {
- 'dependencies': [
diff --git a/chromium/patches/patch-net_proxy_proxy__config__service__linux.cc b/chromium/patches/patch-net_proxy_proxy__config__service__linux.cc
deleted file mode 100644
index b29327e553..0000000000
--- a/chromium/patches/patch-net_proxy_proxy__config__service__linux.cc
+++ /dev/null
@@ -1,194 +0,0 @@
-$NetBSD: patch-net_proxy_proxy__config__service__linux.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- net/proxy/proxy_config_service_linux.cc.orig 2011-05-24 08:01:13.000000000 +0000
-+++ net/proxy/proxy_config_service_linux.cc
-@@ -12,7 +12,13 @@
- #include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
-+#if defined(OS_BSD)
-+#include <sys/types.h>
-+#include <sys/event.h>
-+#include <sys/time.h>
-+#else
- #include <sys/inotify.h>
-+#endif
- #include <unistd.h>
-
- #include <map>
-@@ -433,7 +439,7 @@ class GConfSettingGetterImplKDE
- public base::MessagePumpLibevent::Watcher {
- public:
- explicit GConfSettingGetterImplKDE(base::Environment* env_var_getter)
-- : inotify_fd_(-1), notify_delegate_(NULL), indirect_manual_(false),
-+ : notify_fd_(-1), notify_delegate_(NULL), indirect_manual_(false),
- auto_no_pac_(false), reversed_bypass_list_(false),
- env_var_getter_(env_var_getter), file_loop_(NULL) {
- // This has to be called on the UI thread (http://crbug.com/69057).
-@@ -492,33 +498,37 @@ class GConfSettingGetterImplKDE
- }
-
- virtual ~GConfSettingGetterImplKDE() {
-- // inotify_fd_ should have been closed before now, from
-+ // notify_fd_ should have been closed before now, from
- // Delegate::OnDestroy(), while running on the file thread. However
- // on exiting the process, it may happen that Delegate::OnDestroy()
- // task is left pending on the file loop after the loop was quit,
- // 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.)
-- if (inotify_fd_ >= 0)
-+ if (notify_fd_ >= 0)
- Shutdown();
-- DCHECK(inotify_fd_ < 0);
-+ DCHECK(notify_fd_ < 0);
- }
-
- virtual bool Init(MessageLoop* glib_default_loop,
- MessageLoopForIO* file_loop) {
- // This has to be called on the UI thread (http://crbug.com/69057).
- base::ThreadRestrictions::ScopedAllowIO allow_io;
-- DCHECK(inotify_fd_ < 0);
-- inotify_fd_ = inotify_init();
-- if (inotify_fd_ < 0) {
-+ DCHECK(notify_fd_ < 0);
-+#if defined(OS_BSD)
-+ notify_fd_ = kqueue();
-+#else
-+ notify_fd_ = inotify_init();
-+#endif
-+ if (notify_fd_ < 0) {
- PLOG(ERROR) << "inotify_init failed";
- return false;
- }
-- int flags = fcntl(inotify_fd_, F_GETFL);
-- if (fcntl(inotify_fd_, F_SETFL, flags | O_NONBLOCK) < 0) {
-+ int flags = fcntl(notify_fd_, F_GETFL);
-+ if (fcntl(notify_fd_, F_SETFL, flags | O_NONBLOCK) < 0) {
- PLOG(ERROR) << "fcntl failed";
-- close(inotify_fd_);
-- inotify_fd_ = -1;
-+ close(notify_fd_);
-+ notify_fd_ = -1;
- return false;
- }
- file_loop_ = file_loop;
-@@ -529,28 +539,40 @@ class GConfSettingGetterImplKDE
- }
-
- void Shutdown() {
-- if (inotify_fd_ >= 0) {
-+ if (notify_fd_ >= 0) {
- ResetCachedSettings();
-- inotify_watcher_.StopWatchingFileDescriptor();
-- close(inotify_fd_);
-- inotify_fd_ = -1;
-+ notify_watcher_.StopWatchingFileDescriptor();
-+ close(notify_fd_);
-+ notify_fd_ = -1;
- }
- }
-
- bool SetupNotification(ProxyConfigServiceLinux::Delegate* delegate) {
-- DCHECK(inotify_fd_ >= 0);
-+ DCHECK(notify_fd_ >= 0);
- DCHECK(file_loop_);
-+#if defined(OS_BSD)
-+ // catch the deletion event of kioslaverc
-+ int kioslavercfd = open(kde_config_dir_.Append("kioslaverc").value().c_str(), O_RDONLY);
-+ if (kioslavercfd == -1)
-+ return false;
-+ struct kevent ke;
-+ EV_SET(&ke, kioslavercfd, EVFILT_VNODE, EV_ADD | EV_ONESHOT, NOTE_DELETE | NOTE_RENAME, 0, NULL);
-+
-+ if (kevent(notify_fd_, &ke, 1, NULL, 0, NULL) == -1)
-+ return false;
-+#else
- // We can't just watch the kioslaverc file directly, since KDE will write
- // a new copy of it and then rename it whenever settings are changed and
- // inotify watches inodes (so we'll be watching the old deleted file after
- // the first change, and it will never change again). So, we watch the
- // directory instead. We then act only on changes to the kioslaverc entry.
-- if (inotify_add_watch(inotify_fd_, kde_config_dir_.value().c_str(),
-+ if (inotify_add_watch(notify_fd_, kde_config_dir_.value().c_str(),
- IN_MODIFY | IN_MOVED_TO) < 0)
- return false;
-+#endif
- notify_delegate_ = delegate;
-- return file_loop_->WatchFileDescriptor(inotify_fd_, true,
-- MessageLoopForIO::WATCH_READ, &inotify_watcher_, this);
-+ return file_loop_->WatchFileDescriptor(notify_fd_, true,
-+ MessageLoopForIO::WATCH_READ, ¬ify_watcher_, this);
- }
-
- virtual MessageLoop* GetNotificationLoop() {
-@@ -559,7 +581,7 @@ class GConfSettingGetterImplKDE
-
- // Implement base::MessagePumpLibevent::Delegate.
- void OnFileCanReadWithoutBlocking(int fd) {
-- DCHECK(fd == inotify_fd_);
-+ DCHECK(fd == notify_fd_);
- DCHECK(MessageLoop::current() == file_loop_);
- OnChangeNotification();
- }
-@@ -830,17 +852,29 @@ class GConfSettingGetterImplKDE
- // from the inotify file descriptor and starts up a debounce timer if
- // an event for kioslaverc is seen.
- void OnChangeNotification() {
-- DCHECK(inotify_fd_ >= 0);
-+ DCHECK(notify_fd_ >= 0);
- DCHECK(MessageLoop::current() == file_loop_);
-- char event_buf[(sizeof(inotify_event) + NAME_MAX + 1) * 4];
-+#if defined(OS_BSD)
-+ bool kioslaverc_touched = true;
-+ struct kevent ke;
-+ if (kevent(notify_fd_, NULL, 0, &ke, 1, NULL) == -1) {
-+ LOG(ERROR) << "kevent() failure: no loner watching kioslaverc";
-+ notify_watcher_.StopWatchingFileDescriptor();
-+ close(notify_fd_);
-+ notify_fd_ = -1;
-+ kioslaverc_touched = false;
-+ }
-+ close(ke.ident);
-+#else
-+ char event_buf[(sizeof(notify_event) + NAME_MAX + 1) * 4];
- bool kioslaverc_touched = false;
- ssize_t r;
-- while ((r = read(inotify_fd_, event_buf, sizeof(event_buf))) > 0) {
-+ while ((r = read(notify_fd_, event_buf, sizeof(event_buf))) > 0) {
- // inotify returns variable-length structures, which is why we have
- // this strange-looking loop instead of iterating through an array.
- char* event_ptr = event_buf;
- while (event_ptr < event_buf + r) {
-- inotify_event* event = reinterpret_cast<inotify_event*>(event_ptr);
-+ notify_event* event = reinterpret_cast<inotify_event*>(event_ptr);
- // The kernel always feeds us whole events.
- CHECK_LE(event_ptr + sizeof(inotify_event), event_buf + r);
- CHECK_LE(event->name + event->len, event_buf + r);
-@@ -865,11 +899,12 @@ class GConfSettingGetterImplKDE
- // large), but if it does we'd warn continuously since |inotify_fd_|
- // would be forever ready to read. Close it and stop watching instead.
- LOG(ERROR) << "inotify failure; no longer watching kioslaverc!";
-- inotify_watcher_.StopWatchingFileDescriptor();
-- close(inotify_fd_);
-- inotify_fd_ = -1;
-+ notify_watcher_.StopWatchingFileDescriptor();
-+ close(notify_fd_);
-+ notify_fd_ = -1;
- }
- }
-+#endif
- if (kioslaverc_touched) {
- // We don't use Reset() because the timer may not yet be running.
- // (In that case Stop() is a no-op.)
-@@ -883,8 +918,8 @@ class GConfSettingGetterImplKDE
- typedef std::map<std::string, std::string> string_map_type;
- typedef std::map<std::string, std::vector<std::string> > strings_map_type;
-
-- int inotify_fd_;
-- base::MessagePumpLibevent::FileDescriptorWatcher inotify_watcher_;
-+ int notify_fd_;
-+ base::MessagePumpLibevent::FileDescriptorWatcher notify_watcher_;
- ProxyConfigServiceLinux::Delegate* notify_delegate_;
- base::OneShotTimer<GConfSettingGetterImplKDE> debounce_timer_;
- FilePath kde_config_dir_;
diff --git a/chromium/patches/patch-net_proxy_proxy__service.cc b/chromium/patches/patch-net_proxy_proxy__service.cc
deleted file mode 100644
index 74b4eca9af..0000000000
--- a/chromium/patches/patch-net_proxy_proxy__service.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-net_proxy_proxy__service.cc,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- net/proxy/proxy_service.cc.orig 2011-04-13 08:01:16.000000000 +0000
-+++ net/proxy/proxy_service.cc
-@@ -25,7 +25,7 @@
- #elif defined(OS_MACOSX)
- #include "net/proxy/proxy_config_service_mac.h"
- #include "net/proxy/proxy_resolver_mac.h"
--#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
-+#elif defined(OS_LINUX) && !defined(OS_CHROMEOS) || defined(OS_BSD)
- #include "net/proxy/proxy_config_service_linux.h"
- #endif
- #include "net/proxy/proxy_resolver.h"
-@@ -795,7 +795,7 @@ ProxyConfigService* ProxyService::Create
- NOTREACHED() << "ProxyConfigService for ChromeOS should be created in "
- << "chrome_url_request_context.cc::CreateProxyConfigService.";
- return NULL;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- ProxyConfigServiceLinux* linux_config_service
- = new ProxyConfigServiceLinux();
-
diff --git a/chromium/patches/patch-net_third__party_nss_ssl.gyp b/chromium/patches/patch-net_third__party_nss_ssl.gyp
deleted file mode 100644
index a1f08d81da..0000000000
--- a/chromium/patches/patch-net_third__party_nss_ssl.gyp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-net_third__party_nss_ssl.gyp,v 1.1 2011/04/28 03:09:02 rxg Exp $
-
---- net/third_party/nss/ssl.gyp.orig 2011-04-13 08:01:16.000000000 +0000
-+++ net/third_party/nss/ssl.gyp
-@@ -4,7 +4,7 @@
-
- {
- 'conditions': [
-- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
-+ [ 'OS == "linux" or OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or OS == "openbsd"', {
- 'conditions': [
- ['sysroot!=""', {
- 'variables': {
-@@ -104,7 +104,7 @@
- ],
- },
- ],
-- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
-+ [ 'OS == "linux" or OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or OS == "openbsd"', {
- 'defines': [
- # These macros are needed only for compiling the files in
- # ssl/bodge.
diff --git a/chromium/patches/patch-ppapi_ppapi__tests.gypi b/chromium/patches/patch-ppapi_ppapi__tests.gypi
deleted file mode 100644
index 7f40e64f31..0000000000
--- a/chromium/patches/patch-ppapi_ppapi__tests.gypi
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ppapi_ppapi__tests.gypi,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- ppapi/ppapi_tests.gypi.orig 2011-04-13 08:01:10.000000000 +0000
-+++ ppapi/ppapi_tests.gypi
-@@ -31,7 +31,7 @@
- ],
- },
- }],
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'product_name': 'ppapi_example',
- 'type': 'shared_library',
- 'cflags': ['-fvisibility=hidden'],
diff --git a/chromium/patches/patch-ppapi_proxy_ppb__image__data__proxy.cc b/chromium/patches/patch-ppapi_proxy_ppb__image__data__proxy.cc
deleted file mode 100644
index 510c1f6c6b..0000000000
--- a/chromium/patches/patch-ppapi_proxy_ppb__image__data__proxy.cc
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-ppapi_proxy_ppb__image__data__proxy.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- ppapi/proxy/ppb_image_data_proxy.cc.orig 2011-05-24 08:01:06.000000000 +0000
-+++ ppapi/proxy/ppb_image_data_proxy.cc
-@@ -23,7 +23,7 @@
-
- #if defined(OS_LINUX)
- #include <sys/shm.h>
--#elif defined(OS_MACOSX)
-+#elif defined(OS_MACOSX) || defined(OS_BSD)
- #include <sys/stat.h>
- #include <sys/mman.h>
- #endif
-@@ -80,7 +80,7 @@ void* ImageData::Map() {
- #if defined(OS_WIN)
- NOTIMPLEMENTED();
- return NULL;
--#elif defined(OS_MACOSX)
-+#elif defined(OS_MACOSX) || defined(OS_BSD)
- struct stat st;
- if (fstat(handle_.fd, &st) != 0)
- return NULL;
-@@ -105,7 +105,7 @@ void* ImageData::Map() {
- void ImageData::Unmap() {
- #if defined(OS_WIN)
- NOTIMPLEMENTED();
--#elif defined(OS_MACOSX)
-+#elif defined(OS_MACOSX) || defined(OS_BSD)
- if (mapped_data_) {
- struct stat st;
- if (fstat(handle_.fd, &st) == 0)
-@@ -120,7 +120,7 @@ void ImageData::Unmap() {
-
- #if defined(OS_WIN)
- const ImageHandle ImageData::NullHandle = NULL;
--#elif defined(OS_MACOSX)
-+#elif defined(OS_MACOSX) || defined(OS_BSD)
- const ImageHandle ImageData::NullHandle = ImageHandle();
- #else
- const ImageHandle ImageData::NullHandle = 0;
-@@ -129,7 +129,7 @@ const ImageHandle ImageData::NullHandle
- ImageHandle ImageData::HandleFromInt(int32_t i) {
- #if defined(OS_WIN)
- return reinterpret_cast<ImageHandle>(i);
--#elif defined(OS_MACOSX)
-+#elif defined(OS_MACOSX) || defined(OS_BSD)
- return ImageHandle(i, false);
- #else
- return static_cast<ImageHandle>(i);
diff --git a/chromium/patches/patch-ppapi_proxy_serialized__structs.h b/chromium/patches/patch-ppapi_proxy_serialized__structs.h
deleted file mode 100644
index 9fb271e3b5..0000000000
--- a/chromium/patches/patch-ppapi_proxy_serialized__structs.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ppapi_proxy_serialized__structs.h,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- ppapi/proxy/serialized_structs.h.orig 2011-04-13 08:01:10.000000000 +0000
-+++ ppapi/proxy/serialized_structs.h
-@@ -102,7 +102,7 @@ struct PPBFlash_DrawGlyphs_Params {
-
- #if defined(OS_WIN)
- typedef HANDLE ImageHandle;
--#elif defined(OS_MACOSX)
-+#elif defined(OS_MACOSX) || defined(OS_BSD)
- typedef base::SharedMemoryHandle ImageHandle;
- #else
- // On X Windows this is a SysV shared memory key.
diff --git a/chromium/patches/patch-ppapi_proxy_serialized__var.cc b/chromium/patches/patch-ppapi_proxy_serialized__var.cc
deleted file mode 100644
index 52173afc51..0000000000
--- a/chromium/patches/patch-ppapi_proxy_serialized__var.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ppapi_proxy_serialized__var.cc,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- ppapi/proxy/serialized_var.cc.orig 2011-04-13 08:01:10.000000000 +0000
-+++ ppapi/proxy/serialized_var.cc
-@@ -189,7 +189,7 @@ bool SerializedVar::Inner::ReadFromMessa
- var_.value.as_id = 0;
- break;
- case PP_VARTYPE_OBJECT:
-- success = m->ReadInt64(iter, &var_.value.as_id);
-+ success = m->ReadInt64(iter, (int64 *)&var_.value.as_id);
- break;
- default:
- // Leave success as false.
diff --git a/chromium/patches/patch-printing_printing.gyp b/chromium/patches/patch-printing_printing.gyp
deleted file mode 100644
index e46a1b8044..0000000000
--- a/chromium/patches/patch-printing_printing.gyp
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-printing_printing.gyp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- printing/printing.gyp.orig 2011-04-13 08:01:08.000000000 +0000
-+++ printing/printing.gyp
-@@ -83,7 +83,7 @@
- ],
- },
- 'conditions': [
-- ['OS!="linux" and OS!="freebsd" and OS!="openbsd"',{
-+ ['OS!="linux" and OS!="dragonfly" and OS!="freebsd" and OS!="netbsd" and OS!="openbsd"',{
- 'sources/': [['exclude', '_cairo\\.cc$']]
- }],
- ['OS!="mac"', {'sources/': [['exclude', '_mac\\.(cc|mm?)$']]}],
-@@ -91,7 +91,7 @@
- }, { # else: OS=="win"
- 'sources/': [['exclude', '_posix\\.cc$']]
- }],
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- # For FT_Init_FreeType and friends.
- '../build/linux/system.gyp:freetype2',
-@@ -165,19 +165,17 @@
- 'units_unittest.cc',
- ],
- 'conditions': [
-- ['OS!="linux"', {'sources/': [['exclude', '_cairo_unittest\\.cc$']]}],
-+ ['OS!="linux" and OS!="dragonfly" and OS!="freebsd" and OS!="netbsd" and OS!="openbsd"', {'sources/': [['exclude', '_cairo_unittest\\.cc$']]}],
- ['OS!="mac"', {'sources/': [['exclude', '_mac_unittest\\.(cc|mm?)$']]}],
- ['OS!="win"', {'sources/': [['exclude', '_win_unittest\\.cc$']]
- }, { # else: OS=="win"
- 'sources/': [['exclude', '_cairo_unittest\\.cc$']]
- }
- ],
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- ],
-- }],
-- ['OS=="linux"', {
- 'conditions': [
- ['linux_use_tcmalloc==1', {
- 'dependencies': [
diff --git a/chromium/patches/patch-remoting_base_compound__buffer.cc b/chromium/patches/patch-remoting_base_compound__buffer.cc
deleted file mode 100644
index 8cc8d1e334..0000000000
--- a/chromium/patches/patch-remoting_base_compound__buffer.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-remoting_base_compound__buffer.cc,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- remoting/base/compound_buffer.cc.orig 2011-04-13 08:01:07.000000000 +0000
-+++ remoting/base/compound_buffer.cc
-@@ -270,7 +270,7 @@ bool CompoundBufferInputStream::Skip(int
- return count == 0;
- }
-
--int64 CompoundBufferInputStream::ByteCount() const {
-+int64_t CompoundBufferInputStream::ByteCount() const {
- return position_;
- }
-
diff --git a/chromium/patches/patch-remoting_base_compound__buffer.h b/chromium/patches/patch-remoting_base_compound__buffer.h
deleted file mode 100644
index 7a5cf5b197..0000000000
--- a/chromium/patches/patch-remoting_base_compound__buffer.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-remoting_base_compound__buffer.h,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- remoting/base/compound_buffer.h.orig 2011-04-13 08:01:07.000000000 +0000
-+++ remoting/base/compound_buffer.h
-@@ -111,7 +111,7 @@ class CompoundBufferInputStream
- virtual bool Next(const void** data, int* size);
- virtual void BackUp(int count);
- virtual bool Skip(int count);
-- virtual int64 ByteCount() const;
-+ virtual int64_t ByteCount() const;
-
- private:
- const CompoundBuffer* buffer_;
diff --git a/chromium/patches/patch-remoting_remoting.gyp b/chromium/patches/patch-remoting_remoting.gyp
deleted file mode 100644
index 31facf7538..0000000000
--- a/chromium/patches/patch-remoting_remoting.gyp
+++ /dev/null
@@ -1,89 +0,0 @@
-$NetBSD: patch-remoting_remoting.gyp,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- remoting/remoting.gyp.orig 2011-05-24 08:01:04.000000000 +0000
-+++ remoting/remoting.gyp
-@@ -16,7 +16,7 @@
- },
-
- 'conditions': [
-- ['OS=="linux" or OS=="mac"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="mac"', {
- 'targets': [
- # Simple webserver for testing chromoting client plugin.
- {
-@@ -30,7 +30,7 @@
- }],
-
- # TODO(hclam): Enable this target for mac.
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
-
- 'targets': [
- {
-@@ -40,15 +40,25 @@
- 'chromoting_base',
- 'chromoting_client',
- 'chromoting_jingle_glue',
-+ '../build/linux/system.gyp:x11',
-+ '../build/linux/system.gyp:xext',
- ],
- 'link_settings': {
- 'libraries': [
-- '-ldl',
- '-lX11',
- '-lXrender',
- '-lXext',
- ],
- },
-+ 'conditions': [
-+ ['OS=="linux"', {
-+ 'link_settings': {
-+ 'libraries': [
-+ '-ldl',
-+ ],
-+ },
-+ }],
-+ ],
- 'sources': [
- 'client/x11_client.cc',
- 'client/x11_input_handler.cc',
-@@ -112,7 +122,7 @@
- '../media/base/yuv_row_win.cc',
- ],
- }],
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="mac"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="mac"', {
- 'sources': [
- '../media/base/yuv_row_posix.cc',
- ],
-@@ -237,7 +247,11 @@
- 'host/user_authenticator_win.cc',
- ],
- }],
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
-+ 'dependencies': [
-+ '../build/linux/system.gyp:x11',
-+ '../build/linux/system.gyp:xext',
-+ ],
- 'sources': [
- 'host/capturer_linux.cc',
- 'host/capturer_linux.h',
-@@ -474,7 +488,7 @@
- '..',
- ],
- 'conditions': [
-- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
-+ [ 'OS == "linux" or OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or OS == "openbsd"', {
- 'cflags': [
- '-msse2',
- ],
-@@ -573,7 +587,7 @@
- 'host/capturer_gdi_unittest.cc',
- ],
- }],
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- # Needed for the following #include chain:
- # base/run_all_unittests.cc
diff --git a/chromium/patches/patch-remoting_tools_client__webserver_main.c b/chromium/patches/patch-remoting_tools_client__webserver_main.c
deleted file mode 100644
index 7a5e23d94d..0000000000
--- a/chromium/patches/patch-remoting_tools_client__webserver_main.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-remoting_tools_client__webserver_main.c,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- remoting/tools/client_webserver/main.c.orig 2011-05-24 08:01:04.000000000 +0000
-+++ remoting/tools/client_webserver/main.c
-@@ -21,6 +21,8 @@
- #include <netinet/in.h>
-
- #if defined (OS_POSIX)
-+#include <signal.h>
-+#include <sys/socket.h>
- #include <unistd.h>
- #endif // OS_POSIX
-
diff --git a/chromium/patches/patch-sandbox_sandbox.gyp b/chromium/patches/patch-sandbox_sandbox.gyp
deleted file mode 100644
index 861600d7af..0000000000
--- a/chromium/patches/patch-sandbox_sandbox.gyp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-sandbox_sandbox.gyp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- sandbox/sandbox.gyp.orig 2011-04-13 08:01:32.000000000 +0000
-+++ sandbox/sandbox.gyp
-@@ -126,7 +126,7 @@
- ],
- },
- 'conditions': [
-- [ 'OS=="freebsd" or OS=="openbsd"', {
-+ [ 'OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- # GYP requires that each file have at least one target defined.
- 'targets': [
- {
diff --git a/chromium/patches/patch-skia_ext_bitmap__platform__device.h b/chromium/patches/patch-skia_ext_bitmap__platform__device.h
deleted file mode 100644
index 7cdb96613f..0000000000
--- a/chromium/patches/patch-skia_ext_bitmap__platform__device.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-skia_ext_bitmap__platform__device.h,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- skia/ext/bitmap_platform_device.h.orig 2011-04-13 08:01:18.000000000 +0000
-+++ skia/ext/bitmap_platform_device.h
-@@ -13,7 +13,8 @@
- #include "skia/ext/bitmap_platform_device_win.h"
- #elif defined(__APPLE__)
- #include "skia/ext/bitmap_platform_device_mac.h"
--#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
-+ defined(__NetBSD__) || defined(__OpenBSD__)
- #include "skia/ext/bitmap_platform_device_linux.h"
- #endif
-
diff --git a/chromium/patches/patch-skia_ext_bitmap__platform__device__data.h b/chromium/patches/patch-skia_ext_bitmap__platform__device__data.h
deleted file mode 100644
index bf5fa0faf2..0000000000
--- a/chromium/patches/patch-skia_ext_bitmap__platform__device__data.h
+++ /dev/null
@@ -1,52 +0,0 @@
-$NetBSD: patch-skia_ext_bitmap__platform__device__data.h,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- skia/ext/bitmap_platform_device_data.h.orig 2011-04-13 08:01:18.000000000 +0000
-+++ skia/ext/bitmap_platform_device_data.h
-@@ -12,7 +12,8 @@ namespace skia {
- class BitmapPlatformDevice::BitmapPlatformDeviceData :
- #if defined(WIN32) || defined(__APPLE__)
- public SkRefCnt {
--#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
-+ defined(__NetBSD__) || defined(__OpenBSD__)
- // These objects are reference counted and own a Cairo surface. The surface
- // is the backing store for a Skia bitmap and we reference count it so that
- // we can copy BitmapPlatformDevice objects without having to copy all the
-@@ -25,13 +26,15 @@ class BitmapPlatformDevice::BitmapPlatfo
- typedef HBITMAP PlatformContext;
- #elif defined(__APPLE__)
- typedef CGContextRef PlatformContext;
--#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
-+ defined(__NetBSD__) || defined(__OpenBSD__)
- typedef cairo_t* PlatformContext;
- #endif
-
- #if defined(WIN32) || defined(__APPLE__)
- explicit BitmapPlatformDeviceData(PlatformContext bitmap);
--#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
-+ defined(__NetBSD__) || defined(__OpenBSD__)
- explicit BitmapPlatformDeviceData(cairo_surface_t* surface);
- #endif
-
-@@ -68,7 +71,8 @@ class BitmapPlatformDevice::BitmapPlatfo
- }
-
- private:
--#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
-+ defined(__NetBSD__) || defined(__OpenBSD__)
- friend class base::RefCounted<BitmapPlatformDeviceData>;
- #endif
- virtual ~BitmapPlatformDeviceData();
-@@ -79,7 +83,8 @@ class BitmapPlatformDevice::BitmapPlatfo
- #if defined(WIN32)
- // Lazily-created DC used to draw into the bitmap, see GetBitmapDC().
- HDC hdc_;
--#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
-+ defined(__NetBSD__) || defined(__OpenBSD__)
- cairo_surface_t *const surface_;
- #endif
-
diff --git a/chromium/patches/patch-skia_ext_canvas__paint.h b/chromium/patches/patch-skia_ext_canvas__paint.h
deleted file mode 100644
index c6c70ea5ce..0000000000
--- a/chromium/patches/patch-skia_ext_canvas__paint.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-skia_ext_canvas__paint.h,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- skia/ext/canvas_paint.h.orig 2011-04-13 08:01:18.000000000 +0000
-+++ skia/ext/canvas_paint.h
-@@ -13,7 +13,8 @@
- #include "skia/ext/canvas_paint_win.h"
- #elif defined(__APPLE__)
- #include "skia/ext/canvas_paint_mac.h"
--#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
-+ defined(__NetBSD__) || defined(__OpenBSD__)
- #include "skia/ext/canvas_paint_linux.h"
- #endif
-
diff --git a/chromium/patches/patch-skia_ext_platform__canvas.h b/chromium/patches/patch-skia_ext_platform__canvas.h
deleted file mode 100644
index 6444429779..0000000000
--- a/chromium/patches/patch-skia_ext_platform__canvas.h
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-skia_ext_platform__canvas.h,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- skia/ext/platform_canvas.h.orig 2011-04-13 08:01:18.000000000 +0000
-+++ skia/ext/platform_canvas.h
-@@ -33,8 +33,8 @@ class PlatformCanvas : public SkCanvas {
- PlatformCanvas(int width, int height, bool is_opaque,
- CGContextRef context);
- PlatformCanvas(int width, int height, bool is_opaque, uint8_t* context);
--#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
-- defined(__Solaris__)
-+#elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
-+ defined(__NetBSD__) || defined(__OpenBSD__) || defined(__Solaris__)
- // Linux ---------------------------------------------------------------------
-
- // Construct a canvas from the given memory region. The memory is not cleared
-@@ -55,8 +55,8 @@ class PlatformCanvas : public SkCanvas {
- bool initialize(CGContextRef context, int width, int height, bool is_opaque);
- bool initialize(int width, int height, bool is_opaque, uint8_t* data = NULL);
-
--#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
-- defined(__Solaris__)
-+#elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
-+ defined(__NetBSD__) || defined(__OpenBSD__) || defined(__Solaris__)
- // For two-part init, call if you use the no-argument constructor above
- bool initialize(int width, int height, bool is_opaque, uint8_t* data = NULL);
- #endif
diff --git a/chromium/patches/patch-skia_ext_platform__device.h b/chromium/patches/patch-skia_ext_platform__device.h
deleted file mode 100644
index c3c6fd68c5..0000000000
--- a/chromium/patches/patch-skia_ext_platform__device.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-skia_ext_platform__device.h,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- skia/ext/platform_device.h.orig 2011-04-13 08:01:18.000000000 +0000
-+++ skia/ext/platform_device.h
-@@ -13,8 +13,8 @@
- #include "skia/ext/platform_device_win.h"
- #elif defined(__APPLE__)
- #include "skia/ext/platform_device_mac.h"
--#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__) || \
-- defined(__Solaris__)
-+#elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
-+ defined(__NetBSD__) || defined(__OpenBSD__) || defined(__Solaris__)
- #include "skia/ext/platform_device_linux.h"
- #endif
-
diff --git a/chromium/patches/patch-skia_ext_vector__canvas.h b/chromium/patches/patch-skia_ext_vector__canvas.h
deleted file mode 100644
index bf4dde35b0..0000000000
--- a/chromium/patches/patch-skia_ext_vector__canvas.h
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-skia_ext_vector__canvas.h,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- skia/ext/vector_canvas.h.orig 2011-04-13 08:01:18.000000000 +0000
-+++ skia/ext/vector_canvas.h
-@@ -9,7 +9,8 @@
- #include "skia/ext/platform_canvas.h"
- #include "skia/ext/vector_platform_device.h"
-
--#if defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#if defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
-+ defined(__NetBSD__) || defined(__OpenBSD__)
- typedef struct _cairo cairo_t;
- #endif
-
-@@ -25,7 +26,8 @@ class VectorCanvas : public PlatformCanv
- explicit VectorCanvas(SkDeviceFactory* factory);
- #if defined(WIN32)
- VectorCanvas(HDC dc, int width, int height);
--#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
-+ defined(__NetBSD__) || defined(__OpenBSD__)
- // Caller owns |context|. Ownership is not transferred.
- VectorCanvas(cairo_t* context, int width, int height);
- #endif
-@@ -34,7 +36,8 @@ class VectorCanvas : public PlatformCanv
- // For two-part init, call if you use the no-argument constructor above
- #if defined(WIN32)
- bool initialize(HDC context, int width, int height);
--#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
-+ defined(__NetBSD__) || defined(__OpenBSD__)
- // Ownership of |context| is not transferred.
- bool initialize(cairo_t* context, int width, int height);
- #endif
diff --git a/chromium/patches/patch-skia_ext_vector__platform__device.h b/chromium/patches/patch-skia_ext_vector__platform__device.h
deleted file mode 100644
index 1032a0358e..0000000000
--- a/chromium/patches/patch-skia_ext_vector__platform__device.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-skia_ext_vector__platform__device.h,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- skia/ext/vector_platform_device.h.orig 2011-04-13 08:01:18.000000000 +0000
-+++ skia/ext/vector_platform_device.h
-@@ -10,7 +10,8 @@
- // VectorPlatformDevice header file for your platform.
- #if defined(WIN32)
- #include "skia/ext/vector_platform_device_win.h"
--#elif defined(__linux__) || defined(__FreeBSD__) || defined(__OpenBSD__)
-+#elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
-+ defined(__NetBSD__) || defined(__OpenBSD__)
- #include "skia/ext/vector_platform_device_linux.h"
- #elif defined(__APPLE__)
- #include "skia/ext/bitmap_platform_device_mac.h"
diff --git a/chromium/patches/patch-skia_skia.gyp b/chromium/patches/patch-skia_skia.gyp
deleted file mode 100644
index 68cdc1fc3b..0000000000
--- a/chromium/patches/patch-skia_skia.gyp
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-skia_skia.gyp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- skia/skia.gyp.orig 2011-04-13 08:01:18.000000000 +0000
-+++ skia/skia.gyp
-@@ -668,7 +668,7 @@
- ['exclude', '_mac\\.(cc|cpp|mm?)$'],
- ['exclude', '/mac/'] ],
- }],
-- [ 'OS != "linux" and OS != "freebsd" and OS != "openbsd" and OS != "solaris"', {
-+ [ 'OS != "linux" and OS != "dragonfly" and OS != "freebsd" and OS != "netbsd" and OS != "openbsd" and OS != "solaris"', {
- 'sources/': [ ['exclude', '_(linux|gtk)\\.(cc|cpp)$'] ],
- 'sources!': [
- '../third_party/skia/src/ports/SkFontHost_FreeType.cpp',
-@@ -704,7 +704,7 @@
- 'SK_RESTRICT=',
- ],
- }],
-- [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
-+ [ 'OS == "linux" or OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or OS == "openbsd" or OS == "solaris"', {
- 'dependencies': [
- '../build/linux/system.gyp:gdk',
- '../build/linux/system.gyp:fontconfig',
-@@ -808,7 +808,7 @@
- '../third_party/skia/src/core',
- ],
- 'conditions': [
-- [ '(OS == "linux" or OS == "freebsd" or OS == "openbsd") and target_arch != "arm"', {
-+ [ '(OS == "linux" or OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or OS == "openbsd") and target_arch != "arm"', {
- 'cflags': [
- '-msse2',
- ],
diff --git a/chromium/patches/patch-testing_gtest.gyp b/chromium/patches/patch-testing_gtest.gyp
deleted file mode 100644
index 9114b06964..0000000000
--- a/chromium/patches/patch-testing_gtest.gyp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-testing_gtest.gyp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- testing/gtest.gyp.orig 2011-04-13 08:01:10.000000000 +0000
-+++ testing/gtest.gyp
-@@ -62,7 +62,7 @@
- ],
- },
- }],
-- ['OS == "mac" or OS == "linux" or OS == "freebsd" or OS == "openbsd"', {
-+ ['OS == "mac" or OS == "linux" or OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or OS == "openbsd"', {
- 'defines': [
- # gtest isn't able to figure out when RTTI is disabled for gcc
- # versions older than 4.3.2, and assumes it's enabled. Our Mac
diff --git a/chromium/patches/patch-testing_gtest_include_gtest_internal_gtest-port.h b/chromium/patches/patch-testing_gtest_include_gtest_internal_gtest-port.h
deleted file mode 100644
index a0bfb2ce32..0000000000
--- a/chromium/patches/patch-testing_gtest_include_gtest_internal_gtest-port.h
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-testing_gtest_include_gtest_internal_gtest-port.h,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- testing/gtest/include/gtest/internal/gtest-port.h.orig 2011-05-24 08:20:42.000000000 +0000
-+++ testing/gtest/include/gtest/internal/gtest-port.h
-@@ -223,7 +223,8 @@
- #endif // _WIN32_WCE
- #elif defined __APPLE__
- #define GTEST_OS_MAC 1
--#elif defined __linux__
-+#elif defined(__linux__) || defined(__DragonFly__) || defined(__FreeBSD__) || \
-+ defined(__NetBSD__) || defined(__OpenBSD__)
- #define GTEST_OS_LINUX 1
- #elif defined __MVS__
- #define GTEST_OS_ZOS 1
-@@ -499,7 +500,7 @@
- #ifndef GTEST_HAS_CLONE
- // The user didn't tell us, so we need to figure it out.
-
--#if GTEST_OS_LINUX && !defined(__ia64__)
-+#if GTEST_OS_LINUX && !defined(__ia64__) && !defined(__DragonFly__)
- #define GTEST_HAS_CLONE 1
- #else
- #define GTEST_HAS_CLONE 0
diff --git a/chromium/patches/patch-testing_gtest_src_gtest-death-test.cc b/chromium/patches/patch-testing_gtest_src_gtest-death-test.cc
deleted file mode 100644
index 9830ebfeae..0000000000
--- a/chromium/patches/patch-testing_gtest_src_gtest-death-test.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-testing_gtest_src_gtest-death-test.cc,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- testing/gtest/src/gtest-death-test.cc.orig 2011-04-13 08:14:20.000000000 +0000
-+++ testing/gtest/src/gtest-death-test.cc
-@@ -50,6 +50,7 @@
- #else
- #include <sys/mman.h>
- #include <sys/wait.h>
-+#include <sys/signal.h>
- #endif // GTEST_OS_WINDOWS
-
- #endif // GTEST_HAS_DEATH_TEST
diff --git a/chromium/patches/patch-testing_gtest_src_gtest.cc b/chromium/patches/patch-testing_gtest_src_gtest.cc
deleted file mode 100644
index 5bfb2926e5..0000000000
--- a/chromium/patches/patch-testing_gtest_src_gtest.cc
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-testing_gtest_src_gtest.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- testing/gtest/src/gtest.cc.orig 2011-05-24 08:20:42.000000000 +0000
-+++ testing/gtest/src/gtest.cc
-@@ -59,6 +59,7 @@
- // Declares vsnprintf(). This header is not available on Windows.
- #include <strings.h> // NOLINT
- #include <sys/mman.h> // NOLINT
-+#include <sys/socket.h> // NOLINT
- #include <sys/time.h> // NOLINT
- #include <unistd.h> // NOLINT
- #include <string>
-@@ -1612,7 +1613,7 @@ bool String::CaseInsensitiveWideCStringE
-
- #if GTEST_OS_WINDOWS
- return _wcsicmp(lhs, rhs) == 0;
--#elif GTEST_OS_LINUX
-+#elif GTEST_OS_LINUX && !defined(__DragonFly__)
- return wcscasecmp(lhs, rhs) == 0;
- #else
- // Mac OS X and Cygwin don't define wcscasecmp. Other unknown OSes
diff --git a/chromium/patches/patch-third__party_WebKit_Source_JavaScriptCore_JavaScriptCore.gyp_JavaScriptCore.gyp b/chromium/patches/patch-third__party_WebKit_Source_JavaScriptCore_JavaScriptCore.gyp_JavaScriptCore.gyp
deleted file mode 100644
index 271cd6b391..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_JavaScriptCore_JavaScriptCore.gyp_JavaScriptCore.gyp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_JavaScriptCore_JavaScriptCore.gyp_JavaScriptCore.gyp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/WebKit/Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp.orig 2011-04-13 08:12:05.000000000 +0000
-+++ third_party/WebKit/Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp
-@@ -83,7 +83,7 @@
- 'WTF_USE_NEW_THEME=1',
- ],
- }],
-- ['OS=="linux" or OS=="freebsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'defines': [
- 'WTF_USE_PTHREADS=1',
- ],
diff --git a/chromium/patches/patch-third__party_WebKit_Source_JavaScriptCore_config.h b/chromium/patches/patch-third__party_WebKit_Source_JavaScriptCore_config.h
deleted file mode 100644
index a037f9b1d9..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_JavaScriptCore_config.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_JavaScriptCore_config.h,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- third_party/WebKit/Source/JavaScriptCore/config.h.orig 2011-05-24 08:03:02.000000000 +0000
-+++ third_party/WebKit/Source/JavaScriptCore/config.h
-@@ -61,7 +61,7 @@
- #define WTF_USE_OS_RANDOMNESS 1
- #endif
-
--#if OS(FREEBSD) || OS(OPENBSD)
-+#if OS(BSD)
- #define HAVE_PTHREAD_NP_H 1
- #endif
-
diff --git a/chromium/patches/patch-third__party_WebKit_Source_JavaScriptCore_jit_JITStubs.cpp b/chromium/patches/patch-third__party_WebKit_Source_JavaScriptCore_jit_JITStubs.cpp
deleted file mode 100644
index a7a1d63aa0..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_JavaScriptCore_jit_JITStubs.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_JavaScriptCore_jit_JITStubs.cpp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/WebKit/Source/JavaScriptCore/jit/JITStubs.cpp.orig 2011-04-13 08:12:06.000000000 +0000
-+++ third_party/WebKit/Source/JavaScriptCore/jit/JITStubs.cpp
-@@ -96,6 +96,7 @@ namespace JSC {
- // IBM's own file format
- #define HIDE_SYMBOL(name) ".lglobl " #name
- #elif OS(LINUX) \
-+ || OS(DRAGONFLY) \
- || OS(FREEBSD) \
- || OS(OPENBSD) \
- || OS(SOLARIS) \
diff --git a/chromium/patches/patch-third__party_WebKit_Source_JavaScriptCore_wtf_Platform.h b/chromium/patches/patch-third__party_WebKit_Source_JavaScriptCore_wtf_Platform.h
deleted file mode 100644
index 0d18c1309c..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_JavaScriptCore_wtf_Platform.h
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_JavaScriptCore_wtf_Platform.h,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- third_party/WebKit/Source/JavaScriptCore/wtf/Platform.h.orig 2011-05-24 08:02:57.000000000 +0000
-+++ third_party/WebKit/Source/JavaScriptCore/wtf/Platform.h
-@@ -400,6 +400,11 @@
- #define WTF_OS_MAC_OS_X 1
- #endif
-
-+/* OS(DRAGONFLY) - DragonFly */
-+#ifdef __DragonFly__
-+#define WTF_OS_DRAGONFLY 1
-+#endif
-+
- /* OS(FREEBSD) - FreeBSD */
- #if defined(__FreeBSD__) || defined(__DragonFly__)
- #define WTF_OS_FREEBSD 1
-@@ -454,6 +459,7 @@
- #if OS(AIX) \
- || OS(ANDROID) \
- || OS(DARWIN) \
-+ || OS(DRAGONFLY) \
- || OS(FREEBSD) \
- || OS(HAIKU) \
- || OS(LINUX) \
-@@ -468,6 +474,14 @@
- #define WTF_OS_UNIX 1
- #endif
-
-+/* OS(BSD) - Any BSD system */
-+#if OS(DRAGONFLY) \
-+ || OS(FREEBSD) \
-+ || OS(NETBSD) \
-+ || OS(OPENBSD)
-+#define WTF_OS_BSD 1
-+#endif
-+
- /* Operating environments */
-
- /* FIXME: these are all mixes of OS, operating environment and policy choices. */
diff --git a/chromium/patches/patch-third__party_WebKit_Source_WebCore_WebCore.gyp_WebCore.gyp b/chromium/patches/patch-third__party_WebKit_Source_WebCore_WebCore.gyp_WebCore.gyp
deleted file mode 100644
index 800b54dcf7..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_WebCore_WebCore.gyp_WebCore.gyp
+++ /dev/null
@@ -1,61 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_WebCore_WebCore.gyp_WebCore.gyp,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp.orig 2011-05-24 08:03:25.000000000 +0000
-+++ third_party/WebKit/Source/WebCore/WebCore.gyp/WebCore.gyp
-@@ -992,7 +992,7 @@
- '<(chromium_src_dir)/gpu/gpu.gyp:gles2_c_lib',
- ],
- }],
-- ['OS=="linux" or OS=="freebsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
- '<(chromium_src_dir)/build/linux/system.gyp:gtk',
-@@ -1197,7 +1197,7 @@
- ['include', 'thirdparty/glu/libtess/'],
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'sources/': [
- # Cherry-pick files excluded by the broader regular expressions above.
- ['include', 'platform/chromium/KeyCodeConversionGtk\\.cpp$'],
-@@ -1310,7 +1310,7 @@
- ['exclude', 'platform/chromium/DragImageChromiumSkia\\.cpp$'],
- ],
- }],
-- ['OS!="linux" and OS!="freebsd"', {
-+ ['OS!="linux" and OS!="dragonfly" and OS!="freebsd" and OS!="netbsd" and OS!="openbsd"', {
- 'sources/': [
- ['exclude', '(Gtk|Linux)\\.cpp$'],
- ['exclude', 'Harfbuzz[^/]+\\.(cpp|h)$'],
-@@ -1385,12 +1385,12 @@
- ['exclude', 'rendering/RenderThemeChromiumSkia\\.cpp$'],
- ],
- }],
-- ['(OS=="linux" or OS=="freebsd" or OS=="openbsd") and gcc_version==42', {
-+ ['(OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd") and gcc_version==42', {
- # Due to a bug in gcc 4.2.1 (the current version on hardy), we get
- # warnings about uninitialized this.
- 'cflags': ['-Wno-uninitialized'],
- }],
-- ['OS!="linux" and OS!="freebsd"', {
-+ ['OS!="linux" and OS!="dragonfly" and OS!="freebsd" and OS!="netbsd" and OS!="openbsd"', {
- 'sources/': [
- ['exclude', '(Gtk|Linux)\\.cpp$'],
- ],
-@@ -1529,12 +1529,12 @@
- ['include', '/TransparencyWin\\.cpp$'],
- ],
- }],
-- ['(OS=="linux" or OS=="freebsd" or OS=="openbsd") and gcc_version==42', {
-+ ['(OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd") and gcc_version==42', {
- # Due to a bug in gcc 4.2.1 (the current version on hardy), we get
- # warnings about uninitialized this.
- 'cflags': ['-Wno-uninitialized'],
- }],
-- ['OS!="linux" and OS!="freebsd"', {
-+ ['OS!="linux" and OS!="dragonfly" and OS!="freebsd" and OS!="netbsd" and OS!="openbsd"', {
- 'sources/': [
- ['exclude', '(Gtk|Linux)\\.cpp$'],
- ],
diff --git a/chromium/patches/patch-third__party_WebKit_Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp b/chromium/patches/patch-third__party_WebKit_Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp
deleted file mode 100644
index 8a659c0bfc..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_WebCore_bindings_js_JSInspectorFrontendHostCustom.cpp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/WebKit/Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp.orig 2011-04-13 08:12:33.000000000 +0000
-+++ third_party/WebKit/Source/WebCore/bindings/js/JSInspectorFrontendHostCustom.cpp
-@@ -58,8 +58,14 @@ JSValue JSInspectorFrontendHost::platfor
- DEFINE_STATIC_LOCAL(const String, platform, ("windows"));
- #elif OS(LINUX)
- DEFINE_STATIC_LOCAL(const String, platform, ("linux"));
-+#elif OS(DRAGONFLY)
-+ DEFINE_STATIC_LOCAL(const String, platform, ("dragonfly"));
- #elif OS(FREEBSD)
- DEFINE_STATIC_LOCAL(const String, platform, ("freebsd"));
-+#elif OS(NETBSD)
-+ DEFINE_STATIC_LOCAL(const String, platform, ("netbsd"));
-+#elif OS(OPENBSD)
-+ DEFINE_STATIC_LOCAL(const String, platform, ("openbsd"));
- #else
- DEFINE_STATIC_LOCAL(const String, platform, ("unknown"));
- #endif
diff --git a/chromium/patches/patch-third__party_WebKit_Source_WebCore_bindings_v8_V8Proxy.cpp b/chromium/patches/patch-third__party_WebKit_Source_WebCore_bindings_v8_V8Proxy.cpp
deleted file mode 100644
index 0cde590316..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_WebCore_bindings_v8_V8Proxy.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_WebCore_bindings_v8_V8Proxy.cpp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/WebKit/Source/WebCore/bindings/v8/V8Proxy.cpp.orig 2011-04-13 08:12:33.000000000 +0000
-+++ third_party/WebKit/Source/WebCore/bindings/v8/V8Proxy.cpp
-@@ -812,7 +812,34 @@ int V8Proxy::contextDebugId(v8::Handle<v
- if (!context->GetData()->IsString())
- return -1;
- v8::String::AsciiValue ascii(context->GetData());
-+#if defined(OS_NETBSD)
-+ const char *s = *ascii;
-+ const char *find = ",";
-+ size_t flen, len = ascii.length();
-+ char c, sc;
-+ char *comma = (char *)s;
-+
-+ if ((c = *find++) != '\0') {
-+ flen = strlen(find);
-+ do {
-+ do {
-+ if (len-- < 1 || (sc = *s++) == '\0') {
-+ comma = NULL;
-+ break;
-+ }
-+ } while (sc != c);
-+ if (flen > len) {
-+ comma = NULL;
-+ break;
-+ }
-+ } while (strncmp(s, find, flen) != 0);
-+ s--;
-+ }
-+ if (comma != NULL)
-+ comma = (char *)s;
-+#else
- char* comma = strnstr(*ascii, ",", ascii.length());
-+#endif
- if (!comma)
- return -1;
- return atoi(comma + 1);
diff --git a/chromium/patches/patch-third__party_WebKit_Source_WebCore_bindings_v8_custom_V8InspectorFrontendHostCustom.cpp b/chromium/patches/patch-third__party_WebKit_Source_WebCore_bindings_v8_custom_V8InspectorFrontendHostCustom.cpp
deleted file mode 100644
index 9c84c90894..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_WebCore_bindings_v8_custom_V8InspectorFrontendHostCustom.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_WebCore_bindings_v8_custom_V8InspectorFrontendHostCustom.cpp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/WebKit/Source/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp.orig 2011-04-13 08:12:33.000000000 +0000
-+++ third_party/WebKit/Source/WebCore/bindings/v8/custom/V8InspectorFrontendHostCustom.cpp
-@@ -47,8 +47,14 @@ v8::Handle<v8::Value> V8InspectorFronten
- return v8String("mac");
- #elif defined(OS_LINUX)
- return v8String("linux");
-+#elif defined(OS_DRAGONFLY)
-+ return v8String("dragonfly");
- #elif defined(OS_FREEBSD)
- return v8String("freebsd");
-+#elif defined(OS_NETBSD)
-+ return v8String("netbsd");
-+#elif defined(OS_OPENBSD)
-+ return v8String("openbsd");
- #elif defined(OS_WIN)
- return v8String("windows");
- #else
diff --git a/chromium/patches/patch-third__party_WebKit_Source_WebCore_dom_SelectElement.cpp b/chromium/patches/patch-third__party_WebKit_Source_WebCore_dom_SelectElement.cpp
deleted file mode 100644
index e808ba1738..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_WebCore_dom_SelectElement.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_WebCore_dom_SelectElement.cpp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/WebKit/Source/WebCore/dom/SelectElement.cpp.orig 2011-04-13 08:12:19.000000000 +0000
-+++ third_party/WebKit/Source/WebCore/dom/SelectElement.cpp
-@@ -54,7 +54,7 @@
- #if PLATFORM(MAC) || (PLATFORM(CHROMIUM) && OS(DARWIN))
- #define ARROW_KEYS_POP_MENU 1
- #define SPACE_OR_RETURN_POP_MENU 0
--#elif PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (OS(LINUX) || OS(FREEBSD)))
-+#elif PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (OS(LINUX) || OS(BSD)))
- #define ARROW_KEYS_POP_MENU 0
- #define SPACE_OR_RETURN_POP_MENU 1
- #else
diff --git a/chromium/patches/patch-third__party_WebKit_Source_WebCore_loader_cache_CachedFont.cpp b/chromium/patches/patch-third__party_WebKit_Source_WebCore_loader_cache_CachedFont.cpp
deleted file mode 100644
index 922d37e511..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_WebCore_loader_cache_CachedFont.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_WebCore_loader_cache_CachedFont.cpp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/WebKit/Source/WebCore/loader/cache/CachedFont.cpp.orig 2011-04-13 08:12:44.000000000 +0000
-+++ third_party/WebKit/Source/WebCore/loader/cache/CachedFont.cpp
-@@ -27,7 +27,7 @@
- #include "config.h"
- #include "CachedFont.h"
-
--#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (OS(WINDOWS) || OS(LINUX) || OS(FREEBSD))) || PLATFORM(HAIKU) || OS(WINCE) || PLATFORM(ANDROID) || PLATFORM(BREWMP)
-+#if PLATFORM(CG) || PLATFORM(QT) || PLATFORM(GTK) || (PLATFORM(CHROMIUM) && (OS(WINDOWS) || OS(LINUX) || OS(BSD))) || PLATFORM(HAIKU) || OS(WINCE) || PLATFORM(ANDROID) || PLATFORM(BREWMP)
- #define STORE_FONT_CUSTOM_PLATFORM_DATA
- #endif
-
diff --git a/chromium/patches/patch-third__party_WebKit_Source_WebCore_page_EventHandler.cpp b/chromium/patches/patch-third__party_WebKit_Source_WebCore_page_EventHandler.cpp
deleted file mode 100644
index 44ecb21446..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_WebCore_page_EventHandler.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_WebCore_page_EventHandler.cpp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/WebKit/Source/WebCore/page/EventHandler.cpp.orig 2011-04-13 08:12:22.000000000 +0000
-+++ third_party/WebKit/Source/WebCore/page/EventHandler.cpp
-@@ -1936,7 +1936,7 @@ bool EventHandler::dispatchMouseEvent(co
- return swallowEvent;
- }
-
--#if !PLATFORM(GTK) && !(PLATFORM(CHROMIUM) && (OS(LINUX) || OS(FREEBSD)))
-+#if !PLATFORM(GTK) && !(PLATFORM(CHROMIUM) && (OS(LINUX) || OS(BSD)))
- bool EventHandler::shouldTurnVerticalTicksIntoHorizontal(const HitTestResult&) const
- {
- return false;
diff --git a/chromium/patches/patch-third__party_WebKit_Source_WebCore_page_chromium_EventHandlerChromium.cpp b/chromium/patches/patch-third__party_WebKit_Source_WebCore_page_chromium_EventHandlerChromium.cpp
deleted file mode 100644
index 724246f2be..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_WebCore_page_chromium_EventHandlerChromium.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_WebCore_page_chromium_EventHandlerChromium.cpp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/WebKit/Source/WebCore/page/chromium/EventHandlerChromium.cpp.orig 2011-04-13 08:12:22.000000000 +0000
-+++ third_party/WebKit/Source/WebCore/page/chromium/EventHandlerChromium.cpp
-@@ -154,7 +154,7 @@ unsigned EventHandler::accessKeyModifier
- #endif
- }
-
--#if OS(LINUX) || OS(FREEBSD)
-+#if OS(LINUX) || OS(BSD)
- // GTK+ must scroll horizontally if the mouse pointer is on top of the
- // horizontal scrollbar while scrolling with the wheel.
- // This code comes from gtk/EventHandlerGtk.cpp.
diff --git a/chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_Scrollbar.cpp b/chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_Scrollbar.cpp
deleted file mode 100644
index 99dde9fe7e..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_Scrollbar.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_WebCore_platform_Scrollbar.cpp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/WebKit/Source/WebCore/platform/Scrollbar.cpp.orig 2011-04-13 08:12:31.000000000 +0000
-+++ third_party/WebKit/Source/WebCore/platform/Scrollbar.cpp
-@@ -40,7 +40,7 @@
-
- using namespace std;
-
--#if (PLATFORM(CHROMIUM) && (OS(LINUX) || OS(FREEBSD))) || PLATFORM(GTK)
-+#if (PLATFORM(CHROMIUM) && (OS(LINUX) || OS(BSD))) || PLATFORM(GTK)
- // The position of the scrollbar thumb affects the appearance of the steppers, so
- // when the thumb moves, we have to invalidate them for painting.
- #define THUMB_POSITION_AFFECTS_BUTTONS
diff --git a/chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_chromium_PlatformBridge.h b/chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_chromium_PlatformBridge.h
deleted file mode 100644
index f3295e864f..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_chromium_PlatformBridge.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_WebCore_platform_chromium_PlatformBridge.h,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- third_party/WebKit/Source/WebCore/platform/chromium/PlatformBridge.h.orig 2011-05-24 08:03:23.000000000 +0000
-+++ third_party/WebKit/Source/WebCore/platform/chromium/PlatformBridge.h
-@@ -148,7 +148,7 @@ public:
- #if OS(WINDOWS)
- static bool ensureFontLoaded(HFONT);
- #endif
--#if OS(LINUX) || OS(FREEBSD)
-+#if OS(LINUX) || OS(BSD)
- static void getRenderStyleForStrike(const char* family, int sizeAndStyle, FontRenderStyle* result);
- static String getFontFamilyForCharacters(const UChar*, size_t numCharacters, const char* preferredLocale);
- #endif
-@@ -265,7 +265,7 @@ public:
- GraphicsContext*, int part, int state, int classicState, const IntRect&);
- static void paintProgressBar(
- GraphicsContext*, const IntRect& barRect, const IntRect& valueRect, bool determinate, double animatedSeconds);
--#elif OS(LINUX)
-+#elif OS(LINUX) || OS(BSD)
- // The UI part which is being accessed.
- enum ThemePart {
- // ScrollbarTheme parts
diff --git a/chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_graphics_chromium_FontPlatformData.h b/chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_graphics_chromium_FontPlatformData.h
deleted file mode 100644
index d4f685b192..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_graphics_chromium_FontPlatformData.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_WebCore_platform_graphics_chromium_FontPlatformData.h,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/WebKit/Source/WebCore/platform/graphics/chromium/FontPlatformData.h.orig 2011-04-13 08:12:25.000000000 +0000
-+++ third_party/WebKit/Source/WebCore/platform/graphics/chromium/FontPlatformData.h
-@@ -33,7 +33,7 @@
-
- #if OS(WINDOWS)
- #include "FontPlatformDataChromiumWin.h"
--#elif OS(LINUX) || OS(FREEBSD)
-+#elif OS(LINUX) || OS(BSD)
- #include "FontPlatformDataLinux.h"
- #endif
-
diff --git a/chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_graphics_skia_FontCustomPlatformData.h b/chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_graphics_skia_FontCustomPlatformData.h
deleted file mode 100644
index c402695008..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_graphics_skia_FontCustomPlatformData.h
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_WebCore_platform_graphics_skia_FontCustomPlatformData.h,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/WebKit/Source/WebCore/platform/graphics/skia/FontCustomPlatformData.h.orig 2011-04-13 08:12:26.000000000 +0000
-+++ third_party/WebKit/Source/WebCore/platform/graphics/skia/FontCustomPlatformData.h
-@@ -40,7 +40,7 @@
- #if OS(WINDOWS)
- #include "PlatformString.h"
- #include <windows.h>
--#elif OS(LINUX) || OS(FREEBSD) || PLATFORM(BREWMP)
-+#elif OS(LINUX) || OS(BSD) || PLATFORM(BREWMP)
- #include "SkTypeface.h"
- #endif
-
-@@ -57,7 +57,7 @@ public:
- : m_fontReference(fontReference)
- , m_name(name)
- {}
--#elif OS(LINUX) || OS(FREEBSD) || PLATFORM(BREWMP)
-+#elif OS(LINUX) || OS(BSD) || PLATFORM(BREWMP)
- explicit FontCustomPlatformData(SkTypeface* typeface)
- : m_fontReference(typeface)
- {}
-@@ -73,7 +73,7 @@ public:
- #if OS(WINDOWS)
- HANDLE m_fontReference;
- String m_name;
--#elif OS(LINUX) || OS(FREEBSD) || PLATFORM(BREWMP)
-+#elif OS(LINUX) || OS(BSD) || PLATFORM(BREWMP)
- SkTypeface* m_fontReference;
- #endif
- };
diff --git a/chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_image-decoders_png_PNGImageDecoder.cpp b/chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_image-decoders_png_PNGImageDecoder.cpp
deleted file mode 100644
index 83f7c62404..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_image-decoders_png_PNGImageDecoder.cpp
+++ /dev/null
@@ -1,91 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_WebCore_platform_image-decoders_png_PNGImageDecoder.cpp,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- third_party/WebKit/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp.orig 2011-05-24 08:03:25.000000000 +0000
-+++ third_party/WebKit/Source/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp
-@@ -136,14 +136,31 @@ public:
-
- const char* segment;
- while (unsigned segmentLength = data.getSomeData(segment, m_readOffset)) {
-- m_readOffset += segmentLength;
-- m_currentBufferSize = m_readOffset;
-- png_process_data(m_png, m_info, reinterpret_cast<png_bytep>(const_cast<char*>(segment)), segmentLength);
-- // We explicitly specify the superclass isSizeAvailable() because we
-- // merely want to check if we've managed to set the size, not
-- // (recursively) trigger additional decoding if we haven't.
-- if (sizeOnly ? decoder->ImageDecoder::isSizeAvailable() : decoder->isComplete())
-- return true;
-+ if (sizeOnly) {
-+ while (segmentLength > 0) {
-+ // Unfortunately if we read the image at this point it will be ignored,
-+ // therefore take small steps through the data until the head is read.
-+ // This is crude but effective.
-+ m_currentBufferSize = ++m_readOffset;
-+ png_process_data(m_png, m_info, reinterpret_cast<png_bytep>(const_cast<char*>(segment)), 1);
-+
-+ // We explicitly specify the superclass isSizeAvailable() because we
-+ // merely want to check if we've managed to set the size, not
-+ // (recursively) trigger additional decoding if we haven't.
-+ if (decoder->ImageDecoder::isSizeAvailable())
-+ return true;
-+
-+ --segmentLength;
-+ ++segment;
-+ }
-+ } else {
-+ // Just process the whole segment at once:
-+ m_readOffset += segmentLength;
-+ m_currentBufferSize = m_readOffset;
-+ png_process_data(m_png, m_info, reinterpret_cast<png_bytep>(const_cast<char*>(segment)), segmentLength);
-+ if (decoder->isComplete())
-+ return true;
-+ }
- }
- return false;
- }
-@@ -226,7 +243,7 @@ static ColorProfile readColorProfile(png
- #ifdef PNG_iCCP_SUPPORTED
- char* profileName;
- int compressionType;
-- char* profile;
-+ png_byte* profile;
- png_uint_32 profileLength;
- if (png_get_iCCP(png, info, &profileName, &compressionType, &profile, &profileLength)) {
- ColorProfile colorProfile;
-@@ -241,11 +258,11 @@ void PNGImageDecoder::headerAvailable()
- {
- png_structp png = m_reader->pngPtr();
- png_infop info = m_reader->infoPtr();
-- png_uint_32 width = png->width;
-- png_uint_32 height = png->height;
-+ png_uint_32 width = png_get_image_width(png, info);
-+ png_uint_32 height = png_get_image_height(png, info);
-
- // Protect against large images.
-- if (png->width > cMaxPNGSize || png->height > cMaxPNGSize) {
-+ if (width > cMaxPNGSize || height > cMaxPNGSize) {
- longjmp(JMPBUF(png), 1);
- return;
- }
-@@ -316,12 +333,6 @@ void PNGImageDecoder::headerAvailable()
- ASSERT(channels == 3 || channels == 4);
-
- m_reader->setHasAlpha(channels == 4);
--
-- if (m_reader->decodingSizeOnly()) {
-- // If we only needed the size, halt the reader.
-- m_reader->setReadOffset(m_reader->currentBufferSize() - png->buffer_size);
-- png->buffer_size = 0;
-- }
- }
-
- void PNGImageDecoder::rowAvailable(unsigned char* rowBuffer, unsigned rowIndex, int interlacePass)
-@@ -343,7 +354,8 @@ void PNGImageDecoder::rowAvailable(unsig
- // For PNGs, the frame always fills the entire image.
- buffer.setOriginalFrameRect(IntRect(IntPoint(), size()));
-
-- if (m_reader->pngPtr()->interlaced)
-+ if (png_get_interlace_type(m_reader->pngPtr(), m_reader->infoPtr())
-+ != PNG_INTERLACE_NONE)
- m_reader->createInterlaceBuffer((m_reader->hasAlpha() ? 4 : 3) * size().width() * size().height());
- }
-
diff --git a/chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_image-encoders_skia_PNGImageEncoder.cpp b/chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_image-encoders_skia_PNGImageEncoder.cpp
deleted file mode 100644
index 7ee4fa23b5..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_WebCore_platform_image-encoders_skia_PNGImageEncoder.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_WebCore_platform_image-encoders_skia_PNGImageEncoder.cpp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/WebKit/Source/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp.orig 2011-04-13 08:12:30.000000000 +0000
-+++ third_party/WebKit/Source/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp
-@@ -43,7 +43,7 @@ namespace WebCore {
-
- static void writeOutput(png_structp png, png_bytep data, png_size_t size)
- {
-- static_cast<Vector<unsigned char>*>(png->io_ptr)->append(data, size);
-+ static_cast<Vector<unsigned char>*>(png_get_io_ptr(png))->append(data, size);
- }
-
- static void preMultipliedBGRAtoRGBA(const SkPMColor* input, int pixels, unsigned char* output)
diff --git a/chromium/patches/patch-third__party_WebKit_Source_WebCore_storage_IDBDatabaseBackendImpl.cpp b/chromium/patches/patch-third__party_WebKit_Source_WebCore_storage_IDBDatabaseBackendImpl.cpp
deleted file mode 100644
index 03f1b148b5..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_WebCore_storage_IDBDatabaseBackendImpl.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_WebCore_storage_IDBDatabaseBackendImpl.cpp,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- third_party/WebKit/Source/WebCore/storage/IDBDatabaseBackendImpl.cpp.orig 2011-05-24 08:03:11.000000000 +0000
-+++ third_party/WebKit/Source/WebCore/storage/IDBDatabaseBackendImpl.cpp
-@@ -72,9 +72,9 @@ IDBDatabaseBackendImpl::IDBDatabaseBacke
- {
- ASSERT(!m_name.isNull());
-
-- bool success = m_backingStore->extractIDBDatabaseMetaData(m_name, m_version, m_id);
-+ bool success = m_backingStore->extractIDBDatabaseMetaData(m_name, m_version, (int64_t &)m_id);
- ASSERT_UNUSED(success, success == (m_id != InvalidId));
-- if (!m_backingStore->setIDBDatabaseMetaData(m_name, m_version, m_id, m_id == InvalidId))
-+ if (!m_backingStore->setIDBDatabaseMetaData(m_name, m_version, (int64_t &)m_id, m_id == InvalidId))
- ASSERT_NOT_REACHED(); // FIXME: Need better error handling.
- loadObjectStores();
- }
diff --git a/chromium/patches/patch-third__party_WebKit_Source_WebCore_websockets_WebSocketHandshake.cpp b/chromium/patches/patch-third__party_WebKit_Source_WebCore_websockets_WebSocketHandshake.cpp
deleted file mode 100644
index bac9f1059b..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_WebCore_websockets_WebSocketHandshake.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_WebCore_websockets_WebSocketHandshake.cpp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/WebKit/Source/WebCore/websockets/WebSocketHandshake.cpp.orig 2011-04-13 08:12:39.000000000 +0000
-+++ third_party/WebKit/Source/WebCore/websockets/WebSocketHandshake.cpp
-@@ -325,7 +325,33 @@ int WebSocketHandshake::readServerHandsh
- return len;
- }
- m_mode = Normal;
-+#if defined(OS_NETBSD)
-+ const char *s = header;
-+ const char *find = "\r\n\r\n";
-+ size_t flen;
-+ char c, sc;
-+ char *comma = (char *)s;
-+
-+ if ((c = *find++) != '\0') {
-+ flen = strlen(find);
-+ do {
-+ do {
-+ if (len-- < 1 || (sc = *s++) == '\0') {
-+ comma = NULL;
-+ break;
-+ }
-+ } while (sc != c);
-+ if (flen > len) {
-+ comma = NULL;
-+ break;
-+ }
-+ } while (strncmp(s, find, flen) != 0);
-+ s--;
-+ }
-+ if (comma == NULL) {
-+#else
- if (!strnstr(header, "\r\n\r\n", len)) {
-+#endif
- // Just hasn't been received fully yet.
- m_mode = Incomplete;
- return -1;
diff --git a/chromium/patches/patch-third__party_WebKit_Source_WebKit_chromium_WebKit.gyp b/chromium/patches/patch-third__party_WebKit_Source_WebKit_chromium_WebKit.gyp
deleted file mode 100644
index 0448af6ab6..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_WebKit_chromium_WebKit.gyp
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_WebKit_chromium_WebKit.gyp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/WebKit/Source/WebKit/chromium/WebKit.gyp.orig 2011-04-13 08:12:10.000000000 +0000
-+++ third_party/WebKit/Source/WebKit/chromium/WebKit.gyp
-@@ -618,7 +618,7 @@
- }, {
- 'type': '<(webkit_target_type)'
- }],
-- ['OS=="linux" or OS=="freebsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
- '<(chromium_src_dir)/build/linux/system.gyp:gtk',
-@@ -824,7 +824,7 @@
- 'tests/DragImageTest.cpp',
- ],
- }],
-- ['OS=="linux" or OS=="freebsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'sources': [
- 'tests/WebInputEventFactoryTestGtk.cpp',
- ],
-@@ -994,7 +994,7 @@
- ['exclude', 'Mac\\.cpp$'],
- ],
- }],
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'dependencies': [
- '<(chromium_src_dir)/build/linux/system.gyp:fontconfig',
- '<(chromium_src_dir)/build/linux/system.gyp:gtk',
-@@ -1055,7 +1055,7 @@
- 'INFOPLIST_FILE': '../../../Tools/DumpRenderTree/TestNetscapePlugIn/mac/Info.plist',
- },
- }],
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'cflags': [
- '-fvisibility=default',
- ],
-@@ -1095,7 +1095,7 @@
- 'files': ['<(PRODUCT_DIR)/TestNetscapePlugIn.plugin/'],
- }],
- }],
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'copies': [{
- 'destination': '<(PRODUCT_DIR)/plugins',
- 'files': ['<(PRODUCT_DIR)/libTestNetscapePlugIn.so'],
diff --git a/chromium/patches/patch-third__party_WebKit_Source_WebKit_chromium_src_PlatformBridge.cpp b/chromium/patches/patch-third__party_WebKit_Source_WebKit_chromium_src_PlatformBridge.cpp
deleted file mode 100644
index 84440e5438..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_WebKit_chromium_src_PlatformBridge.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_WebKit_chromium_src_PlatformBridge.cpp,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- third_party/WebKit/Source/WebKit/chromium/src/PlatformBridge.cpp.orig 2011-05-24 08:03:03.000000000 +0000
-+++ third_party/WebKit/Source/WebKit/chromium/src/PlatformBridge.cpp
-@@ -70,7 +70,7 @@
- #include "win/WebThemeEngine.h"
- #endif
-
--#if OS(LINUX) || OS(FREEBSD)
-+#if OS(LINUX) || OS(BSD)
- #include "linux/WebThemeEngine.h"
- #include "WebFontInfo.h"
- #include "WebFontRenderStyle.h"
-@@ -432,7 +432,7 @@ bool PlatformBridge::ensureFontLoaded(HF
- }
- #endif
-
--#if OS(LINUX) || OS(FREEBSD)
-+#if OS(LINUX) || OS(BSD)
- String PlatformBridge::getFontFamilyForCharacters(const UChar* characters, size_t numCharacters, const char* preferredLocale)
- {
- if (webKitClient()->sandboxSupport())
-@@ -773,7 +773,7 @@ void PlatformBridge::paintProgressBar(
- gc->platformContext()->canvas(), barRect, valueRect, determinate, animatedSeconds);
- }
-
--#elif OS(LINUX)
-+#elif OS(LINUX) || OS(BSD)
-
- static WebThemeEngine::Part WebThemePart(PlatformBridge::ThemePart part)
- {
diff --git a/chromium/patches/patch-third__party_WebKit_Source_WebKit_chromium_src_WebFrameImpl.cpp b/chromium/patches/patch-third__party_WebKit_Source_WebKit_chromium_src_WebFrameImpl.cpp
deleted file mode 100644
index 5234d1a918..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_WebKit_chromium_src_WebFrameImpl.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_WebKit_chromium_src_WebFrameImpl.cpp,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- third_party/WebKit/Source/WebKit/chromium/src/WebFrameImpl.cpp.orig 2011-05-24 08:03:03.000000000 +0000
-+++ third_party/WebKit/Source/WebKit/chromium/src/WebFrameImpl.cpp
-@@ -154,7 +154,7 @@
- #include <algorithm>
- #include <wtf/CurrentTime.h>
-
--#if OS(LINUX) || OS(FREEBSD)
-+#if OS(LINUX) || OS(BSD)
- #include <gdk/gdk.h>
- #endif
-
-@@ -324,7 +324,7 @@ public:
- float scale = m_printedPageWidth / pageRect.width();
-
- ctx.save();
--#if OS(LINUX) || OS(FREEBSD)
-+#if OS(LINUX) || OS(BSD)
- ctx.scale(WebCore::FloatSize(scale, scale));
- #endif
- ctx.translate(static_cast<float>(-pageRect.x()),
diff --git a/chromium/patches/patch-third__party_WebKit_Source_WebKit_chromium_src_WebViewImpl.cpp b/chromium/patches/patch-third__party_WebKit_Source_WebKit_chromium_src_WebViewImpl.cpp
deleted file mode 100644
index 3d40588f35..0000000000
--- a/chromium/patches/patch-third__party_WebKit_Source_WebKit_chromium_src_WebViewImpl.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-$NetBSD: patch-third__party_WebKit_Source_WebKit_chromium_src_WebViewImpl.cpp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/WebKit/Source/WebKit/chromium/src/WebViewImpl.cpp.orig 2011-04-13 08:12:09.000000000 +0000
-+++ third_party/WebKit/Source/WebKit/chromium/src/WebViewImpl.cpp
-@@ -130,7 +130,7 @@
- #if OS(WINDOWS)
- #include "RenderThemeChromiumWin.h"
- #else
--#if OS(LINUX) || OS(FREEBSD)
-+#if OS(LINUX) || OS(BSD)
- #include "RenderThemeChromiumLinux.h"
- #endif
- #include "RenderTheme.h"
-@@ -468,7 +468,7 @@ void WebViewImpl::mouseDown(const WebMou
- || (event.button == WebMouseEvent::ButtonLeft
- && event.modifiers & WebMouseEvent::ControlKey))
- mouseContextMenu(event);
--#elif OS(LINUX) || OS(FREEBSD)
-+#elif OS(LINUX) || OS(BSD)
- if (event.button == WebMouseEvent::ButtonRight)
- mouseContextMenu(event);
- #endif
-@@ -507,7 +507,7 @@ void WebViewImpl::mouseUp(const WebMouse
- if (!mainFrameImpl() || !mainFrameImpl()->frameView())
- return;
-
--#if OS(LINUX) || OS(FREEBSD)
-+#if OS(LINUX) || OS(BSD)
- // If the event was a middle click, attempt to copy text into the focused
- // frame. We execute this before we let the page have a go at the event
- // because the page may change what is focused during in its event handler.
-@@ -591,11 +591,11 @@ bool WebViewImpl::keyEvent(const WebKeyb
- if (!handler)
- return keyEventDefault(event);
-
--#if OS(WINDOWS) || OS(LINUX) || OS(FREEBSD)
-+#if OS(WINDOWS) || OS(LINUX) || OS(BSD)
- const WebInputEvent::Type contextMenuTriggeringEventType =
- #if OS(WINDOWS)
- WebInputEvent::KeyUp;
--#elif OS(LINUX) || OS(FREEBSD)
-+#elif OS(LINUX) || OS(BSD)
- WebInputEvent::RawKeyDown;
- #endif
-
-@@ -605,7 +605,7 @@ bool WebViewImpl::keyEvent(const WebKeyb
- sendContextMenuEvent(event);
- return true;
- }
--#endif // OS(WINDOWS) || OS(LINUX) || OS(FREEBSD)
-+#endif // OS(WINDOWS) || OS(LINUX) || OS(BSD)
-
- // It's not clear if we should continue after detecting a capslock keypress.
- // I'll err on the side of continuing, which is the pre-existing behaviour.
-@@ -739,7 +739,7 @@ bool WebViewImpl::touchEvent(const WebTo
- }
- #endif
-
--#if OS(WINDOWS) || OS(LINUX) || OS(FREEBSD)
-+#if OS(WINDOWS) || OS(LINUX) || OS(BSD)
- // Mac has no way to open a context menu based on a keyboard event.
- bool WebViewImpl::sendContextMenuEvent(const WebKeyboardEvent& event)
- {
-@@ -2054,7 +2054,7 @@ void WebViewImpl::setDomainRelaxationFor
- void WebViewImpl::setScrollbarColors(unsigned inactiveColor,
- unsigned activeColor,
- unsigned trackColor) {
--#if OS(LINUX) || OS(FREEBSD)
-+#if OS(LINUX) || OS(BSD)
- PlatformThemeChromiumGtk::setScrollbarColors(inactiveColor,
- activeColor,
- trackColor);
-@@ -2065,7 +2065,7 @@ void WebViewImpl::setSelectionColors(uns
- unsigned activeForegroundColor,
- unsigned inactiveBackgroundColor,
- unsigned inactiveForegroundColor) {
--#if OS(LINUX) || OS(FREEBSD)
-+#if OS(LINUX) || OS(BSD)
- RenderThemeChromiumLinux::setSelectionColors(activeBackgroundColor,
- activeForegroundColor,
- inactiveBackgroundColor,
-@@ -2141,7 +2141,7 @@ bool WebViewImpl::navigationPolicyFromMo
- bool alt, bool meta,
- WebNavigationPolicy* policy)
- {
--#if OS(WINDOWS) || OS(LINUX) || OS(FREEBSD) || OS(SOLARIS)
-+#if OS(WINDOWS) || OS(LINUX) || OS(BSD) || OS(SOLARIS)
- const bool newTabModifier = (button == 1) || ctrl;
- #elif OS(DARWIN)
- const bool newTabModifier = (button == 1) || meta;
diff --git a/chromium/patches/patch-third__party_angle_src_compiler_osinclude.h b/chromium/patches/patch-third__party_angle_src_compiler_osinclude.h
deleted file mode 100644
index 06bf355cdb..0000000000
--- a/chromium/patches/patch-third__party_angle_src_compiler_osinclude.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-third__party_angle_src_compiler_osinclude.h,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/angle/src/compiler/osinclude.h.orig 2011-04-13 08:13:40.000000000 +0000
-+++ third_party/angle/src/compiler/osinclude.h
-@@ -15,7 +15,8 @@
- #if defined(_WIN32) || defined(_WIN64)
- #define ANGLE_OS_WIN
- #elif defined(__APPLE__) || defined(__linux__) || \
-- defined(__FreeBSD__) || defined(__OpenBSD__) || \
-+ defined(__DragonFly__) || defined(__FreeBSD__) || \
-+ defined(__NetBSD__) || defined(__OpenBSD__) || \
- defined(__sun)
- #define ANGLE_OS_POSIX
- #else
diff --git a/chromium/patches/patch-third__party_cld_base_build__config.h b/chromium/patches/patch-third__party_cld_base_build__config.h
deleted file mode 100644
index 7bebb2f408..0000000000
--- a/chromium/patches/patch-third__party_cld_base_build__config.h
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-third__party_cld_base_build__config.h,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/cld/base/build_config.h.orig 2011-04-13 08:01:31.000000000 +0000
-+++ third_party/cld/base/build_config.h
-@@ -26,9 +26,15 @@
- #elif defined(_WIN32)
- #define OS_WIN 1
- #define TOOLKIT_VIEWS 1
-+#elif defined(__DragonFly__)
-+#define OS_DRAGONFLY 1
-+#define TOOLKIT_GTK
- #elif defined(__FreeBSD__)
- #define OS_FREEBSD 1
- #define TOOLKIT_GTK
-+#elif defined(__NetBSD__)
-+#define OS_NETBSD 1
-+#define TOOLKIT_GTK
- #elif defined(__OpenBSD__)
- #define OS_OPENBSD 1
- #define TOOLKIT_GTK
-@@ -42,14 +48,16 @@
- #define TOOLKIT_USES_GTK 1
- #endif
-
--#if defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD)
-+#if defined(OS_LINUX) || defined(OS_DRAGONFLY) || defined(OS_FREEBSD) || \
-+ defined(OS_NETBSD) || defined(OS_OPENBSD)
- #define USE_NSS 1 // Use NSS for crypto.
- #define USE_X11 1 // Use X for graphics.
- #endif
-
- // For access to standard POSIXish features, use OS_POSIX instead of a
- // more specific macro.
--#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_FREEBSD) || defined(OS_OPENBSD)
-+#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_DRAGONFLY) || \
-+ defined(OS_FREEBSD) || defined(OS_NETBSD) || defined(OS_OPENBSD)
- #define OS_POSIX 1
- // Use base::DataPack for name/value pairs.
- #define USE_BASE_DATA_PACK 1
diff --git a/chromium/patches/patch-third__party_expat_expat.gyp b/chromium/patches/patch-third__party_expat_expat.gyp
deleted file mode 100644
index d4b870071d..0000000000
--- a/chromium/patches/patch-third__party_expat_expat.gyp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-third__party_expat_expat.gyp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/expat/expat.gyp.orig 2011-04-13 08:01:18.000000000 +0000
-+++ third_party/expat/expat.gyp
-@@ -15,7 +15,7 @@
- ]
- },
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- # On Linux, we implicitly already depend on expat via fontconfig;
- # let's not pull it in twice.
- 'targets': [
-@@ -59,7 +59,7 @@
- 'COMPILED_FROM_DSP',
- ],
- }],
-- ['OS=="mac" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="mac" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'defines': [
- 'HAVE_EXPAT_CONFIG_H',
- ],
diff --git a/chromium/patches/patch-third__party_ffmpeg_ffmpeg.gyp b/chromium/patches/patch-third__party_ffmpeg_ffmpeg.gyp
deleted file mode 100644
index e749269422..0000000000
--- a/chromium/patches/patch-third__party_ffmpeg_ffmpeg.gyp
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-third__party_ffmpeg_ffmpeg.gyp,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- third_party/ffmpeg/ffmpeg.gyp.orig 2011-05-24 08:02:43.000000000 +0000
-+++ third_party/ffmpeg/ffmpeg.gyp
-@@ -23,7 +23,7 @@
- {
- 'target_defaults': {
- 'conditions': [
-- ['OS!="linux" and OS!="freebsd" and OS!="openbsd" and OS!="solaris"', {
-+ ['OS!="linux" and OS!="dragonfly" and OS!="freebsd" and OS!="netbsd" and OS!="openbsd" and OS!="solaris"', {
- 'sources/': [['exclude', '/linux/']]
- }],
- ['OS!="mac"', {'sources/': [['exclude', '/mac/']]}],
-@@ -320,7 +320,7 @@
- }],
- ],
- }],
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'defines': [
- '_ISOC99_SOURCE',
- '_LARGEFILE_SOURCE',
-@@ -501,7 +501,7 @@
- 'ffmpegsumo',
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'copies': [
- {
- # On Make and Scons builds, the library does not end up in
diff --git a/chromium/patches/patch-third__party_ffmpeg_patched-ffmpeg-mt_configure b/chromium/patches/patch-third__party_ffmpeg_patched-ffmpeg-mt_configure
deleted file mode 100644
index 048caf8615..0000000000
--- a/chromium/patches/patch-third__party_ffmpeg_patched-ffmpeg-mt_configure
+++ /dev/null
@@ -1,48 +0,0 @@
-$NetBSD: patch-third__party_ffmpeg_patched-ffmpeg-mt_configure,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- third_party/ffmpeg/patched-ffmpeg-mt/configure.orig 2011-05-24 08:02:43.000000000 +0000
-+++ third_party/ffmpeg/patched-ffmpeg-mt/configure
-@@ -2294,6 +2294,10 @@ case $target_os in
- nm_opts='-P -g'
- ;;
- netbsd)
-+ if test "${subarch}" != "x86_32"; then
-+ LIBOBJFLAGS='$(PIC)'
-+ SHFLAGS='-shared'
-+ fi
- oss_indev_extralibs="-lossaudio"
- oss_outdev_extralibs="-lossaudio"
- add_cppflags -D_XOPEN_SOURCE=600
-@@ -2500,10 +2504,13 @@ check_cc <<EOF && enable attribute_may_a
- union { int x; } __attribute__((may_alias)) x;
- EOF
-
--check_cc <<EOF || die "endian test failed"
--unsigned int endian = 'B' << 24 | 'I' << 16 | 'G' << 8 | 'E';
-+check_exec <<EOF || enable bigendian
-+int main()
-+{
-+ long one = 1;
-+ return !(*((char *)(&one)));
-+}
- EOF
--od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
-
- if enabled alpha; then
-
-@@ -2893,6 +2900,7 @@ check_ldflags -Wl,--as-needed
- check_ldflags '-Wl,-rpath-link,\$(BUILD_ROOT)/libpostproc -Wl,-rpath-link,\$(BUILD_ROOT)/libswscale -Wl,-rpath-link,\$(BUILD_ROOT)/libavfilter -Wl,-rpath-link,\$(BUILD_ROOT)/libavdevice -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavcore -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
- check_ldflags -Wl,-Bsymbolic
-
-+if false; then
- echo "X{};" > $TMPV
- if test_ldflags -Wl,--version-script,$TMPV; then
- append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
-@@ -2905,6 +2913,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
- void ff_foo(void) {}
- EOF
- fi
-+fi
-
- if enabled small; then
- add_cflags $size_cflags
diff --git a/chromium/patches/patch-third__party_icu_icu.gyp b/chromium/patches/patch-third__party_icu_icu.gyp
deleted file mode 100644
index 69ada7be10..0000000000
--- a/chromium/patches/patch-third__party_icu_icu.gyp
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-third__party_icu_icu.gyp,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- third_party/icu/icu.gyp.orig 2011-05-24 08:20:20.000000000 +0000
-+++ third_party/icu/icu.gyp
-@@ -54,7 +54,7 @@
- }, { # else: OS != "win"
- 'sources!': ['windows/icudt46.dll'],
- }],
-- [ 'OS != "linux" or chromeos == 1', {
-+ [ '(OS != "linux" and OS != "dragonfly" and OS != "freebsd" and OS != "netbsd" and OS != "openbsd") or chromeos == 1', {
- 'sources!': ['linux/icudt46l_dat.S'],
- }],
- [ 'OS != "mac"', {
-@@ -264,7 +264,7 @@
- ],
- },
- 'conditions': [
-- [ 'OS=="linux"', {
-+ [ 'OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- # Since ICU wants to internally use its own deprecated APIs, don't
- # complain about it.
- 'cflags': [
-@@ -479,7 +479,7 @@
- 'source/stubdata/stubdata.c',
- ],
- }],
-- [ 'OS == "linux"', {
-+ [ 'OS == "linux" or OS == "dragonfly" or OS == "freebsd" or OS == "netbsd" or OS == "openbsd"', {
- 'cflags': [
- # Since ICU wants to internally use its own deprecated APIs,
- # don't complain about it.
diff --git a/chromium/patches/patch-third__party_icu_source_configure b/chromium/patches/patch-third__party_icu_source_configure
deleted file mode 100644
index 4ebe4fdb12..0000000000
--- a/chromium/patches/patch-third__party_icu_source_configure
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-third__party_icu_source_configure,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- third_party/icu/source/configure.orig 2011-05-24 08:20:18.000000000 +0000
-+++ third_party/icu/source/configure
-@@ -7748,7 +7748,7 @@ then
- fi
-
- # output the Makefiles
--ac_config_files="$ac_config_files icudefs.mk Makefile data/pkgdataMakefile config/Makefile.inc config/icu.pc config/pkgdataMakefile data/Makefile stubdata/Makefile common/Makefile i18n/Makefile layout/Makefile layoutex/Makefile io/Makefile extra/Makefile extra/uconv/Makefile extra/uconv/pkgdataMakefile extra/scrptrun/Makefile tools/Makefile tools/ctestfw/Makefile tools/toolutil/Makefile tools/makeconv/Makefile tools/genrb/Makefile tools/genccode/Makefile tools/gencmn/Makefile tools/gencnval/Makefile tools/genctd/Makefile tools/gentest/Makefile tools/gennorm2/Makefile tools/genbrk/Makefile tools/gensprep/Makefile tools/icuinfo/Makefile tools/icupkg/Makefile tools/icuswap/Makefile tools/pkgdata/Makefile tools/tzcode/Makefile tools/gencfu/Makefile test/Makefile test/compat/Makefile test/testdata/Makefile test/testdata/pkgdataMakefile test/hdrtst/Makefile test/intltest/Makefile test/cintltst/Makefile test/iotest/Makefile test/letest/Makefile test/perf/Makefile test/perf/collati
onperf/Makefile test/perf/ubrkperf/Makefile test/perf/charperf/Makefile test/perf/convperf/Makefile test/perf/normperf/Makefile test/perf/DateFmtPerf/Makefile test/perf/strsrchperf/Makefile test/perf/unisetperf/Makefile test/perf/usetperf/Makefile test/perf/ustrperf/Makefile test/perf/utfperf/Makefile test/perf/utrie2perf/Makefile samples/Makefile samples/date/Makefile samples/cal/Makefile samples/layout/Makefile common/unicode/platform.h"
-+ac_config_files="$ac_config_files icudefs.mk Makefile data/pkgdataMakefile config/Makefile.inc config/icu.pc config/pkgdataMakefile data/Makefile stubdata/Makefile common/Makefile i18n/Makefile io/Makefile tools/Makefile tools/ctestfw/Makefile tools/toolutil/Makefile tools/makeconv/Makefile tools/genrb/Makefile tools/genccode/Makefile tools/gencmn/Makefile tools/gencnval/Makefile tools/genctd/Makefile tools/gentest/Makefile tools/gennorm2/Makefile tools/genbrk/Makefile tools/gensprep/Makefile tools/icuinfo/Makefile tools/icupkg/Makefile tools/icuswap/Makefile tools/pkgdata/Makefile tools/tzcode/Makefile tools/gencfu/Makefile test/Makefile test/compat/Makefile test/testdata/Makefile test/testdata/pkgdataMakefile test/hdrtst/Makefile test/intltest/Makefile test/cintltst/Makefile test/iotest/Makefile test/letest/Makefile test/perf/Makefile test/perf/collationperf/Makefile test/perf/ubrkperf/Makefile test/perf/charperf/Makefile test/perf/convperf/Makefile test/perf/normperf/Mak
efile test/perf/DateFmtPerf/Makefile test/perf/strsrchperf/Makefile test/perf/unisetperf/Makefile test/perf/usetperf/Makefile test/perf/ustrperf/Makefile test/perf/utfperf/Makefile test/perf/utrie2perf/Makefile common/unicode/platform.h"
-
- cat >confcache <<\_ACEOF
- # This file is a shell script that caches the results of configure
diff --git a/chromium/patches/patch-third__party_libjingle_libjingle.gyp b/chromium/patches/patch-third__party_libjingle_libjingle.gyp
deleted file mode 100644
index 14e371d6a0..0000000000
--- a/chromium/patches/patch-third__party_libjingle_libjingle.gyp
+++ /dev/null
@@ -1,43 +0,0 @@
-$NetBSD: patch-third__party_libjingle_libjingle.gyp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/libjingle/libjingle.gyp.orig 2011-04-13 08:01:20.000000000 +0000
-+++ third_party/libjingle/libjingle.gyp
-@@ -72,12 +72,12 @@
- 'OSX',
- ],
- }],
-- ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="mac"', {
- 'defines': [
- 'POSIX',
- ],
- }],
-- ['OS=="openbsd" or OS=="freebsd"', {
-+ ['OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'defines': [
- 'BSD',
- ],
-@@ -116,12 +116,12 @@
- 'OSX',
- ],
- }],
-- ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="mac"', {
- 'defines': [
- 'POSIX',
- ],
- }],
-- ['OS=="openbsd" or OS=="freebsd"', {
-+ ['OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'defines': [
- 'BSD',
- ],
-@@ -328,7 +328,7 @@
- 'source/talk/base/winping.h',
- ],
- }],
-- ['OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="mac"', {
- 'sources': [
- 'source/talk/base/sslstreamadapter.cc',
- 'source/talk/base/sslstreamadapter.h',
diff --git a/chromium/patches/patch-third__party_libjingle_source_talk_base_nethelpers.cc b/chromium/patches/patch-third__party_libjingle_source_talk_base_nethelpers.cc
deleted file mode 100644
index 09d7dbd211..0000000000
--- a/chromium/patches/patch-third__party_libjingle_source_talk_base_nethelpers.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-third__party_libjingle_source_talk_base_nethelpers.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- third_party/libjingle/source/talk/base/nethelpers.cc.orig 2011-05-24 08:20:06.000000000 +0000
-+++ third_party/libjingle/source/talk/base/nethelpers.cc
-@@ -154,6 +154,8 @@ hostent* SafeGetHostByName(const char* h
- #elif defined(OSX) || defined(IOS)
- // Mac OS returns an object with everything allocated.
- result = getipnodebyname(hostname, AF_INET, AI_DEFAULT, herrno);
-+#elif defined(BSD)
-+ result = gethostbyname(hostname);
- #else
- #error "I don't know how to do gethostbyname safely on your system."
- #endif
diff --git a/chromium/patches/patch-third__party_libjingle_source_talk_base_network.cc b/chromium/patches/patch-third__party_libjingle_source_talk_base_network.cc
deleted file mode 100644
index 73b8573413..0000000000
--- a/chromium/patches/patch-third__party_libjingle_source_talk_base_network.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-third__party_libjingle_source_talk_base_network.cc,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/libjingle/source/talk/base/network.cc.orig 2011-04-13 08:13:43.000000000 +0000
-+++ third_party/libjingle/source/talk/base/network.cc
-@@ -252,7 +252,7 @@ bool NetworkManager::CreateNetworks(bool
-
- struct ifreq* ptr = reinterpret_cast<struct ifreq*>(ifc.ifc_buf);
- struct ifreq* end =
-- reinterpret_cast<struct ifreq*>(ifc.ifc_buf + ifc.ifc_len);
-+ reinterpret_cast<struct ifreq*>((char *)ifc.ifc_buf + ifc.ifc_len);
-
- while (ptr < end) {
- struct sockaddr_in* inaddr =
diff --git a/chromium/patches/patch-third__party_libjingle_source_talk_base_socketaddress.cc b/chromium/patches/patch-third__party_libjingle_source_talk_base_socketaddress.cc
deleted file mode 100644
index 8f6dbbd4a5..0000000000
--- a/chromium/patches/patch-third__party_libjingle_source_talk_base_socketaddress.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-third__party_libjingle_source_talk_base_socketaddress.cc,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/libjingle/source/talk/base/socketaddress.cc.orig 2011-04-13 08:13:43.000000000 +0000
-+++ third_party/libjingle/source/talk/base/socketaddress.cc
-@@ -29,6 +29,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <netinet/in.h>
-+#include <netinet/in_systm.h>
- #include <netinet/ip.h>
- #include <arpa/inet.h>
- #include <netdb.h>
diff --git a/chromium/patches/patch-third__party_libsrtp_src_crypto_include_integers.h b/chromium/patches/patch-third__party_libsrtp_src_crypto_include_integers.h
deleted file mode 100644
index e257a5acb7..0000000000
--- a/chromium/patches/patch-third__party_libsrtp_src_crypto_include_integers.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-third__party_libsrtp_src_crypto_include_integers.h,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/libsrtp/src/crypto/include/integers.h.orig 2011-04-13 08:02:07.000000000 +0000
-+++ third_party/libsrtp/src/crypto/include/integers.h
-@@ -76,7 +76,7 @@
- #endif
-
- /* Can we do 64 bit integers? */
--#ifndef HAVE_UINT64_T
-+#if !defined(HAVE_UINT64_T) && !defined(__OpenBSD__)
- # if SIZEOF_UNSIGNED_LONG == 8
- typedef unsigned long uint64_t;
- # elif SIZEOF_UNSIGNED_LONG_LONG == 8
diff --git a/chromium/patches/patch-third__party_libxml_libxml.gyp b/chromium/patches/patch-third__party_libxml_libxml.gyp
deleted file mode 100644
index 5260070e8b..0000000000
--- a/chromium/patches/patch-third__party_libxml_libxml.gyp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-third__party_libxml_libxml.gyp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/libxml/libxml.gyp.orig 2011-04-13 08:01:29.000000000 +0000
-+++ third_party/libxml/libxml.gyp
-@@ -7,7 +7,7 @@
- 'conditions': [
- # Define an "os_include" variable that points at the OS-specific generated
- # headers. These were generated by running the configure script offline.
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'os_include': 'linux'
- }],
- ['OS=="mac"', {'os_include': 'mac'}],
-@@ -19,7 +19,7 @@
- {
- 'target_name': 'libxml',
- 'conditions': [
-- ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") '
-+ ['(OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris") '
- 'and use_system_libxml', {
- 'type': 'settings',
- 'direct_dependent_settings': {
diff --git a/chromium/patches/patch-third__party_libxslt_libxslt.gyp b/chromium/patches/patch-third__party_libxslt_libxslt.gyp
deleted file mode 100644
index af027d4352..0000000000
--- a/chromium/patches/patch-third__party_libxslt_libxslt.gyp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-third__party_libxslt_libxslt.gyp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/libxslt/libxslt.gyp.orig 2011-04-13 08:01:22.000000000 +0000
-+++ third_party/libxslt/libxslt.gyp
-@@ -5,7 +5,7 @@
- {
- 'variables': {
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'os_include': 'linux'
- }],
- ['OS=="mac"', {'os_include': 'mac'}],
-@@ -21,7 +21,7 @@
- {
- 'target_name': 'libxslt',
- 'conditions': [
-- ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") '
-+ ['(OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris") '
- 'and use_system_libxml', {
- 'type': 'settings',
- 'direct_dependent_settings': {
diff --git a/chromium/patches/patch-third__party_mesa_MesaLib_src_mesa_main_imports.h b/chromium/patches/patch-third__party_mesa_MesaLib_src_mesa_main_imports.h
deleted file mode 100644
index 4e1948f68b..0000000000
--- a/chromium/patches/patch-third__party_mesa_MesaLib_src_mesa_main_imports.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-third__party_mesa_MesaLib_src_mesa_main_imports.h,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/mesa/MesaLib/src/mesa/main/imports.h.orig 2011-04-13 08:01:23.000000000 +0000
-+++ third_party/mesa/MesaLib/src/mesa/main/imports.h
-@@ -131,6 +131,7 @@ typedef union { GLfloat f; GLint i; } fi
- #define cosf(f) ((float) cos(f))
- #define coshf(f) ((float) cosh(f))
- #define expf(f) ((float) exp(f))
-+#define exp2(f) exp((f) * 0.693147180559945)
- #define exp2f(f) ((float) exp2(f))
- #define floorf(f) ((float) floor(f))
- #define logf(f) ((float) log(f))
diff --git a/chromium/patches/patch-third__party_mesa_mesa.gyp b/chromium/patches/patch-third__party_mesa_mesa.gyp
deleted file mode 100644
index 28cb1ed63a..0000000000
--- a/chromium/patches/patch-third__party_mesa_mesa.gyp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-third__party_mesa_mesa.gyp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/mesa/mesa.gyp.orig 2011-04-13 08:01:28.000000000 +0000
-+++ third_party/mesa/mesa.gyp
-@@ -19,7 +19,7 @@
- 'HAVE_STRNLEN',
- ],
- }],
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'cflags': [
- '-fPIC',
- ],
diff --git a/chromium/patches/patch-third__party_npapi_npapi.gyp b/chromium/patches/patch-third__party_npapi_npapi.gyp
deleted file mode 100644
index 4a038bb462..0000000000
--- a/chromium/patches/patch-third__party_npapi_npapi.gyp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-third__party_npapi_npapi.gyp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/npapi/npapi.gyp.orig 2011-04-13 08:01:21.000000000 +0000
-+++ third_party/npapi/npapi.gyp
-@@ -26,7 +26,7 @@
- 'bindings/npruntime.h',
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'sources': [
- 'bindings/npapi_x11.h',
- ],
diff --git a/chromium/patches/patch-third__party_qcms_qcms.gyp b/chromium/patches/patch-third__party_qcms_qcms.gyp
deleted file mode 100644
index d0f0ade5e3..0000000000
--- a/chromium/patches/patch-third__party_qcms_qcms.gyp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-third__party_qcms_qcms.gyp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- third_party/qcms/qcms.gyp.orig 2011-04-13 08:01:31.000000000 +0000
-+++ third_party/qcms/qcms.gyp
-@@ -23,7 +23,7 @@
- ],
- },
- 'conditions': [
-- ['OS=="linux" and (branding=="Chrome" or disable_sse2==1)', {
-+ ['(OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd") and (branding=="Chrome" or disable_sse2==1)', {
- 'sources/': [
- ['exclude', 'transform-sse1.c'],
- ['exclude', 'transform-sse2.c'],
diff --git a/chromium/patches/patch-third__party_skia_include_core_SkPreConfig.h b/chromium/patches/patch-third__party_skia_include_core_SkPreConfig.h
deleted file mode 100644
index 5556df5161..0000000000
--- a/chromium/patches/patch-third__party_skia_include_core_SkPreConfig.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-third__party_skia_include_core_SkPreConfig.h,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- third_party/skia/include/core/SkPreConfig.h.orig 2011-05-24 08:02:00.000000000 +0000
-+++ third_party/skia/include/core/SkPreConfig.h
-@@ -37,7 +37,8 @@
- #define SK_BUILD_FOR_WIN32
- #elif defined(__SYMBIAN32__)
- #define SK_BUILD_FOR_WIN32
-- #elif defined(linux)
-+ #elif defined(linux) || defined(__DragonFly__) || defined(__FreeBSD__) || \
-+ defined(__NetBSD__) || defined(__OpenBSD__)
- #define SK_BUILD_FOR_UNIX
- #elif TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
- #define SK_BUILD_FOR_IOS
diff --git a/chromium/patches/patch-third__party_sqlite_sqlite.gyp b/chromium/patches/patch-third__party_sqlite_sqlite.gyp
deleted file mode 100644
index 00fc183d57..0000000000
--- a/chromium/patches/patch-third__party_sqlite_sqlite.gyp
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-third__party_sqlite_sqlite.gyp,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- third_party/sqlite/sqlite.gyp.orig 2011-05-24 08:01:29.000000000 +0000
-+++ third_party/sqlite/sqlite.gyp
-@@ -41,7 +41,7 @@
- ],
- },
- }],
-- ['(OS=="linux" or OS=="freebsd" or OS=="openbsd") and use_system_sqlite', {
-+ ['(OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd") and use_system_sqlite', {
- 'type': 'settings',
- 'direct_dependent_settings': {
- 'cflags': [
-@@ -233,7 +233,7 @@
- }, { # else: OS!="win"
- 'sources/': [['exclude', '_(w32|win)\\.cc?$']],
- }],
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'cflags': [
- # SQLite doesn't believe in compiler warnings,
- # preferring testing.
-@@ -248,7 +248,7 @@
- },
- ],
- 'conditions': [
-- ['(OS=="linux" or OS=="freebsd" or OS=="openbsd") and not use_system_sqlite', {
-+ ['(OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd") and not use_system_sqlite', {
- 'targets': [
- {
- 'target_name': 'sqlite_shell',
diff --git a/chromium/patches/patch-third__party_yasm_source_patched-yasm_Makefile.in b/chromium/patches/patch-third__party_yasm_source_patched-yasm_Makefile.in
deleted file mode 100644
index 8acbe49eee..0000000000
--- a/chromium/patches/patch-third__party_yasm_source_patched-yasm_Makefile.in
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-third__party_yasm_source_patched-yasm_Makefile.in,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- third_party/yasm/source/patched-yasm/Makefile.in.orig 2011-05-24 08:19:23.000000000 +0000
-+++ third_party/yasm/source/patched-yasm/Makefile.in
-@@ -1735,11 +1735,11 @@ PYBINDING_DEPS = tools/python-yasm/bytec
- tools/python-yasm/symrec.pxi tools/python-yasm/value.pxi
- YASM_MODULES = arch_x86 arch_lc3b listfmt_nasm parser_gas parser_gnu \
- parser_nasm parser_tasm preproc_nasm preproc_tasm preproc_raw \
-- preproc_cpp preproc_gas dbgfmt_cv8 dbgfmt_dwarf2 dbgfmt_null \
-- dbgfmt_stabs objfmt_dbg objfmt_bin objfmt_dosexe objfmt_elf \
-- objfmt_elf32 objfmt_elf64 objfmt_coff objfmt_macho \
-- objfmt_macho32 objfmt_macho64 objfmt_rdf objfmt_win32 \
-- objfmt_win64 objfmt_x64 objfmt_xdf
-+ preproc_cpp dbgfmt_cv8 dbgfmt_dwarf2 dbgfmt_null dbgfmt_stabs \
-+ objfmt_dbg objfmt_bin objfmt_dosexe objfmt_elf objfmt_elf32 \
-+ objfmt_elf64 objfmt_coff objfmt_macho objfmt_macho32 \
-+ objfmt_macho64 objfmt_rdf objfmt_win32 objfmt_win64 objfmt_x64 \
-+ objfmt_xdf
- lib_LIBRARIES = libyasm.a
- libyasm_a_SOURCES = modules/arch/x86/x86arch.c \
- modules/arch/x86/x86arch.h modules/arch/x86/x86bc.c \
diff --git a/chromium/patches/patch-third__party_yasm_yasm.gyp b/chromium/patches/patch-third__party_yasm_yasm.gyp
deleted file mode 100644
index 0d8122b26d..0000000000
--- a/chromium/patches/patch-third__party_yasm_yasm.gyp
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-third__party_yasm_yasm.gyp,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- third_party/yasm/yasm.gyp.orig 2011-05-24 08:01:30.000000000 +0000
-+++ third_party/yasm/yasm.gyp
-@@ -158,6 +158,15 @@
- ],
- 'defines': [ '<@(yasm_defines)' ],
- 'cflags': [ '<@(yasm_cflags)', ],
-+ 'conditions': [
-+ ['OS=="netbsd" or OS=="dragonfly"', {
-+ 'link_settings': {
-+ 'libraries': [
-+ '-lintl',
-+ ],
-+ },
-+ }],
-+ ],
- 'rules': [
- {
- 'rule_name': 'generate_gperf',
diff --git a/chromium/patches/patch-tools_gyp_pylib_gyp_____init____.py b/chromium/patches/patch-tools_gyp_pylib_gyp_____init____.py
deleted file mode 100644
index cf308da4d9..0000000000
--- a/chromium/patches/patch-tools_gyp_pylib_gyp_____init____.py
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-tools_gyp_pylib_gyp_____init____.py,v 1.2 2012/11/17 02:57:12 gduzan Exp $
-
---- tools/gyp/pylib/gyp/__init__.py.orig 2011-04-13 08:13:20.000000000 +0000
-+++ tools/gyp/pylib/gyp/__init__.py
-@@ -313,9 +313,12 @@ def main(args):
- options.formats = [ {'darwin': 'xcode',
- 'win32': 'msvs',
- 'cygwin': 'msvs',
-+ 'dragonfly2': 'make',
- 'freebsd7': 'make',
- 'freebsd8': 'make',
- 'linux2': 'make',
-+ 'netbsd5': 'make',
-+ 'netbsd6': 'make',
- 'openbsd4': 'make',
- 'sunos5': 'make',}[sys.platform] ]
-
diff --git a/chromium/patches/patch-tools_gyp_test_additional-targets_src_dir1_actions.gyp b/chromium/patches/patch-tools_gyp_test_additional-targets_src_dir1_actions.gyp
deleted file mode 100644
index ce758fd923..0000000000
--- a/chromium/patches/patch-tools_gyp_test_additional-targets_src_dir1_actions.gyp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-tools_gyp_test_additional-targets_src_dir1_actions.gyp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- tools/gyp/test/additional-targets/src/dir1/actions.gyp.orig 2011-04-13 08:13:18.000000000 +0000
-+++ tools/gyp/test/additional-targets/src/dir1/actions.gyp
-@@ -47,7 +47,7 @@
- },
- ],
- 'conditions': [
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'target_defaults': {
- 'cflags': ['-fPIC'],
- },
diff --git a/chromium/patches/patch-tools_gyp_test_library_src_library.gyp b/chromium/patches/patch-tools_gyp_test_library_src_library.gyp
deleted file mode 100644
index bc4492a89c..0000000000
--- a/chromium/patches/patch-tools_gyp_test_library_src_library.gyp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-tools_gyp_test_library_src_library.gyp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- tools/gyp/test/library/src/library.gyp.orig 2011-04-13 08:13:19.000000000 +0000
-+++ tools/gyp/test/library/src/library.gyp
-@@ -48,7 +48,7 @@
- },
- ],
- 'conditions': [
-- ['OS=="linux"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'target_defaults': {
- # Support 64-bit shared libs (also works fine for 32-bit).
- 'cflags': ['-fPIC'],
diff --git a/chromium/patches/patch-ui_base_l10n_l10n__util.cc b/chromium/patches/patch-ui_base_l10n_l10n__util.cc
deleted file mode 100644
index 1aa66d6132..0000000000
--- a/chromium/patches/patch-ui_base_l10n_l10n__util.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ui_base_l10n_l10n__util.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- ui/base/l10n/l10n_util.cc.orig 2011-05-24 08:01:59.000000000 +0000
-+++ ui/base/l10n/l10n_util.cc
-@@ -320,7 +320,7 @@ bool CheckAndResolveLocale(const std::st
- // if "foo bar" is RTL. So this function prepends the necessary RLM in such
- // cases.
- void AdjustParagraphDirectionality(string16* paragraph) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- if (base::i18n::IsRTL() &&
- base::i18n::StringContainsStrongRTLChars(*paragraph)) {
- paragraph->insert(0, 1, static_cast<char16>(base::i18n::kRightToLeftMark));
diff --git a/chromium/patches/patch-ui_base_resource_resource__bundle.cc b/chromium/patches/patch-ui_base_resource_resource__bundle.cc
deleted file mode 100644
index ba2e2c4676..0000000000
--- a/chromium/patches/patch-ui_base_resource_resource__bundle.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ui_base_resource_resource__bundle.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- ui/base/resource/resource_bundle.cc.orig 2011-05-24 08:01:59.000000000 +0000
-+++ ui/base/resource/resource_bundle.cc
-@@ -129,7 +129,7 @@ gfx::Image& ResourceBundle::GetImageName
- return *GetEmptyImage();
- }
-
--#if !defined(OS_MACOSX) && !defined(OS_LINUX)
-+#if !defined(OS_POSIX)
- // Only Mac and Linux have non-Skia native image types. All other platforms use
- // Skia natively, so just use GetImageNamed().
- gfx::Image& ResourceBundle::GetNativeImageNamed(int resource_id) {
diff --git a/chromium/patches/patch-ui_base_ui__base.gypi b/chromium/patches/patch-ui_base_ui__base.gypi
deleted file mode 100644
index 2360f7d81c..0000000000
--- a/chromium/patches/patch-ui_base_ui__base.gypi
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ui_base_ui__base.gypi,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- ui/base/ui_base.gypi.orig 2011-05-24 08:01:59.000000000 +0000
-+++ ui/base/ui_base.gypi
-@@ -13,7 +13,7 @@
- ['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'],
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {'sources/': [
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {'sources/': [
- ['include', '/gtk/'],
- ['include', '_(gtk|linux|posix|skia|x)\\.cc$'],
- ['include', '/(gtk|x11)_[^/]*\\.cc$'],
-@@ -85,7 +85,7 @@
- 'clipboard/scoped_clipboard_writer.h',
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- '../build/linux/system.gyp:x11',
diff --git a/chromium/patches/patch-ui_gfx_gfx.gyp b/chromium/patches/patch-ui_gfx_gfx.gyp
deleted file mode 100644
index 46502a17ce..0000000000
--- a/chromium/patches/patch-ui_gfx_gfx.gyp
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ui_gfx_gfx.gyp,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- ui/gfx/gfx.gyp.orig 2011-05-24 08:01:59.000000000 +0000
-+++ ui/gfx/gfx.gyp
-@@ -66,7 +66,7 @@
- },
- }
- }],
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../../build/linux/system.gyp:gtk',
- ],
-@@ -168,7 +168,7 @@
- '<(DEPTH)/third_party/wtl/include',
- ],
- }],
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- # font_gtk.cc uses fontconfig.
- # TODO(evanm): I think this is wrong; it should just use GTK.
diff --git a/chromium/patches/patch-ui_gfx_gfx__resources.grd b/chromium/patches/patch-ui_gfx_gfx__resources.grd
deleted file mode 100644
index 932749d938..0000000000
--- a/chromium/patches/patch-ui_gfx_gfx__resources.grd
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ui_gfx_gfx__resources.grd,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- ui/gfx/gfx_resources.grd.orig 2011-05-24 08:01:59.000000000 +0000
-+++ ui/gfx/gfx_resources.grd
-@@ -16,7 +16,7 @@
- <include name="IDR_BITMAP_BRUSH_IMAGE" file="resources\bitmap_brush_image.png" type="BINDATA" />
- </if>
-
-- <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'sunos5'">
-+ <if expr="os == 'linux2' or os.find('bsd') != -1 or os == 'dragonfly2' or os == 'sunos5'">
- <include name="IDR_LINUX_CHECKBOX_DISABLED_INDETERMINATE" file="resources\linux-checkbox-disabled-indeterminate.png" type="BINDATA" />
- <include name="IDR_LINUX_CHECKBOX_DISABLED_OFF" file="resources\linux-checkbox-disabled-off.png" type="BINDATA" />
- <include name="IDR_LINUX_CHECKBOX_DISABLED_ON" file="resources\linux-checkbox-disabled-on.png" type="BINDATA" />
diff --git a/chromium/patches/patch-ui_gfx_image.cc b/chromium/patches/patch-ui_gfx_image.cc
deleted file mode 100644
index a2a52b2699..0000000000
--- a/chromium/patches/patch-ui_gfx_image.cc
+++ /dev/null
@@ -1,76 +0,0 @@
-$NetBSD: patch-ui_gfx_image.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- ui/gfx/image.cc.orig 2011-05-24 08:01:59.000000000 +0000
-+++ ui/gfx/image.cc
-@@ -9,7 +9,7 @@
- #include "base/logging.h"
- #include "third_party/skia/include/core/SkBitmap.h"
-
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- #include <gdk-pixbuf/gdk-pixbuf.h>
- #include <glib-object.h>
- #include "ui/gfx/canvas_skia.h"
-@@ -29,7 +29,7 @@ namespace internal {
- const SkBitmap* NSImageToSkBitmap(NSImage* image);
- #endif
-
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- const SkBitmap* GdkPixbufToSkBitmap(GdkPixbuf* pixbuf) {
- gfx::CanvasSkia canvas(gdk_pixbuf_get_width(pixbuf),
- gdk_pixbuf_get_height(pixbuf),
-@@ -61,7 +61,7 @@ class ImageRep {
- return reinterpret_cast<SkBitmapRep*>(this);
- }
-
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- GdkPixbufRep* AsGdkPixbufRep() {
- CHECK_EQ(type_, Image::kGdkPixbufRep);
- return reinterpret_cast<GdkPixbufRep*>(this);
-@@ -102,7 +102,7 @@ class SkBitmapRep : public ImageRep {
- DISALLOW_COPY_AND_ASSIGN(SkBitmapRep);
- };
-
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- class GdkPixbufRep : public ImageRep {
- public:
- explicit GdkPixbufRep(GdkPixbuf* pixbuf)
-@@ -158,7 +158,7 @@ Image::Image(const SkBitmap* bitmap)
- AddRepresentation(rep);
- }
-
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- Image::Image(GdkPixbuf* pixbuf)
- : default_representation_(Image::kGdkPixbufRep) {
- internal::GdkPixbufRep* rep = new internal::GdkPixbufRep(pixbuf);
-@@ -190,7 +190,7 @@ Image::operator const SkBitmap&() {
- return *(this->operator const SkBitmap*());
- }
-
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- Image::operator GdkPixbuf*() {
- internal::ImageRep* rep = GetRepresentation(Image::kGdkPixbufRep);
- return rep->AsGdkPixbufRep()->pixbuf();
-@@ -237,7 +237,7 @@ internal::ImageRep* Image::GetRepresenta
- // Handle native-to-Skia conversion.
- if (rep_type == Image::kSkBitmapRep) {
- internal::SkBitmapRep* rep = NULL;
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- if (default_representation_ == Image::kGdkPixbufRep) {
- internal::GdkPixbufRep* pixbuf_rep = default_rep->AsGdkPixbufRep();
- rep = new internal::SkBitmapRep(
-@@ -261,7 +261,7 @@ internal::ImageRep* Image::GetRepresenta
- if (default_rep->type() == Image::kSkBitmapRep) {
- internal::SkBitmapRep* skia_rep = default_rep->AsSkBitmapRep();
- internal::ImageRep* native_rep = NULL;
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- if (rep_type == Image::kGdkPixbufRep) {
- GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(skia_rep->bitmap());
- native_rep = new internal::GdkPixbufRep(pixbuf);
diff --git a/chromium/patches/patch-ui_gfx_image.h b/chromium/patches/patch-ui_gfx_image.h
deleted file mode 100644
index c6f5144fdb..0000000000
--- a/chromium/patches/patch-ui_gfx_image.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ui_gfx_image.h,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- ui/gfx/image.h.orig 2011-05-24 08:01:59.000000000 +0000
-+++ ui/gfx/image.h
-@@ -43,7 +43,7 @@ class Image {
- // Creates a new image with the default representation. The object will take
- // ownership of the image.
- explicit Image(const SkBitmap* bitmap);
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- // Does not increase |pixbuf|'s reference count; expects to take ownership.
- explicit Image(GdkPixbuf* pixbuf);
- #elif defined(OS_MACOSX)
-@@ -57,7 +57,7 @@ class Image {
- // Conversion handlers.
- operator const SkBitmap*();
- operator const SkBitmap&();
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- operator GdkPixbuf*();
- #elif defined(OS_MACOSX)
- operator NSImage*();
diff --git a/chromium/patches/patch-ui_gfx_native__widget__types.h b/chromium/patches/patch-ui_gfx_native__widget__types.h
deleted file mode 100644
index 67ac543739..0000000000
--- a/chromium/patches/patch-ui_gfx_native__widget__types.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ui_gfx_native__widget__types.h,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- ui/gfx/native_widget_types.h.orig 2011-05-24 08:01:59.000000000 +0000
-+++ ui/gfx/native_widget_types.h
-@@ -97,7 +97,7 @@ typedef GdkRegion* NativeRegion;
-
- #if defined(OS_MACOSX)
- typedef NSImage NativeImageType;
--#elif defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
-+#elif (defined(OS_LINUX) || defined(OS_BSD)) && !defined(TOOLKIT_VIEWS)
- typedef GdkPixbuf NativeImageType;
- #else
- typedef SkBitmap NativeImageType;
diff --git a/chromium/patches/patch-ui_ui.gyp b/chromium/patches/patch-ui_ui.gyp
deleted file mode 100644
index c49606fe15..0000000000
--- a/chromium/patches/patch-ui_ui.gyp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ui_ui.gyp,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- ui/ui.gyp.orig 2011-05-24 08:01:59.000000000 +0000
-+++ ui/ui.gyp
-@@ -13,7 +13,7 @@
- ['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'],
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {'sources/': [
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {'sources/': [
- ['include', '/gtk/'],
- ['include', '_(gtk|linux|posix|skia|x)\\.cc$'],
- ['include', '/(gtk|x11)_[^/]*\\.cc$'],
diff --git a/chromium/patches/patch-ui_views_events_accelerator.cc b/chromium/patches/patch-ui_views_events_accelerator.cc
deleted file mode 100644
index 81c4e4b83c..0000000000
--- a/chromium/patches/patch-ui_views_events_accelerator.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ui_views_events_accelerator.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- ui/views/events/accelerator.cc.orig 2011-05-24 08:01:59.000000000 +0000
-+++ ui/views/events/accelerator.cc
-@@ -6,7 +6,7 @@
-
- #if defined(OS_WIN)
- #include <windows.h>
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_USES_GTK)
- #include <gdk/gdk.h>
- #endif
-
-@@ -99,7 +99,7 @@ string16 GetShortcutTextForAccelerator(c
- else
- key = LOWORD(::MapVirtualKeyW(accelerator.GetKeyCode(), MAPVK_VK_TO_CHAR));
- shortcut += key;
--#elif defined(OS_LINUX)
-+#elif defined(TOOLKIT_USES_GTK)
- const gchar* name = NULL;
- switch (accelerator.GetKeyCode()) {
- case ui::VKEY_OEM_2:
diff --git a/chromium/patches/patch-ui_views_focus_accelerator__handler.h b/chromium/patches/patch-ui_views_focus_accelerator__handler.h
deleted file mode 100644
index 85c6baa2e9..0000000000
--- a/chromium/patches/patch-ui_views_focus_accelerator__handler.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ui_views_focus_accelerator__handler.h,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- ui/views/focus/accelerator_handler.h.orig 2011-05-24 08:01:59.000000000 +0000
-+++ ui/views/focus/accelerator_handler.h
-@@ -8,7 +8,7 @@
-
- #include "build/build_config.h"
-
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- #include <gdk/gdk.h>
- #endif
-
diff --git a/chromium/patches/patch-ui_views_focus_focus__manager.cc b/chromium/patches/patch-ui_views_focus_focus__manager.cc
deleted file mode 100644
index 6c62c00f85..0000000000
--- a/chromium/patches/patch-ui_views_focus_focus__manager.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ui_views_focus_focus__manager.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- ui/views/focus/focus_manager.cc.orig 2011-05-24 08:01:59.000000000 +0000
-+++ ui/views/focus/focus_manager.cc
-@@ -8,7 +8,7 @@
-
- #include "build/build_config.h"
-
--#if defined(OS_LINUX)
-+#if defined(TOOLKIT_USES_GTK)
- #include <gtk/gtk.h>
- #endif
-
diff --git a/chromium/patches/patch-ui_views_views.gyp b/chromium/patches/patch-ui_views_views.gyp
deleted file mode 100644
index f9eab39b12..0000000000
--- a/chromium/patches/patch-ui_views_views.gyp
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-ui_views_views.gyp,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- ui/views/views.gyp.orig 2011-05-24 08:01:59.000000000 +0000
-+++ ui/views/views.gyp
-@@ -13,7 +13,7 @@
- ['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'],
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {'sources/': [
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {'sources/': [
- ['include', '/gtk/'],
- ['include', '_(gtk|linux|posix|skia|x)\\.cc$'],
- ['include', '/(gtk|x11)_[^/]*\\.cc$'],
-@@ -98,7 +98,7 @@
- '<(DEPTH)',
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '<(DEPTH)/build/linux/system.gyp:gtk',
- '<(DEPTH)/build/linux/system.gyp:x11',
-@@ -141,7 +141,7 @@
- '<(DEPTH)',
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '<(DEPTH)/build/linux/system.gyp:gtk',
- '<(DEPTH)/chrome/chrome.gyp:packed_resources',
diff --git a/chromium/patches/patch-v8_src_d8.gyp b/chromium/patches/patch-v8_src_d8.gyp
deleted file mode 100644
index 8eb79f95a4..0000000000
--- a/chromium/patches/patch-v8_src_d8.gyp
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-v8_src_d8.gyp,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- v8/src/d8.gyp.orig 2011-05-24 08:20:55.000000000 +0000
-+++ v8/src/d8.gyp
-@@ -46,7 +46,7 @@
- '<(SHARED_INTERMEDIATE_DIR)/d8-js.cc',
- ],
- 'conditions': [
-- [ 'OS=="linux" or OS=="mac" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ [ 'OS=="linux" or OS=="mac" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'sources': [ 'd8-posix.cc', ]
- }],
- ],
diff --git a/chromium/patches/patch-v8_src_globals.h b/chromium/patches/patch-v8_src_globals.h
deleted file mode 100644
index aebb8cd9bd..0000000000
--- a/chromium/patches/patch-v8_src_globals.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-v8_src_globals.h,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- v8/src/globals.h.orig 2011-05-24 08:20:55.000000000 +0000
-+++ v8/src/globals.h
-@@ -177,7 +177,8 @@ typedef byte* Address;
- #endif
-
- #if (defined(__APPLE__) && defined(__MACH__)) || \
-- defined(__FreeBSD__) || defined(__OpenBSD__)
-+ defined(__DragonFly__) || defined(__FreeBSD__) || \
-+ defined(__NetBSD__) || defined(__OpenBSD__)
- #define USING_BSD_ABI
- #endif
-
diff --git a/chromium/patches/patch-v8_src_heap.cc b/chromium/patches/patch-v8_src_heap.cc
deleted file mode 100644
index f4f6ff645a..0000000000
--- a/chromium/patches/patch-v8_src_heap.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-v8_src_heap.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- v8/src/heap.cc.orig 2011-05-24 08:20:55.000000000 +0000
-+++ v8/src/heap.cc
-@@ -87,7 +87,8 @@ intptr_t Heap::max_old_generation_size_
- int Heap::initial_semispace_size_ = 128*KB;
- intptr_t Heap::code_range_size_ = 0;
- intptr_t Heap::max_executable_size_ = max_old_generation_size_;
--#elif defined(V8_TARGET_ARCH_X64)
-+#elif defined(V8_TARGET_ARCH_X64) && \
-+ !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__)
- static const int default_max_semispace_size_ = 16*MB;
- intptr_t Heap::max_old_generation_size_ = 1*GB;
- int Heap::initial_semispace_size_ = 1*MB;
diff --git a/chromium/patches/patch-v8_src_platform-dragonfly.cc b/chromium/patches/patch-v8_src_platform-dragonfly.cc
deleted file mode 100644
index 7c88ffbf50..0000000000
--- a/chromium/patches/patch-v8_src_platform-dragonfly.cc
+++ /dev/null
@@ -1,691 +0,0 @@
-$NetBSD: patch-v8_src_platform-dragonfly.cc,v 1.1 2011/05/27 13:23:09 rxg Exp $
-
---- v8/src/platform-dragonfly.cc.orig 2011-05-26 07:37:15.000000000 +0000
-+++ v8/src/platform-dragonfly.cc
-@@ -0,0 +1,686 @@
-+// Copyright 2006-2008 the V8 project authors. All rights reserved.
-+// Redistribution and use in source and binary forms, with or without
-+// modification, are permitted provided that the following conditions are
-+// met:
-+//
-+// * Redistributions of source code must retain the above copyright
-+// notice, this list of conditions and the following disclaimer.
-+// * Redistributions in binary form must reproduce the above
-+// copyright notice, this list of conditions and the following
-+// disclaimer in the documentation and/or other materials provided
-+// with the distribution.
-+// * Neither the name of Google Inc. nor the names of its
-+// contributors may be used to endorse or promote products derived
-+// from this software without specific prior written permission.
-+//
-+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+
-+// Platform specific code for DragonFly goes here. For the POSIX comaptible parts
-+// the implementation is in platform-posix.cc.
-+
-+#include <pthread.h>
-+#include <semaphore.h>
-+#include <signal.h>
-+#include <sys/time.h>
-+#include <sys/resource.h>
-+#include <sys/types.h>
-+#include <sys/ucontext.h>
-+#include <stdlib.h>
-+
-+#include <sys/types.h> // mmap & munmap
-+#include <sys/mman.h> // mmap & munmap
-+#include <sys/stat.h> // open
-+#include <sys/fcntl.h> // open
-+#include <unistd.h> // getpagesize
-+#include <strings.h> // index
-+#include <errno.h>
-+#include <stdarg.h>
-+#include <limits.h>
-+
-+#undef MAP_TYPE
-+
-+#include "v8.h"
-+
-+#include "platform.h"
-+#include "vm-state-inl.h"
-+
-+
-+namespace v8 {
-+namespace internal {
-+
-+// 0 is never a valid thread id on DragonFly since tids and pids share a
-+// name space and pid 0 is used to kill the group (see man 2 kill).
-+static const pthread_t kNoThread = (pthread_t) 0;
-+
-+
-+double ceiling(double x) {
-+ // Correct as on OS X
-+ if (-1.0 < x && x < 0.0) {
-+ return -0.0;
-+ } else {
-+ return ceil(x);
-+ }
-+}
-+
-+
-+void OS::Setup() {
-+ // Seed the random number generator.
-+ // Convert the current time to a 64-bit integer first, before converting it
-+ // to an unsigned. Going directly can cause an overflow and the seed to be
-+ // set to all ones. The seed will be identical for different instances that
-+ // call this setup code within the same millisecond.
-+ uint64_t seed = static_cast<uint64_t>(TimeCurrentMillis());
-+ srandom(static_cast<unsigned int>(seed));
-+}
-+
-+
-+void OS::ReleaseStore(volatile AtomicWord* ptr, AtomicWord value) {
-+ __asm__ __volatile__("" : : : "memory");
-+ *ptr = value;
-+}
-+
-+
-+uint64_t OS::CpuFeaturesImpliedByPlatform() {
-+ return 0; // DragonFly runs on anything.
-+}
-+
-+
-+int OS::ActivationFrameAlignment() {
-+ // 16 byte alignment on DragonFly
-+ return 16;
-+}
-+
-+
-+const char* OS::LocalTimezone(double time) {
-+ if (isnan(time)) return "";
-+ time_t tv = static_cast<time_t>(floor(time/msPerSecond));
-+ struct tm* t = localtime(&tv);
-+ if (NULL == t) return "";
-+ return t->tm_zone;
-+}
-+
-+
-+double OS::LocalTimeOffset() {
-+ time_t tv = time(NULL);
-+ struct tm* t = localtime(&tv);
-+ // tm_gmtoff includes any daylight savings offset, so subtract it.
-+ return static_cast<double>(t->tm_gmtoff * msPerSecond -
-+ (t->tm_isdst > 0 ? 3600 * msPerSecond : 0));
-+}
-+
-+
-+// We keep the lowest and highest addresses mapped as a quick way of
-+// determining that pointers are outside the heap (used mostly in assertions
-+// and verification). The estimate is conservative, ie, not all addresses in
-+// 'allocated' space are actually allocated to our heap. The range is
-+// [lowest, highest), inclusive on the low and and exclusive on the high end.
-+static void* lowest_ever_allocated = reinterpret_cast<void*>(-1);
-+static void* highest_ever_allocated = reinterpret_cast<void*>(0);
-+
-+
-+static void UpdateAllocatedSpaceLimits(void* address, int size) {
-+ lowest_ever_allocated = Min(lowest_ever_allocated, address);
-+ highest_ever_allocated =
-+ Max(highest_ever_allocated,
-+ reinterpret_cast<void*>(reinterpret_cast<char*>(address) + size));
-+}
-+
-+
-+bool OS::IsOutsideAllocatedSpace(void* address) {
-+ return address < lowest_ever_allocated || address >= highest_ever_allocated;
-+}
-+
-+
-+size_t OS::AllocateAlignment() {
-+ return getpagesize();
-+}
-+
-+
-+void* OS::Allocate(const size_t requested,
-+ size_t* allocated,
-+ bool executable) {
-+ const size_t msize = RoundUp(requested, getpagesize());
-+ int prot = PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0);
-+ void* mbase = mmap(NULL, msize, prot, MAP_PRIVATE | MAP_ANON, -1, 0);
-+
-+ if (mbase == MAP_FAILED) {
-+ LOG(StringEvent("OS::Allocate", "mmap failed"));
-+ return NULL;
-+ }
-+ *allocated = msize;
-+ UpdateAllocatedSpaceLimits(mbase, msize);
-+ return mbase;
-+}
-+
-+
-+void OS::Free(void* buf, const size_t length) {
-+ // TODO(1240712): munmap has a return value which is ignored here.
-+ int result = munmap(buf, length);
-+ USE(result);
-+ ASSERT(result == 0);
-+}
-+
-+
-+#ifdef ENABLE_HEAP_PROTECTION
-+
-+void OS::Protect(void* address, size_t size) {
-+ UNIMPLEMENTED();
-+}
-+
-+
-+void OS::Unprotect(void* address, size_t size, bool is_executable) {
-+ UNIMPLEMENTED();
-+}
-+
-+#endif
-+
-+
-+void OS::Sleep(int milliseconds) {
-+ unsigned int ms = static_cast<unsigned int>(milliseconds);
-+ usleep(1000 * ms);
-+}
-+
-+
-+void OS::Abort() {
-+ // Redirect to std abort to signal abnormal program termination.
-+ abort();
-+}
-+
-+
-+void OS::DebugBreak() {
-+#if (defined(__arm__) || defined(__thumb__))
-+# if defined(CAN_USE_ARMV5_INSTRUCTIONS)
-+ asm("bkpt 0");
-+# endif
-+#else
-+ asm("int $3");
-+#endif
-+}
-+
-+
-+class PosixMemoryMappedFile : public OS::MemoryMappedFile {
-+ public:
-+ PosixMemoryMappedFile(FILE* file, void* memory, int size)
-+ : file_(file), memory_(memory), size_(size) { }
-+ virtual ~PosixMemoryMappedFile();
-+ virtual void* memory() { return memory_; }
-+ virtual int size() { return size_; }
-+ private:
-+ FILE* file_;
-+ void* memory_;
-+ int size_;
-+};
-+
-+
-+OS::MemoryMappedFile* OS::MemoryMappedFile::open(const char* name) {
-+ FILE* file = fopen(name, "w+");
-+ if (file == NULL) return NULL;
-+
-+ fseek(file, 0, SEEK_END);
-+ int size = ftell(file);
-+
-+ void* memory =
-+ mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fileno(file), 0);
-+ return new PosixMemoryMappedFile(file, memory, size);
-+}
-+
-+
-+OS::MemoryMappedFile* OS::MemoryMappedFile::create(const char* name, int size,
-+ void* initial) {
-+ FILE* file = fopen(name, "w+");
-+ if (file == NULL) return NULL;
-+ int result = fwrite(initial, size, 1, file);
-+ if (result < 1) {
-+ fclose(file);
-+ return NULL;
-+ }
-+ void* memory =
-+ mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fileno(file), 0);
-+ return new PosixMemoryMappedFile(file, memory, size);
-+}
-+
-+
-+PosixMemoryMappedFile::~PosixMemoryMappedFile() {
-+ if (memory_) munmap(memory_, size_);
-+ fclose(file_);
-+}
-+
-+
-+#ifdef ENABLE_LOGGING_AND_PROFILING
-+static unsigned StringToLong(char* buffer) {
-+ return static_cast<unsigned>(strtol(buffer, NULL, 16)); // NOLINT
-+}
-+#endif
-+
-+
-+void OS::LogSharedLibraryAddresses() {
-+#ifdef ENABLE_LOGGING_AND_PROFILING
-+ static const int MAP_LENGTH = 1024;
-+ int fd = open("/proc/self/maps", O_RDONLY);
-+ if (fd < 0) return;
-+ while (true) {
-+ char addr_buffer[11];
-+ addr_buffer[0] = '0';
-+ addr_buffer[1] = 'x';
-+ addr_buffer[10] = 0;
-+ int result = read(fd, addr_buffer + 2, 8);
-+ if (result < 8) break;
-+ unsigned start = StringToLong(addr_buffer);
-+ result = read(fd, addr_buffer + 2, 1);
-+ if (result < 1) break;
-+ if (addr_buffer[2] != '-') break;
-+ result = read(fd, addr_buffer + 2, 8);
-+ if (result < 8) break;
-+ unsigned end = StringToLong(addr_buffer);
-+ char buffer[MAP_LENGTH];
-+ int bytes_read = -1;
-+ do {
-+ bytes_read++;
-+ if (bytes_read >= MAP_LENGTH - 1)
-+ break;
-+ result = read(fd, buffer + bytes_read, 1);
-+ if (result < 1) break;
-+ } while (buffer[bytes_read] != '\n');
-+ buffer[bytes_read] = 0;
-+ // Ignore mappings that are not executable.
-+ if (buffer[3] != 'x') continue;
-+ char* start_of_path = index(buffer, '/');
-+ // There may be no filename in this line. Skip to next.
-+ if (start_of_path == NULL) continue;
-+ buffer[bytes_read] = 0;
-+ LOG(SharedLibraryEvent(start_of_path, start, end));
-+ }
-+ close(fd);
-+#endif
-+}
-+
-+
-+void OS::SignalCodeMovingGC() {
-+}
-+
-+
-+int OS::StackWalk(Vector<OS::StackFrame> frames) {
-+ UNIMPLEMENTED();
-+ return 0;
-+}
-+
-+// Constants used for mmap.
-+static const int kMmapFd = -1;
-+static const int kMmapFdOffset = 0;
-+
-+
-+VirtualMemory::VirtualMemory(size_t size) {
-+ address_ = mmap(NULL, size, PROT_NONE,
-+ MAP_PRIVATE | MAP_ANON,
-+ kMmapFd, kMmapFdOffset);
-+ size_ = size;
-+}
-+
-+
-+VirtualMemory::~VirtualMemory() {
-+ if (IsReserved()) {
-+ if (0 == munmap(address(), size())) address_ = MAP_FAILED;
-+ }
-+}
-+
-+
-+bool VirtualMemory::IsReserved() {
-+ return address_ != MAP_FAILED;
-+}
-+
-+
-+bool VirtualMemory::Commit(void* address, size_t size, bool executable) {
-+ int prot = PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0);
-+ if (MAP_FAILED == mmap(address, size, prot,
-+ MAP_PRIVATE | MAP_ANON | MAP_FIXED,
-+ kMmapFd, kMmapFdOffset)) {
-+ return false;
-+ }
-+
-+ UpdateAllocatedSpaceLimits(address, size);
-+ return true;
-+}
-+
-+
-+bool VirtualMemory::Uncommit(void* address, size_t size) {
-+ return mmap(address, size, PROT_NONE,
-+ MAP_PRIVATE | MAP_ANON | MAP_NORESERVE | MAP_FIXED,
-+ kMmapFd, kMmapFdOffset) != MAP_FAILED;
-+}
-+
-+
-+class ThreadHandle::PlatformData : public Malloced {
-+ public:
-+ explicit PlatformData(ThreadHandle::Kind kind) {
-+ Initialize(kind);
-+ }
-+
-+ void Initialize(ThreadHandle::Kind kind) {
-+ switch (kind) {
-+ case ThreadHandle::SELF: thread_ = pthread_self(); break;
-+ case ThreadHandle::INVALID: thread_ = kNoThread; break;
-+ }
-+ }
-+ pthread_t thread_; // Thread handle for pthread.
-+};
-+
-+
-+ThreadHandle::ThreadHandle(Kind kind) {
-+ data_ = new PlatformData(kind);
-+}
-+
-+
-+void ThreadHandle::Initialize(ThreadHandle::Kind kind) {
-+ data_->Initialize(kind);
-+}
-+
-+
-+ThreadHandle::~ThreadHandle() {
-+ delete data_;
-+}
-+
-+
-+bool ThreadHandle::IsSelf() const {
-+ return pthread_equal(data_->thread_, pthread_self());
-+}
-+
-+
-+bool ThreadHandle::IsValid() const {
-+ return data_->thread_ != kNoThread;
-+}
-+
-+
-+Thread::Thread() : ThreadHandle(ThreadHandle::INVALID) {
-+ set_name("v8:<unknown>");
-+}
-+
-+
-+Thread::Thread(const char* name) : ThreadHandle(ThreadHandle::INVALID) {
-+ set_name(name);
-+}
-+
-+
-+Thread::~Thread() {
-+}
-+
-+
-+static void* ThreadEntry(void* arg) {
-+ Thread* thread = reinterpret_cast<Thread*>(arg);
-+ // This is also initialized by the first argument to pthread_create() but we
-+ // don't know which thread will run first (the original thread or the new
-+ // one) so we initialize it here too.
-+ thread->thread_handle_data()->thread_ = pthread_self();
-+ ASSERT(thread->IsValid());
-+ thread->Run();
-+ return NULL;
-+}
-+
-+
-+void Thread::set_name(const char* name) {
-+ strncpy(name_, name, sizeof(name_));
-+ name_[sizeof(name_) - 1] = '\0';
-+}
-+
-+
-+void Thread::Start() {
-+ pthread_create(&thread_handle_data()->thread_, NULL, ThreadEntry, this);
-+ ASSERT(IsValid());
-+}
-+
-+
-+void Thread::Join() {
-+ pthread_join(thread_handle_data()->thread_, NULL);
-+}
-+
-+
-+Thread::LocalStorageKey Thread::CreateThreadLocalKey() {
-+ pthread_key_t key;
-+ int result = pthread_key_create(&key, NULL);
-+ USE(result);
-+ ASSERT(result == 0);
-+ return static_cast<LocalStorageKey>(key);
-+}
-+
-+
-+void Thread::DeleteThreadLocalKey(LocalStorageKey key) {
-+ pthread_key_t pthread_key = static_cast<pthread_key_t>(key);
-+ int result = pthread_key_delete(pthread_key);
-+ USE(result);
-+ ASSERT(result == 0);
-+}
-+
-+
-+void* Thread::GetThreadLocal(LocalStorageKey key) {
-+ pthread_key_t pthread_key = static_cast<pthread_key_t>(key);
-+ return pthread_getspecific(pthread_key);
-+}
-+
-+
-+void Thread::SetThreadLocal(LocalStorageKey key, void* value) {
-+ pthread_key_t pthread_key = static_cast<pthread_key_t>(key);
-+ pthread_setspecific(pthread_key, value);
-+}
-+
-+
-+void Thread::YieldCPU() {
-+ sched_yield();
-+}
-+
-+
-+class DragonFlyMutex : public Mutex {
-+ public:
-+
-+ DragonFlyMutex() {
-+ pthread_mutexattr_t attrs;
-+ int result = pthread_mutexattr_init(&attrs);
-+ ASSERT(result == 0);
-+ result = pthread_mutexattr_settype(&attrs, PTHREAD_MUTEX_RECURSIVE);
-+ ASSERT(result == 0);
-+ result = pthread_mutex_init(&mutex_, &attrs);
-+ ASSERT(result == 0);
-+ }
-+
-+ virtual ~DragonFlyMutex() { pthread_mutex_destroy(&mutex_); }
-+
-+ virtual int Lock() {
-+ int result = pthread_mutex_lock(&mutex_);
-+ return result;
-+ }
-+
-+ virtual int Unlock() {
-+ int result = pthread_mutex_unlock(&mutex_);
-+ return result;
-+ }
-+
-+ virtual bool TryLock() {
-+ int result = pthread_mutex_trylock(&mutex_);
-+ return result;
-+ }
-+
-+ private:
-+ pthread_mutex_t mutex_; // Pthread mutex for POSIX platforms.
-+};
-+
-+
-+Mutex* OS::CreateMutex() {
-+ return new DragonFlyMutex();
-+}
-+
-+
-+class DragonFlySemaphore : public Semaphore {
-+ public:
-+ explicit DragonFlySemaphore(int count) { sem_init(&sem_, 0, count); }
-+ virtual ~DragonFlySemaphore() { sem_destroy(&sem_); }
-+
-+ virtual void Wait();
-+ virtual bool Wait(int timeout);
-+ virtual void Signal() { sem_post(&sem_); }
-+ private:
-+ sem_t sem_;
-+};
-+
-+
-+void DragonFlySemaphore::Wait() {
-+ while (true) {
-+ int result = sem_wait(&sem_);
-+ if (result == 0) return; // Successfully got semaphore.
-+ CHECK(result == -1 && errno == EINTR); // Signal caused spurious wakeup.
-+ }
-+}
-+
-+
-+bool DragonFlySemaphore::Wait(int timeout) {
-+ const long kOneSecondMicros = 1000000; // NOLINT
-+
-+ // Split timeout into second and nanosecond parts.
-+ struct timeval delta;
-+ delta.tv_usec = timeout % kOneSecondMicros;
-+ delta.tv_sec = timeout / kOneSecondMicros;
-+
-+ struct timeval current_time;
-+ // Get the current time.
-+ if (gettimeofday(¤t_time, NULL) == -1) {
-+ return false;
-+ }
-+
-+ // Calculate time for end of timeout.
-+ struct timeval end_time;
-+ timeradd(¤t_time, &delta, &end_time);
-+
-+ struct timespec ts;
-+ TIMEVAL_TO_TIMESPEC(&end_time, &ts);
-+ while (true) {
-+ int result = sem_trywait(&sem_);
-+ if (result == 0) return true; // Successfully got semaphore.
-+ if (result == -1 && errno == ETIMEDOUT) return false; // Timeout.
-+ CHECK(result == -1 && errno == EINTR); // Signal caused spurious wakeup.
-+ }
-+}
-+
-+
-+Semaphore* OS::CreateSemaphore(int count) {
-+ return new DragonFlySemaphore(count);
-+}
-+
-+
-+#ifdef ENABLE_LOGGING_AND_PROFILING
-+
-+static Sampler* active_sampler_ = NULL;
-+static pthread_t vm_tid_ = 0;
-+
-+static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
-+ USE(info);
-+ if (signal != SIGPROF) return;
-+ if (active_sampler_ == NULL || !active_sampler_->IsActive()) return;
-+ if (vm_tid_ != pthread_self()) return;
-+
-+ TickSample sample_obj;
-+ TickSample* sample = CpuProfiler::TickSampleEvent();
-+ if (sample == NULL) sample = &sample_obj;
-+
-+
-+ // We always sample the VM state.
-+ sample->state = Top::current_vm_state();
-+
-+ // If profiling, we extract the current pc and sp.
-+ if (active_sampler_->IsProfiling()) {
-+ // Extracting the sample from the context is extremely machine dependent.
-+ ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(context);
-+ mcontext_t& mcontext = ucontext->uc_mcontext;
-+#if V8_HOST_ARCH_IA32
-+ sample->pc = reinterpret_cast<Address>(mcontext.mc_eip);
-+ sample->sp = reinterpret_cast<Address>(mcontext.mc_esp);
-+ sample->fp = reinterpret_cast<Address>(mcontext.mc_ebp);
-+#elif V8_HOST_ARCH_X64
-+ sample->pc = reinterpret_cast<Address>(mcontext.mc_rip);
-+ sample->sp = reinterpret_cast<Address>(mcontext.mc_rsp);
-+ sample->fp = reinterpret_cast<Address>(mcontext.mc_rbp);
-+#else
-+ UNIMPLEMENTED();
-+#endif
-+ active_sampler_->SampleStack(sample);
-+ }
-+
-+ active_sampler_->Tick(sample);
-+}
-+
-+
-+class Sampler::PlatformData : public Malloced {
-+ public:
-+ PlatformData() {
-+ signal_handler_installed_ = false;
-+ }
-+
-+ bool signal_handler_installed_;
-+ struct sigaction old_signal_handler_;
-+ struct itimerval old_timer_value_;
-+};
-+
-+
-+Sampler::Sampler(int interval)
-+ : interval_(interval),
-+ profiling_(false),
-+ active_(false),
-+ samples_taken_(0) {
-+ data_ = new PlatformData();
-+}
-+
-+
-+Sampler::~Sampler() {
-+ delete data_;
-+}
-+
-+
-+void Sampler::Start() {
-+ // There can only be one active sampler at the time on POSIX
-+ // platforms.
-+ if (active_sampler_ != NULL) return;
-+
-+ // Request profiling signals.
-+ struct sigaction sa;
-+ sa.sa_sigaction = ProfilerSignalHandler;
-+ sigemptyset(&sa.sa_mask);
-+ sa.sa_flags = SA_SIGINFO;
-+ if (sigaction(SIGPROF, &sa, &data_->old_signal_handler_) != 0) return;
-+ data_->signal_handler_installed_ = true;
-+
-+ // Set the itimer to generate a tick for each interval.
-+ itimerval itimer;
-+ itimer.it_interval.tv_sec = interval_ / 1000;
-+ itimer.it_interval.tv_usec = (interval_ % 1000) * 1000;
-+ itimer.it_value.tv_sec = itimer.it_interval.tv_sec;
-+ itimer.it_value.tv_usec = itimer.it_interval.tv_usec;
-+ setitimer(ITIMER_PROF, &itimer, &data_->old_timer_value_);
-+
-+ // Set this sampler as the active sampler.
-+ active_sampler_ = this;
-+ active_ = true;
-+}
-+
-+
-+void Sampler::Stop() {
-+ // Restore old signal handler
-+ if (data_->signal_handler_installed_) {
-+ setitimer(ITIMER_PROF, &data_->old_timer_value_, NULL);
-+ sigaction(SIGPROF, &data_->old_signal_handler_, 0);
-+ data_->signal_handler_installed_ = false;
-+ }
-+
-+ // This sampler is no longer the active sampler.
-+ active_sampler_ = NULL;
-+ active_ = false;
-+}
-+
-+#endif // ENABLE_LOGGING_AND_PROFILING
-+
-+} } // namespace v8::internal
diff --git a/chromium/patches/patch-v8_src_platform-netbsd.cc b/chromium/patches/patch-v8_src_platform-netbsd.cc
deleted file mode 100644
index 4336ad16ce..0000000000
--- a/chromium/patches/patch-v8_src_platform-netbsd.cc
+++ /dev/null
@@ -1,691 +0,0 @@
-$NetBSD: patch-v8_src_platform-netbsd.cc,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- v8/src/platform-netbsd.cc.orig 2011-04-26 05:17:25.000000000 +0000
-+++ v8/src/platform-netbsd.cc
-@@ -0,0 +1,686 @@
-+// Copyright 2006-2009 the V8 project authors. All rights reserved.
-+// Redistribution and use in source and binary forms, with or without
-+// modification, are permitted provided that the following conditions are
-+// met:
-+//
-+// * Redistributions of source code must retain the above copyright
-+// notice, this list of conditions and the following disclaimer.
-+// * Redistributions in binary form must reproduce the above
-+// copyright notice, this list of conditions and the following
-+// disclaimer in the documentation and/or other materials provided
-+// with the distribution.
-+// * Neither the name of Google Inc. nor the names of its
-+// contributors may be used to endorse or promote products derived
-+// from this software without specific prior written permission.
-+//
-+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-+
-+// Platform specific code for NetBSD goes here. For the POSIX comaptible parts
-+// the implementation is in platform-posix.cc.
-+
-+#include <pthread.h>
-+#include <semaphore.h>
-+#include <signal.h>
-+#include <sys/time.h>
-+#include <sys/resource.h>
-+#include <sys/types.h>
-+#include <sys/ucontext.h>
-+#include <stdlib.h>
-+
-+#include <sys/types.h> // mmap & munmap
-+#include <sys/mman.h> // mmap & munmap
-+#include <sys/stat.h> // open
-+#include <sys/fcntl.h> // open
-+#include <unistd.h> // getpagesize
-+#include <strings.h> // index
-+#include <errno.h>
-+#include <stdarg.h>
-+#include <limits.h>
-+
-+#undef MAP_TYPE
-+
-+#include "v8.h"
-+
-+#include "platform.h"
-+#include "vm-state-inl.h"
-+
-+
-+namespace v8 {
-+namespace internal {
-+
-+// 0 is never a valid thread id on NetBSD since tids and pids share a
-+// name space and pid 0 is used to kill the group (see man 2 kill).
-+static const pthread_t kNoThread = (pthread_t) 0;
-+
-+
-+double ceiling(double x) {
-+ // Correct as on OS X
-+ if (-1.0 < x && x < 0.0) {
-+ return -0.0;
-+ } else {
-+ return ceil(x);
-+ }
-+}
-+
-+
-+void OS::Setup() {
-+ // Seed the random number generator.
-+ // Convert the current time to a 64-bit integer first, before converting it
-+ // to an unsigned. Going directly can cause an overflow and the seed to be
-+ // set to all ones. The seed will be identical for different instances that
-+ // call this setup code within the same millisecond.
-+ uint64_t seed = static_cast<uint64_t>(TimeCurrentMillis());
-+ srandom(static_cast<unsigned int>(seed));
-+}
-+
-+
-+void OS::ReleaseStore(volatile AtomicWord* ptr, AtomicWord value) {
-+ __asm__ __volatile__("" : : : "memory");
-+ *ptr = value;
-+}
-+
-+
-+uint64_t OS::CpuFeaturesImpliedByPlatform() {
-+ return 0; // NetBSD runs on anything.
-+}
-+
-+
-+int OS::ActivationFrameAlignment() {
-+ // 16 byte alignment on NetBSD
-+ return 16;
-+}
-+
-+
-+const char* OS::LocalTimezone(double time) {
-+ if (isnan(time)) return "";
-+ time_t tv = static_cast<time_t>(floor(time/msPerSecond));
-+ struct tm* t = localtime(&tv);
-+ if (NULL == t) return "";
-+ return t->tm_zone;
-+}
-+
-+
-+double OS::LocalTimeOffset() {
-+ time_t tv = time(NULL);
-+ struct tm* t = localtime(&tv);
-+ // tm_gmtoff includes any daylight savings offset, so subtract it.
-+ return static_cast<double>(t->tm_gmtoff * msPerSecond -
-+ (t->tm_isdst > 0 ? 3600 * msPerSecond : 0));
-+}
-+
-+
-+// We keep the lowest and highest addresses mapped as a quick way of
-+// determining that pointers are outside the heap (used mostly in assertions
-+// and verification). The estimate is conservative, ie, not all addresses in
-+// 'allocated' space are actually allocated to our heap. The range is
-+// [lowest, highest), inclusive on the low and and exclusive on the high end.
-+static void* lowest_ever_allocated = reinterpret_cast<void*>(-1);
-+static void* highest_ever_allocated = reinterpret_cast<void*>(0);
-+
-+
-+static void UpdateAllocatedSpaceLimits(void* address, int size) {
-+ lowest_ever_allocated = Min(lowest_ever_allocated, address);
-+ highest_ever_allocated =
-+ Max(highest_ever_allocated,
-+ reinterpret_cast<void*>(reinterpret_cast<char*>(address) + size));
-+}
-+
-+
-+bool OS::IsOutsideAllocatedSpace(void* address) {
-+ return address < lowest_ever_allocated || address >= highest_ever_allocated;
-+}
-+
-+
-+size_t OS::AllocateAlignment() {
-+ return getpagesize();
-+}
-+
-+
-+void* OS::Allocate(const size_t requested,
-+ size_t* allocated,
-+ bool executable) {
-+ const size_t msize = RoundUp(requested, getpagesize());
-+ int prot = PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0);
-+ void* mbase = mmap(NULL, msize, prot, MAP_PRIVATE | MAP_ANON, -1, 0);
-+
-+ if (mbase == MAP_FAILED) {
-+ LOG(StringEvent("OS::Allocate", "mmap failed"));
-+ return NULL;
-+ }
-+ *allocated = msize;
-+ UpdateAllocatedSpaceLimits(mbase, msize);
-+ return mbase;
-+}
-+
-+
-+void OS::Free(void* buf, const size_t length) {
-+ // TODO(1240712): munmap has a return value which is ignored here.
-+ int result = munmap(buf, length);
-+ USE(result);
-+ ASSERT(result == 0);
-+}
-+
-+
-+#ifdef ENABLE_HEAP_PROTECTION
-+
-+void OS::Protect(void* address, size_t size) {
-+ UNIMPLEMENTED();
-+}
-+
-+
-+void OS::Unprotect(void* address, size_t size, bool is_executable) {
-+ UNIMPLEMENTED();
-+}
-+
-+#endif
-+
-+
-+void OS::Sleep(int milliseconds) {
-+ unsigned int ms = static_cast<unsigned int>(milliseconds);
-+ usleep(1000 * ms);
-+}
-+
-+
-+void OS::Abort() {
-+ // Redirect to std abort to signal abnormal program termination.
-+ abort();
-+}
-+
-+
-+void OS::DebugBreak() {
-+ asm("int $3");
-+}
-+
-+
-+class PosixMemoryMappedFile : public OS::MemoryMappedFile {
-+ public:
-+ PosixMemoryMappedFile(FILE* file, void* memory, int size)
-+ : file_(file), memory_(memory), size_(size) { }
-+ virtual ~PosixMemoryMappedFile();
-+ virtual void* memory() { return memory_; }
-+ virtual int size() { return size_; }
-+ private:
-+ FILE* file_;
-+ void* memory_;
-+ int size_;
-+};
-+
-+
-+OS::MemoryMappedFile* OS::MemoryMappedFile::open(const char* name) {
-+ FILE* file = fopen(name, "w+");
-+ if (file == NULL) return NULL;
-+
-+ fseek(file, 0, SEEK_END);
-+ int size = ftell(file);
-+
-+ void* memory =
-+ mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fileno(file), 0);
-+ return new PosixMemoryMappedFile(file, memory, size);
-+}
-+
-+
-+OS::MemoryMappedFile* OS::MemoryMappedFile::create(const char* name, int size,
-+ void* initial) {
-+ FILE* file = fopen(name, "w+");
-+ if (file == NULL) return NULL;
-+ int result = fwrite(initial, size, 1, file);
-+ if (result < 1) {
-+ fclose(file);
-+ return NULL;
-+ }
-+ void* memory =
-+ mmap(0, size, PROT_READ | PROT_WRITE, MAP_SHARED, fileno(file), 0);
-+ return new PosixMemoryMappedFile(file, memory, size);
-+}
-+
-+
-+PosixMemoryMappedFile::~PosixMemoryMappedFile() {
-+ if (memory_) munmap(memory_, size_);
-+ fclose(file_);
-+}
-+
-+
-+#ifdef ENABLE_LOGGING_AND_PROFILING
-+static unsigned StringToLong(char* buffer) {
-+ return static_cast<unsigned>(strtol(buffer, NULL, 16)); // NOLINT
-+}
-+#endif
-+
-+
-+void OS::LogSharedLibraryAddresses() {
-+#ifdef ENABLE_LOGGING_AND_PROFILING
-+ static const int MAP_LENGTH = 1024;
-+ int fd = open("/proc/self/maps", O_RDONLY);
-+ if (fd < 0) return;
-+ while (true) {
-+ char addr_buffer[11];
-+ addr_buffer[0] = '0';
-+ addr_buffer[1] = 'x';
-+ addr_buffer[10] = 0;
-+ int result = read(fd, addr_buffer + 2, 8);
-+ if (result < 8) break;
-+ unsigned start = StringToLong(addr_buffer);
-+ result = read(fd, addr_buffer + 2, 1);
-+ if (result < 1) break;
-+ if (addr_buffer[2] != '-') break;
-+ result = read(fd, addr_buffer + 2, 8);
-+ if (result < 8) break;
-+ unsigned end = StringToLong(addr_buffer);
-+ char buffer[MAP_LENGTH];
-+ int bytes_read = -1;
-+ do {
-+ bytes_read++;
-+ if (bytes_read >= MAP_LENGTH - 1)
-+ break;
-+ result = read(fd, buffer + bytes_read, 1);
-+ if (result < 1) break;
-+ } while (buffer[bytes_read] != '\n');
-+ buffer[bytes_read] = 0;
-+ // Ignore mappings that are not executable.
-+ if (buffer[3] != 'x') continue;
-+ char* start_of_path = index(buffer, '/');
-+ // There may be no filename in this line. Skip to next.
-+ if (start_of_path == NULL) continue;
-+ buffer[bytes_read] = 0;
-+ LOG(SharedLibraryEvent(start_of_path, start, end));
-+ }
-+ close(fd);
-+#endif
-+}
-+
-+
-+void OS::SignalCodeMovingGC() {
-+}
-+
-+
-+int OS::StackWalk(Vector<OS::StackFrame> frames) {
-+ UNIMPLEMENTED();
-+ return 1;
-+}
-+
-+
-+// Constants used for mmap.
-+static const int kMmapFd = -1;
-+static const int kMmapFdOffset = 0;
-+
-+
-+VirtualMemory::VirtualMemory(size_t size) {
-+ address_ = mmap(NULL, size, PROT_NONE,
-+ MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
-+ kMmapFd, kMmapFdOffset);
-+ size_ = size;
-+}
-+
-+
-+VirtualMemory::~VirtualMemory() {
-+ if (IsReserved()) {
-+ if (0 == munmap(address(), size())) address_ = MAP_FAILED;
-+ }
-+}
-+
-+
-+bool VirtualMemory::IsReserved() {
-+ return address_ != MAP_FAILED;
-+}
-+
-+
-+bool VirtualMemory::Commit(void* address, size_t size, bool executable) {
-+ int prot = PROT_READ | PROT_WRITE | (executable ? PROT_EXEC : 0);
-+ if (MAP_FAILED == mmap(address, size, prot,
-+ MAP_PRIVATE | MAP_ANON | MAP_FIXED,
-+ kMmapFd, kMmapFdOffset)) {
-+ return false;
-+ }
-+
-+ UpdateAllocatedSpaceLimits(address, size);
-+ return true;
-+}
-+
-+
-+bool VirtualMemory::Uncommit(void* address, size_t size) {
-+ return mmap(address, size, PROT_NONE,
-+ MAP_PRIVATE | MAP_ANON | MAP_NORESERVE,
-+ kMmapFd, kMmapFdOffset) != MAP_FAILED;
-+}
-+
-+
-+class ThreadHandle::PlatformData : public Malloced {
-+ public:
-+ explicit PlatformData(ThreadHandle::Kind kind) {
-+ Initialize(kind);
-+ }
-+
-+ void Initialize(ThreadHandle::Kind kind) {
-+ switch (kind) {
-+ case ThreadHandle::SELF: thread_ = pthread_self(); break;
-+ case ThreadHandle::INVALID: thread_ = kNoThread; break;
-+ }
-+ }
-+ pthread_t thread_; // Thread handle for pthread.
-+};
-+
-+
-+ThreadHandle::ThreadHandle(Kind kind) {
-+ data_ = new PlatformData(kind);
-+}
-+
-+
-+void ThreadHandle::Initialize(ThreadHandle::Kind kind) {
-+ data_->Initialize(kind);
-+}
-+
-+
-+ThreadHandle::~ThreadHandle() {
-+ delete data_;
-+}
-+
-+
-+bool ThreadHandle::IsSelf() const {
-+ return pthread_equal(data_->thread_, pthread_self());
-+}
-+
-+
-+bool ThreadHandle::IsValid() const {
-+ return data_->thread_ != kNoThread;
-+}
-+
-+
-+Thread::Thread() : ThreadHandle(ThreadHandle::INVALID) {
-+ set_name("v8:<unknown>");
-+}
-+
-+
-+Thread::Thread(const char* name) : ThreadHandle(ThreadHandle::INVALID) {
-+ set_name(name);
-+}
-+
-+
-+Thread::~Thread() {
-+}
-+
-+
-+static void* ThreadEntry(void* arg) {
-+ Thread* thread = reinterpret_cast<Thread*>(arg);
-+ // This is also initialized by the first argument to pthread_create() but we
-+ // don't know which thread will run first (the original thread or the new
-+ // one) so we initialize it here too.
-+ thread->thread_handle_data()->thread_ = pthread_self();
-+ ASSERT(thread->IsValid());
-+ thread->Run();
-+ return NULL;
-+}
-+
-+
-+void Thread::set_name(const char* name) {
-+ strncpy(name_, name, sizeof(name_));
-+ name_[sizeof(name_) - 1] = '\0';
-+}
-+
-+
-+void Thread::Start() {
-+ pthread_create(&thread_handle_data()->thread_, NULL, ThreadEntry, this);
-+ ASSERT(IsValid());
-+}
-+
-+
-+void Thread::Join() {
-+ pthread_join(thread_handle_data()->thread_, NULL);
-+}
-+
-+
-+Thread::LocalStorageKey Thread::CreateThreadLocalKey() {
-+ pthread_key_t key;
-+ int result = pthread_key_create(&key, NULL);
-+ USE(result);
-+ ASSERT(result == 0);
-+ return static_cast<LocalStorageKey>(key);
-+}
-+
-+
-+void Thread::DeleteThreadLocalKey(LocalStorageKey key) {
-+ pthread_key_t pthread_key = static_cast<pthread_key_t>(key);
-+ int result = pthread_key_delete(pthread_key);
-+ USE(result);
-+ ASSERT(result == 0);
-+}
-+
-+
-+void* Thread::GetThreadLocal(LocalStorageKey key) {
-+ pthread_key_t pthread_key = static_cast<pthread_key_t>(key);
-+ return pthread_getspecific(pthread_key);
-+}
-+
-+
-+void Thread::SetThreadLocal(LocalStorageKey key, void* value) {
-+ pthread_key_t pthread_key = static_cast<pthread_key_t>(key);
-+ pthread_setspecific(pthread_key, value);
-+}
-+
-+
-+void Thread::YieldCPU() {
-+ sched_yield();
-+}
-+
-+
-+class NetBSDMutex : public Mutex {
-+ public:
-+
-+ NetBSDMutex() {
-+ pthread_mutexattr_t attrs;
-+ int result = pthread_mutexattr_init(&attrs);
-+ ASSERT(result == 0);
-+ result = pthread_mutexattr_settype(&attrs, PTHREAD_MUTEX_RECURSIVE);
-+ ASSERT(result == 0);
-+ result = pthread_mutex_init(&mutex_, &attrs);
-+ ASSERT(result == 0);
-+ }
-+
-+ virtual ~NetBSDMutex() { pthread_mutex_destroy(&mutex_); }
-+
-+ virtual int Lock() {
-+ int result = pthread_mutex_lock(&mutex_);
-+ return result;
-+ }
-+
-+ virtual int Unlock() {
-+ int result = pthread_mutex_unlock(&mutex_);
-+ return result;
-+ }
-+
-+ virtual bool TryLock() {
-+ int result = pthread_mutex_trylock(&mutex_);
-+ // Return false if the lock is busy and locking failed.
-+ if (result == EBUSY) {
-+ return false;
-+ }
-+ ASSERT(result == 0); // Verify no other errors.
-+ return true;
-+ }
-+
-+ private:
-+ pthread_mutex_t mutex_; // Pthread mutex for POSIX platforms.
-+};
-+
-+
-+Mutex* OS::CreateMutex() {
-+ return new NetBSDMutex();
-+}
-+
-+
-+class NetBSDSemaphore : public Semaphore {
-+ public:
-+ explicit NetBSDSemaphore(int count) { sem_init(&sem_, 0, count); }
-+ virtual ~NetBSDSemaphore() { sem_destroy(&sem_); }
-+
-+ virtual void Wait();
-+ virtual bool Wait(int timeout);
-+ virtual void Signal() { sem_post(&sem_); }
-+ private:
-+ sem_t sem_;
-+};
-+
-+
-+void NetBSDSemaphore::Wait() {
-+ while (true) {
-+ int result = sem_wait(&sem_);
-+ if (result == 0) return; // Successfully got semaphore.
-+ CHECK(result == -1 && errno == EINTR); // Signal caused spurious wakeup.
-+ }
-+}
-+
-+
-+bool NetBSDSemaphore::Wait(int timeout) {
-+ const long kOneSecondMicros = 1000000; // NOLINT
-+
-+ // Split timeout into second and nanosecond parts.
-+ struct timeval delta;
-+ delta.tv_usec = timeout % kOneSecondMicros;
-+ delta.tv_sec = timeout / kOneSecondMicros;
-+
-+ struct timeval current_time;
-+ // Get the current time.
-+ if (gettimeofday(¤t_time, NULL) == -1) {
-+ return false;
-+ }
-+
-+ // Calculate time for end of timeout.
-+ struct timeval end_time;
-+ timeradd(¤t_time, &delta, &end_time);
-+
-+ struct timespec ts;
-+ TIMEVAL_TO_TIMESPEC(&end_time, &ts);
-+ while (true) {
-+ int result = sem_trywait(&sem_);
-+ if (result == 0) return true; // Successfully got semaphore.
-+ if (result == -1 && errno == ETIMEDOUT) return false; // Timeout.
-+ CHECK(result == -1 && errno == EINTR); // Signal caused spurious wakeup.
-+ }
-+}
-+
-+
-+Semaphore* OS::CreateSemaphore(int count) {
-+ return new NetBSDSemaphore(count);
-+}
-+
-+
-+#ifdef ENABLE_LOGGING_AND_PROFILING
-+
-+static Sampler* active_sampler_ = NULL;
-+static pthread_t vm_tid_ = 0;
-+
-+static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
-+ USE(info);
-+ if (signal != SIGPROF) return;
-+ if (active_sampler_ == NULL || !active_sampler_->IsActive()) return;
-+ if (vm_tid_ != pthread_self()) return;
-+
-+ TickSample sample_obj;
-+ TickSample* sample = CpuProfiler::TickSampleEvent();
-+ if (sample == NULL) sample = &sample_obj;
-+
-+ // We always sample the VM state.
-+ sample->state = Top::current_vm_state();
-+
-+ // If profiling, we extract the current pc and sp.
-+ if (active_sampler_->IsProfiling()) {
-+ // Extracting the sample from the context is extremely machine dependent.
-+ ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(context);
-+ mcontext_t& mcontext = ucontext->uc_mcontext;
-+#if V8_HOST_ARCH_IA32
-+ sample->pc = reinterpret_cast<Address>(mcontext.__gregs[_REG_EIP]);
-+ sample->sp = reinterpret_cast<Address>(mcontext.__gregs[_REG_ESP]);
-+ sample->fp = reinterpret_cast<Address>(mcontext.__gregs[_REG_EBP]);
-+#elif V8_HOST_ARCH_X64
-+ sample->pc = reinterpret_cast<Address>(mcontext.__gregs[_REG_RIP]);
-+ sample->sp = reinterpret_cast<Address>(mcontext.__gregs[_REG_RSP]);
-+ sample->fp = reinterpret_cast<Address>(mcontext.__gregs[_REG_RBP]);
-+#elif V8_HOST_ARCH_ARM
-+ UNIMPLEMENTED();
-+#endif
-+ active_sampler_->SampleStack(sample);
-+ }
-+
-+ active_sampler_->Tick(sample);
-+}
-+
-+
-+class Sampler::PlatformData : public Malloced {
-+ public:
-+ PlatformData() {
-+ signal_handler_installed_ = false;
-+ }
-+
-+ bool signal_handler_installed_;
-+ struct sigaction old_signal_handler_;
-+ struct itimerval old_timer_value_;
-+};
-+
-+
-+Sampler::Sampler(int interval)
-+ : interval_(interval),
-+ profiling_(false),
-+ active_(false),
-+ samples_taken_(0) {
-+ data_ = new PlatformData();
-+}
-+
-+
-+Sampler::~Sampler() {
-+ delete data_;
-+}
-+
-+
-+void Sampler::Start() {
-+ // There can only be one active sampler at the time on POSIX
-+ // platforms.
-+ if (active_sampler_ != NULL) return;
-+ vm_tid_ = pthread_self();
-+
-+ // Request profiling signals.
-+ struct sigaction sa;
-+ sa.sa_sigaction = ProfilerSignalHandler;
-+ sigemptyset(&sa.sa_mask);
-+ sa.sa_flags = SA_SIGINFO;
-+ if (sigaction(SIGPROF, &sa, &data_->old_signal_handler_) != 0) return;
-+ data_->signal_handler_installed_ = true;
-+
-+ // Set the itimer to generate a tick for each interval.
-+ itimerval itimer;
-+ itimer.it_interval.tv_sec = interval_ / 1000;
-+ itimer.it_interval.tv_usec = (interval_ % 1000) * 1000;
-+ itimer.it_value.tv_sec = itimer.it_interval.tv_sec;
-+ itimer.it_value.tv_usec = itimer.it_interval.tv_usec;
-+ setitimer(ITIMER_PROF, &itimer, &data_->old_timer_value_);
-+
-+ // Set this sampler as the active sampler.
-+ active_sampler_ = this;
-+ active_ = true;
-+}
-+
-+
-+void Sampler::Stop() {
-+ // Restore old signal handler
-+ if (data_->signal_handler_installed_) {
-+ setitimer(ITIMER_PROF, &data_->old_timer_value_, NULL);
-+ sigaction(SIGPROF, &data_->old_signal_handler_, 0);
-+ data_->signal_handler_installed_ = false;
-+ }
-+
-+ // This sampler is no longer the active sampler.
-+ active_sampler_ = NULL;
-+ active_ = false;
-+}
-+
-+#endif // ENABLE_LOGGING_AND_PROFILING
-+
-+} } // namespace v8::internal
diff --git a/chromium/patches/patch-v8_src_platform-openbsd.cc b/chromium/patches/patch-v8_src_platform-openbsd.cc
deleted file mode 100644
index e8841b8270..0000000000
--- a/chromium/patches/patch-v8_src_platform-openbsd.cc
+++ /dev/null
@@ -1,129 +0,0 @@
-$NetBSD: patch-v8_src_platform-openbsd.cc,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- v8/src/platform-openbsd.cc.orig 2011-04-13 08:24:41.000000000 +0000
-+++ v8/src/platform-openbsd.cc
-@@ -164,6 +164,7 @@ void* OS::Allocate(const size_t requeste
-
-
- void OS::Free(void* buf, const size_t length) {
-+ // TODO(1240712): munmap has a return value which is ignored here.
- int result = munmap(buf, length);
- USE(result);
- ASSERT(result == 0);
-@@ -197,13 +198,7 @@ void OS::Abort() {
-
-
- void OS::DebugBreak() {
--#if (defined(__arm__) || defined(__thumb__))
--# if defined(CAN_USE_ARMV5_INSTRUCTIONS)
-- asm("bkpt 0");
--# endif
--#else
- asm("int $3");
--#endif
- }
-
-
-@@ -309,8 +304,30 @@ void OS::SignalCodeMovingGC() {
-
-
- int OS::StackWalk(Vector<OS::StackFrame> frames) {
-- UNIMPLEMENTED();
-- return 1;
-+ int frames_size = frames.length();
-+ ScopedVector<void*> addresses(frames_size);
-+
-+ int frames_count = backtrace(addresses.start(), frames_size);
-+
-+ char** symbols = backtrace_symbols(addresses.start(), frames_count);
-+ if (symbols == NULL) {
-+ return kStackWalkError;
-+ }
-+
-+ for (int i = 0; i < frames_count; i++) {
-+ frames[i].address = addresses[i];
-+ // Format a text representation of the frame based on the information
-+ // available.
-+ SNPrintF(MutableCStrVector(frames[i].text, kStackWalkMaxTextLen),
-+ "%s",
-+ symbols[i]);
-+ // Make sure line termination is in place.
-+ frames[i].text[kStackWalkMaxTextLen - 1] = '\0';
-+ }
-+
-+ free(symbols);
-+
-+ return frames_count;
- }
-
-
-@@ -502,6 +519,16 @@ class OpenBSDMutex : public Mutex {
- return result;
- }
-
-+ virtual bool TryLock() {
-+ int result = pthread_mutex_trylock(&mutex_);
-+ // Return false if the lock is busy and locking failed.
-+ if (result == EBUSY) {
-+ return false;
-+ }
-+ ASSERT(result == 0); // Verify no other errors.
-+ return true;
-+ }
-+
- private:
- pthread_mutex_t mutex_; // Pthread mutex for POSIX platforms.
- };
-@@ -571,18 +598,37 @@ Semaphore* OS::CreateSemaphore(int count
- #ifdef ENABLE_LOGGING_AND_PROFILING
-
- static Sampler* active_sampler_ = NULL;
-+static pthread_t vm_tid_ = 0;
-+
-+typedef struct sigcontext ucontext_t;
-
- static void ProfilerSignalHandler(int signal, siginfo_t* info, void* context) {
- USE(info);
- if (signal != SIGPROF) return;
-- if (active_sampler_ == NULL) return;
--
-- TickSample sample;
-+ if (active_sampler_ == NULL || !active_sampler_->IsActive()) return;
-+ if (vm_tid_ != pthread_self()) return;
-
-- // We always sample the VM state.
-- sample.state = VMState::current_state();
--
-- active_sampler_->Tick(&sample);
-+ TickSample sample_obj;
-+ TickSample* sample = CpuProfiler::TickSampleEvent();
-+ if (sample == NULL) sample = &sample_obj;
-+
-+ // Extracting the sample from the context is extremely machine dependent.
-+ ucontext_t* ucontext = reinterpret_cast<ucontext_t*>(context);
-+ sample->state = Top::current_vm_state();
-+
-+#if V8_HOST_ARCH_IA32
-+ sample->pc = reinterpret_cast<Address>(ucontext->sc_eip);
-+ sample->sp = reinterpret_cast<Address>(ucontext->sc_esp);
-+ sample->fp = reinterpret_cast<Address>(ucontext->sc_ebp);
-+#elif V8_HOST_ARCH_X64
-+ sample->pc = reinterpret_cast<Address>(ucontext->sc_rip);
-+ sample->sp = reinterpret_cast<Address>(ucontext->sc_rsp);
-+ sample->fp = reinterpret_cast<Address>(ucontext->sc_rbp);
-+#else
-+ UNIMPLEMENTED();
-+#endif
-+ active_sampler_->SampleStack(sample);
-+ active_sampler_->Tick(sample);
- }
-
-
-@@ -616,6 +662,7 @@ void Sampler::Start() {
- // There can only be one active sampler at the time on POSIX
- // platforms.
- if (active_sampler_ != NULL) return;
-+ vm_tid_ = pthread_self();
-
- // Request profiling signals.
- struct sigaction sa;
diff --git a/chromium/patches/patch-v8_src_x64_code-stubs-x64.cc b/chromium/patches/patch-v8_src_x64_code-stubs-x64.cc
deleted file mode 100644
index 6c639aef15..0000000000
--- a/chromium/patches/patch-v8_src_x64_code-stubs-x64.cc
+++ /dev/null
@@ -1,99 +0,0 @@
-$NetBSD: patch-v8_src_x64_code-stubs-x64.cc,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- v8/src/x64/code-stubs-x64.cc.orig 2011-04-13 08:24:39.000000000 +0000
-+++ v8/src/x64/code-stubs-x64.cc
-@@ -1699,11 +1699,14 @@ void ArgumentsAccessStub::GenerateReadEl
- Label slow;
- __ JumpIfNotSmi(rdx, &slow);
-
-- // Check if the calling frame is an arguments adaptor frame.
-+ // Check if the calling frame is an arguments adaptor frame. We look at the
-+ // context offset, and if the frame is not a regular one, then we find a
-+ // Smi instead of the context. We can't use SmiCompare here, because that
-+ // only works for comparing two smis.
- Label adaptor;
- __ movq(rbx, Operand(rbp, StandardFrameConstants::kCallerFPOffset));
-- __ SmiCompare(Operand(rbx, StandardFrameConstants::kContextOffset),
-- Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
-+ __ Cmp(Operand(rbx, StandardFrameConstants::kContextOffset),
-+ Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
- __ j(equal, &adaptor);
-
- // Check index against formal parameters count limit passed in
-@@ -1758,8 +1761,8 @@ void ArgumentsAccessStub::GenerateNewObj
- // Check if the calling frame is an arguments adaptor frame.
- Label adaptor_frame, try_allocate, runtime;
- __ movq(rdx, Operand(rbp, StandardFrameConstants::kCallerFPOffset));
-- __ SmiCompare(Operand(rdx, StandardFrameConstants::kContextOffset),
-- Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
-+ __ Cmp(Operand(rdx, StandardFrameConstants::kContextOffset),
-+ Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
- __ j(equal, &adaptor_frame);
-
- // Get the length from the frame.
-@@ -3518,8 +3521,8 @@ void StringAddStub::Generate(MacroAssemb
- // Look at the length of the result of adding the two strings.
- STATIC_ASSERT(String::kMaxLength <= Smi::kMaxValue / 2);
- __ SmiAdd(rbx, rbx, rcx);
-- // Use the runtime system when adding two one character strings, as it
-- // contains optimizations for this specific case using the symbol table.
-+ // Use the symbol table when adding two one character strings, as it
-+ // helps later optimizations to return a symbol here.
- __ SmiCompare(rbx, Smi::FromInt(2));
- __ j(not_equal, &longer_than_two);
-
-@@ -3823,15 +3826,14 @@ void StringHelper::GenerateTwoCharacterS
- FieldOperand(symbol_table, SymbolTable::kCapacityOffset));
- __ decl(mask);
-
-- Register undefined = scratch4;
-- __ LoadRoot(undefined, Heap::kUndefinedValueRootIndex);
-+ Register map = scratch4;
-
- // Registers
- // chars: two character string, char 1 in byte 0 and char 2 in byte 1.
- // hash: hash of two character string (32-bit int)
- // symbol_table: symbol table
- // mask: capacity mask (32-bit int)
-- // undefined: undefined value
-+ // map: -
- // scratch: -
-
- // Perform a number of probes in the symbol table.
-@@ -3846,7 +3848,7 @@ void StringHelper::GenerateTwoCharacterS
- }
- __ andl(scratch, mask);
-
-- // Load the entry from the symble table.
-+ // Load the entry from the symbol table.
- Register candidate = scratch; // Scratch register contains candidate.
- STATIC_ASSERT(SymbolTable::kEntrySize == 1);
- __ movq(candidate,
-@@ -3856,8 +3858,16 @@ void StringHelper::GenerateTwoCharacterS
- SymbolTable::kElementsStartOffset));
-
- // If entry is undefined no string with this hash can be found.
-- __ cmpq(candidate, undefined);
-+ NearLabel is_string;
-+ __ CmpObjectType(candidate, ODDBALL_TYPE, map);
-+ __ j(not_equal, &is_string);
-+
-+ __ CompareRoot(candidate, Heap::kUndefinedValueRootIndex);
- __ j(equal, not_found);
-+ // Must be null (deleted entry).
-+ __ jmp(&next_probe[i]);
-+
-+ __ bind(&is_string);
-
- // If length is not 2 the string is not a candidate.
- __ SmiCompare(FieldOperand(candidate, String::kLengthOffset),
-@@ -3869,8 +3879,7 @@ void StringHelper::GenerateTwoCharacterS
- Register temp = kScratchRegister;
-
- // Check that the candidate is a non-external ascii string.
-- __ movq(temp, FieldOperand(candidate, HeapObject::kMapOffset));
-- __ movzxbl(temp, FieldOperand(temp, Map::kInstanceTypeOffset));
-+ __ movzxbl(temp, FieldOperand(map, Map::kInstanceTypeOffset));
- __ JumpIfInstanceTypeIsNotSequentialAscii(
- temp, temp, &next_probe[i]);
-
diff --git a/chromium/patches/patch-v8_src_x64_codegen-x64.cc b/chromium/patches/patch-v8_src_x64_codegen-x64.cc
deleted file mode 100644
index 071172d057..0000000000
--- a/chromium/patches/patch-v8_src_x64_codegen-x64.cc
+++ /dev/null
@@ -1,165 +0,0 @@
-$NetBSD: patch-v8_src_x64_codegen-x64.cc,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- v8/src/x64/codegen-x64.cc.orig 2011-04-13 08:24:39.000000000 +0000
-+++ v8/src/x64/codegen-x64.cc
-@@ -760,7 +760,7 @@ void CodeGenerator::ToBoolean(ControlDes
- __ AbortIfNotNumber(value.reg());
- }
- // Smi => false iff zero.
-- __ SmiCompare(value.reg(), Smi::FromInt(0));
-+ __ Cmp(value.reg(), Smi::FromInt(0));
- if (value.is_smi()) {
- value.Unuse();
- dest->Split(not_zero);
-@@ -788,7 +788,7 @@ void CodeGenerator::ToBoolean(ControlDes
- dest->false_target()->Branch(equal);
-
- // Smi => false iff zero.
-- __ SmiCompare(value.reg(), Smi::FromInt(0));
-+ __ Cmp(value.reg(), Smi::FromInt(0));
- dest->false_target()->Branch(equal);
- Condition is_smi = masm_->CheckSmi(value.reg());
- dest->true_target()->Branch(is_smi);
-@@ -1030,7 +1030,7 @@ void CodeGenerator::GenericBinaryOperati
- true, overwrite_mode);
- } else {
- // Set the flags based on the operation, type and loop nesting level.
-- // Bit operations always assume they likely operate on Smis. Still only
-+ // Bit operations always assume they likely operate on smis. Still only
- // generate the inline Smi check code if this operation is part of a loop.
- // For all other operations only inline the Smi check code for likely smis
- // if the operation is part of a loop.
-@@ -2102,7 +2102,7 @@ void CodeGenerator::Comparison(AstNode*
- if (cc == equal) {
- Label comparison_done;
- __ SmiCompare(FieldOperand(left_side.reg(), String::kLengthOffset),
-- Smi::FromInt(1));
-+ Smi::FromInt(1));
- __ j(not_equal, &comparison_done);
- uint8_t char_value =
- static_cast<uint8_t>(String::cast(*right_val)->Get(0));
-@@ -2288,7 +2288,7 @@ void CodeGenerator::ConstantSmiCompariso
- // CompareStub and the inline code both support all values of cc.
- }
- // Implement comparison against a constant Smi, inlining the case
-- // where both sides are Smis.
-+ // where both sides are smis.
- left_side->ToRegister();
- Register left_reg = left_side->reg();
- Smi* constant_smi = Smi::cast(*right_side->handle());
-@@ -2298,7 +2298,6 @@ void CodeGenerator::ConstantSmiCompariso
- __ AbortIfNotSmi(left_reg);
- }
- // Test smi equality and comparison by signed int comparison.
-- // Both sides are smis, so we can use an Immediate.
- __ SmiCompare(left_reg, constant_smi);
- left_side->Unuse();
- right_side->Unuse();
-@@ -2308,7 +2307,7 @@ void CodeGenerator::ConstantSmiCompariso
- JumpTarget is_smi;
- if (cc == equal) {
- // We can do the equality comparison before the smi check.
-- __ SmiCompare(left_reg, constant_smi);
-+ __ Cmp(left_reg, constant_smi);
- dest->true_target()->Branch(equal);
- Condition left_is_smi = masm_->CheckSmi(left_reg);
- dest->false_target()->Branch(left_is_smi);
-@@ -2569,8 +2568,8 @@ void CodeGenerator::CallApplyLazy(Expres
- // adaptor frame below it.
- Label invoke, adapted;
- __ movq(rdx, Operand(rbp, StandardFrameConstants::kCallerFPOffset));
-- __ SmiCompare(Operand(rdx, StandardFrameConstants::kContextOffset),
-- Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
-+ __ Cmp(Operand(rdx, StandardFrameConstants::kContextOffset),
-+ Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
- __ j(equal, &adapted);
-
- // No arguments adaptor frame. Copy fixed number of arguments.
-@@ -3850,7 +3849,7 @@ void CodeGenerator::VisitForInStatement(
- __ movq(rbx, rax);
-
- // If the property has been removed while iterating, we just skip it.
-- __ SmiCompare(rbx, Smi::FromInt(0));
-+ __ Cmp(rbx, Smi::FromInt(0));
- node->continue_target()->Branch(equal);
-
- end_del_check.Bind();
-@@ -6182,15 +6181,15 @@ void CodeGenerator::GenerateIsConstructC
-
- // Skip the arguments adaptor frame if it exists.
- Label check_frame_marker;
-- __ SmiCompare(Operand(fp.reg(), StandardFrameConstants::kContextOffset),
-- Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
-+ __ Cmp(Operand(fp.reg(), StandardFrameConstants::kContextOffset),
-+ Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
- __ j(not_equal, &check_frame_marker);
- __ movq(fp.reg(), Operand(fp.reg(), StandardFrameConstants::kCallerFPOffset));
-
- // Check the marker in the calling frame.
- __ bind(&check_frame_marker);
-- __ SmiCompare(Operand(fp.reg(), StandardFrameConstants::kMarkerOffset),
-- Smi::FromInt(StackFrame::CONSTRUCT));
-+ __ Cmp(Operand(fp.reg(), StandardFrameConstants::kMarkerOffset),
-+ Smi::FromInt(StackFrame::CONSTRUCT));
- fp.Unuse();
- destination()->Split(equal);
- }
-@@ -6210,8 +6209,8 @@ void CodeGenerator::GenerateArgumentsLen
-
- // Check if the calling frame is an arguments adaptor frame.
- __ movq(fp.reg(), Operand(rbp, StandardFrameConstants::kCallerFPOffset));
-- __ SmiCompare(Operand(fp.reg(), StandardFrameConstants::kContextOffset),
-- Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
-+ __ Cmp(Operand(fp.reg(), StandardFrameConstants::kContextOffset),
-+ Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
- __ j(not_equal, &exit);
-
- // Arguments adaptor case: Read the arguments length from the
-@@ -6767,8 +6766,8 @@ void CodeGenerator::GenerateSwapElements
- // Fetch the map and check if array is in fast case.
- // Check that object doesn't require security checks and
- // has no indexed interceptor.
-- __ CmpObjectType(object.reg(), FIRST_JS_OBJECT_TYPE, tmp1.reg());
-- deferred->Branch(below);
-+ __ CmpObjectType(object.reg(), JS_ARRAY_TYPE, tmp1.reg());
-+ deferred->Branch(not_equal);
- __ testb(FieldOperand(tmp1.reg(), Map::kBitFieldOffset),
- Immediate(KeyedLoadIC::kSlowCaseBitFieldMask));
- deferred->Branch(not_zero);
-@@ -6810,7 +6809,7 @@ void CodeGenerator::GenerateSwapElements
-
- Label done;
- __ InNewSpace(tmp1.reg(), tmp2.reg(), equal, &done);
-- // Possible optimization: do a check that both values are Smis
-+ // Possible optimization: do a check that both values are smis
- // (or them and test against Smi mask.)
-
- __ movq(tmp2.reg(), tmp1.reg());
-@@ -8485,12 +8484,6 @@ Result CodeGenerator::EmitKeyedStore(Sta
- __ CmpObjectType(receiver.reg(), JS_ARRAY_TYPE, kScratchRegister);
- deferred->Branch(not_equal);
-
-- // Check that the key is within bounds. Both the key and the length of
-- // the JSArray are smis. Use unsigned comparison to handle negative keys.
-- __ SmiCompare(FieldOperand(receiver.reg(), JSArray::kLengthOffset),
-- key.reg());
-- deferred->Branch(below_equal);
--
- // Get the elements array from the receiver and check that it is not a
- // dictionary.
- __ movq(tmp.reg(),
-@@ -8519,6 +8512,14 @@ Result CodeGenerator::EmitKeyedStore(Sta
- kScratchRegister);
- deferred->Branch(not_equal);
-
-+ // Check that the key is within bounds. Both the key and the length of
-+ // the JSArray are smis (because the fixed array check above ensures the
-+ // elements are in fast case). Use unsigned comparison to handle negative
-+ // keys.
-+ __ SmiCompare(FieldOperand(receiver.reg(), JSArray::kLengthOffset),
-+ key.reg());
-+ deferred->Branch(below_equal);
-+
- // Store the value.
- SmiIndex index =
- masm()->SmiToIndex(kScratchRegister, key.reg(), kPointerSizeLog2);
diff --git a/chromium/patches/patch-v8_src_x64_full-codegen-x64.cc b/chromium/patches/patch-v8_src_x64_full-codegen-x64.cc
deleted file mode 100644
index 1ce85db4af..0000000000
--- a/chromium/patches/patch-v8_src_x64_full-codegen-x64.cc
+++ /dev/null
@@ -1,44 +0,0 @@
-$NetBSD: patch-v8_src_x64_full-codegen-x64.cc,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- v8/src/x64/full-codegen-x64.cc.orig 2011-04-13 08:24:39.000000000 +0000
-+++ v8/src/x64/full-codegen-x64.cc
-@@ -865,7 +865,7 @@ void FullCodeGenerator::VisitForInStatem
- __ push(rcx); // Enumerable.
- __ push(rbx); // Current entry.
- __ InvokeBuiltin(Builtins::FILTER_KEY, CALL_FUNCTION);
-- __ SmiCompare(rax, Smi::FromInt(0));
-+ __ Cmp(rax, Smi::FromInt(0));
- __ j(equal, loop_statement.continue_target());
- __ movq(rbx, rax);
-
-@@ -2300,15 +2300,15 @@ void FullCodeGenerator::EmitIsConstructC
-
- // Skip the arguments adaptor frame if it exists.
- Label check_frame_marker;
-- __ SmiCompare(Operand(rax, StandardFrameConstants::kContextOffset),
-- Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
-+ __ Cmp(Operand(rax, StandardFrameConstants::kContextOffset),
-+ Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
- __ j(not_equal, &check_frame_marker);
- __ movq(rax, Operand(rax, StandardFrameConstants::kCallerFPOffset));
-
- // Check the marker in the calling frame.
- __ bind(&check_frame_marker);
-- __ SmiCompare(Operand(rax, StandardFrameConstants::kMarkerOffset),
-- Smi::FromInt(StackFrame::CONSTRUCT));
-+ __ Cmp(Operand(rax, StandardFrameConstants::kMarkerOffset),
-+ Smi::FromInt(StackFrame::CONSTRUCT));
- PrepareForBailoutBeforeSplit(TOS_REG, true, if_true, if_false);
- Split(equal, if_true, if_false, fall_through);
-
-@@ -2362,8 +2362,8 @@ void FullCodeGenerator::EmitArgumentsLen
-
- // Check if the calling frame is an arguments adaptor frame.
- __ movq(rbx, Operand(rbp, StandardFrameConstants::kCallerFPOffset));
-- __ SmiCompare(Operand(rbx, StandardFrameConstants::kContextOffset),
-- Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
-+ __ Cmp(Operand(rbx, StandardFrameConstants::kContextOffset),
-+ Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
- __ j(not_equal, &exit);
-
- // Arguments adaptor case: Read the arguments length from the
diff --git a/chromium/patches/patch-v8_src_x64_lithium-codegen-x64.cc b/chromium/patches/patch-v8_src_x64_lithium-codegen-x64.cc
deleted file mode 100644
index 53b24c0077..0000000000
--- a/chromium/patches/patch-v8_src_x64_lithium-codegen-x64.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-v8_src_x64_lithium-codegen-x64.cc,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- v8/src/x64/lithium-codegen-x64.cc.orig 2011-04-13 08:24:39.000000000 +0000
-+++ v8/src/x64/lithium-codegen-x64.cc
-@@ -786,7 +786,7 @@ void LCodeGen::DoBranch(LBranch* instr)
- __ j(equal, true_label);
- __ CompareRoot(reg, Heap::kFalseValueRootIndex);
- __ j(equal, false_label);
-- __ SmiCompare(reg, Smi::FromInt(0));
-+ __ Cmp(reg, Smi::FromInt(0));
- __ j(equal, false_label);
- __ JumpIfSmi(reg, true_label);
-
diff --git a/chromium/patches/patch-v8_src_x64_macro-assembler-x64.cc b/chromium/patches/patch-v8_src_x64_macro-assembler-x64.cc
deleted file mode 100644
index 4aad415ecf..0000000000
--- a/chromium/patches/patch-v8_src_x64_macro-assembler-x64.cc
+++ /dev/null
@@ -1,125 +0,0 @@
-$NetBSD: patch-v8_src_x64_macro-assembler-x64.cc,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- v8/src/x64/macro-assembler-x64.cc.orig 2011-04-13 08:24:39.000000000 +0000
-+++ v8/src/x64/macro-assembler-x64.cc
-@@ -109,7 +109,7 @@ void MacroAssembler::RecordWrite(Registe
- ASSERT(!object.is(rsi) && !value.is(rsi) && !index.is(rsi));
-
- // First, check if a write barrier is even needed. The tests below
-- // catch stores of Smis and stores into young gen.
-+ // catch stores of smis and stores into young gen.
- Label done;
- JumpIfSmi(value, &done);
-
-@@ -138,7 +138,7 @@ void MacroAssembler::RecordWrite(Registe
- ASSERT(!object.is(rsi) && !value.is(rsi) && !address.is(rsi));
-
- // First, check if a write barrier is even needed. The tests below
-- // catch stores of Smis and stores into young gen.
-+ // catch stores of smis and stores into young gen.
- Label done;
- JumpIfSmi(value, &done);
-
-@@ -820,12 +820,26 @@ void MacroAssembler::SmiTest(Register sr
- }
-
-
--void MacroAssembler::SmiCompare(Register dst, Register src) {
-- cmpq(dst, src);
-+void MacroAssembler::SmiCompare(Register smi1, Register smi2) {
-+ if (FLAG_debug_code) {
-+ AbortIfNotSmi(smi1);
-+ AbortIfNotSmi(smi2);
-+ }
-+ cmpq(smi1, smi2);
- }
-
-
- void MacroAssembler::SmiCompare(Register dst, Smi* src) {
-+ if (FLAG_debug_code) {
-+ AbortIfNotSmi(dst);
-+ }
-+ // Actually, knowing the register is a smi doesn't enable any optimizations
-+ // with the current tagging scheme.
-+ Cmp(dst, src);
-+}
-+
-+
-+void MacroAssembler::Cmp(Register dst, Smi* src) {
- ASSERT(!dst.is(kScratchRegister));
- if (src->value() == 0) {
- testq(dst, dst);
-@@ -837,20 +851,41 @@ void MacroAssembler::SmiCompare(Register
-
-
- void MacroAssembler::SmiCompare(Register dst, const Operand& src) {
-+ if (FLAG_debug_code) {
-+ AbortIfNotSmi(dst);
-+ AbortIfNotSmi(src);
-+ }
- cmpq(dst, src);
- }
-
-
- void MacroAssembler::SmiCompare(const Operand& dst, Register src) {
-+ if (FLAG_debug_code) {
-+ AbortIfNotSmi(dst);
-+ AbortIfNotSmi(src);
-+ }
- cmpq(dst, src);
- }
-
-
- void MacroAssembler::SmiCompare(const Operand& dst, Smi* src) {
-+ if (FLAG_debug_code) {
-+ AbortIfNotSmi(dst);
-+ }
- cmpl(Operand(dst, kSmiShift / kBitsPerByte), Immediate(src->value()));
- }
-
-
-+void MacroAssembler::Cmp(const Operand& dst, Smi* src) {
-+ // The Operand cannot use the smi register, since we may use the scratch
-+ // register to get around the lack of 64 bit immediates in the instruction
-+ // set.
-+ Register smi_reg = GetSmiConstant(src);
-+ ASSERT(!dst.AddressUsesRegister(smi_reg));
-+ cmpq(dst, smi_reg);
-+}
-+
-+
- void MacroAssembler::SmiCompareInteger32(const Operand& dst, Register src) {
- cmpl(Operand(dst, kSmiShift / kBitsPerByte), src);
- }
-@@ -1335,7 +1370,7 @@ void MacroAssembler::Move(const Operand&
-
- void MacroAssembler::Cmp(Register dst, Handle<Object> source) {
- if (source->IsSmi()) {
-- SmiCompare(dst, Smi::cast(*source));
-+ Cmp(dst, Smi::cast(*source));
- } else {
- Move(kScratchRegister, source);
- cmpq(dst, kScratchRegister);
-@@ -1345,7 +1380,7 @@ void MacroAssembler::Cmp(Register dst, H
-
- void MacroAssembler::Cmp(const Operand& dst, Handle<Object> source) {
- if (source->IsSmi()) {
-- SmiCompare(dst, Smi::cast(*source));
-+ Cmp(dst, Smi::cast(*source));
- } else {
- ASSERT(source->IsHeapObject());
- movq(kScratchRegister, source, RelocInfo::EMBEDDED_OBJECT);
-@@ -1692,7 +1727,12 @@ void MacroAssembler::AbortIfSmi(Register
-
-
- void MacroAssembler::AbortIfNotSmi(Register object) {
-- NearLabel ok;
-+ Condition is_smi = CheckSmi(object);
-+ Assert(is_smi, "Operand is not a smi");
-+}
-+
-+
-+void MacroAssembler::AbortIfNotSmi(const Operand& object) {
- Condition is_smi = CheckSmi(object);
- Assert(is_smi, "Operand is not a smi");
- }
diff --git a/chromium/patches/patch-v8_src_x64_macro-assembler-x64.h b/chromium/patches/patch-v8_src_x64_macro-assembler-x64.h
deleted file mode 100644
index 5c31b4b832..0000000000
--- a/chromium/patches/patch-v8_src_x64_macro-assembler-x64.h
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-v8_src_x64_macro-assembler-x64.h,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- v8/src/x64/macro-assembler-x64.h.orig 2011-04-13 08:24:39.000000000 +0000
-+++ v8/src/x64/macro-assembler-x64.h
-@@ -256,8 +256,9 @@ class MacroAssembler: public Assembler {
- int power);
-
-
-- // Simple comparison of smis.
-- void SmiCompare(Register dst, Register src);
-+ // Simple comparison of smis. Both sides must be known smis to use these,
-+ // otherwise use Cmp.
-+ void SmiCompare(Register smi1, Register smi2);
- void SmiCompare(Register dst, Smi* src);
- void SmiCompare(Register dst, const Operand& src);
- void SmiCompare(const Operand& dst, Register src);
-@@ -579,6 +580,8 @@ class MacroAssembler: public Assembler {
- void Move(const Operand& dst, Handle<Object> source);
- void Cmp(Register dst, Handle<Object> source);
- void Cmp(const Operand& dst, Handle<Object> source);
-+ void Cmp(Register dst, Smi* src);
-+ void Cmp(const Operand& dst, Smi* src);
- void Push(Handle<Object> source);
-
- // Emit code to discard a non-negative number of pointer-sized elements
-@@ -646,6 +649,7 @@ class MacroAssembler: public Assembler {
-
- // Abort execution if argument is not a smi. Used in debug code.
- void AbortIfNotSmi(Register object);
-+ void AbortIfNotSmi(const Operand& object);
-
- // Abort execution if argument is a string. Used in debug code.
- void AbortIfNotString(Register object);
diff --git a/chromium/patches/patch-v8_tools_gyp_v8.gyp b/chromium/patches/patch-v8_tools_gyp_v8.gyp
deleted file mode 100644
index 6ba17c911b..0000000000
--- a/chromium/patches/patch-v8_tools_gyp_v8.gyp
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-v8_tools_gyp_v8.gyp,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- v8/tools/gyp/v8.gyp.orig 2011-05-24 08:20:55.000000000 +0000
-+++ v8/tools/gyp/v8.gyp
-@@ -109,7 +109,7 @@
- },
- 'Release': {
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'cflags!': [
- '-O2',
- '-Os',
-@@ -718,6 +718,13 @@
- ],
- }
- ],
-+ ['OS=="dragonfly"', {
-+ 'sources': [
-+ '../../src/platform-dragonfly.cc',
-+ '../../src/platform-posix.cc'
-+ ],
-+ }
-+ ],
- ['OS=="freebsd"', {
- 'link_settings': {
- 'libraries': [
-@@ -729,6 +736,12 @@
- ],
- }
- ],
-+ ['OS=="netbsd"', {
-+ 'sources': [
-+ '../../src/platform-netbsd.cc',
-+ '../../src/platform-posix.cc'
-+ ],
-+ }],
- ['OS=="openbsd"', {
- 'link_settings': {
- 'libraries': [
diff --git a/chromium/patches/patch-views_views.gyp b/chromium/patches/patch-views_views.gyp
deleted file mode 100644
index 98fc66a700..0000000000
--- a/chromium/patches/patch-views_views.gyp
+++ /dev/null
@@ -1,49 +0,0 @@
-$NetBSD: patch-views_views.gyp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- views/views.gyp.orig 2011-04-13 08:01:32.000000000 +0000
-+++ views/views.gyp
-@@ -8,7 +8,7 @@
- },
-
- 'conditions': [
-- [ 'OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ [ 'OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'conditions': [
- ['sysroot!=""', {
- 'variables': {
-@@ -29,7 +29,7 @@
- ['exclude', '/(gtk|win|x11)_[^/]*\\.cc$'],
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {'sources/': [
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {'sources/': [
- ['include', '/gtk/'],
- ['include', '_(gtk|linux|posix|skia|x)\\.cc$'],
- ['include', '/(gtk|x11)_[^/]*\\.cc$'],
-@@ -371,7 +371,7 @@
- '<(DEPTH)/third_party/wtl/include',
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- '../build/linux/system.gyp:x11',
-@@ -472,7 +472,7 @@
- '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- '../chrome/chrome.gyp:packed_resources',
-@@ -544,7 +544,7 @@
- '<(SHARED_INTERMEDIATE_DIR)/app/app_resources/app_resources.rc',
- ],
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'dependencies': [
- '../build/linux/system.gyp:gtk',
- '../chrome/chrome.gyp:packed_resources',
diff --git a/chromium/patches/patch-webkit_glue_webkit__glue.gypi b/chromium/patches/patch-webkit_glue_webkit__glue.gypi
deleted file mode 100644
index 3ef6501e61..0000000000
--- a/chromium/patches/patch-webkit_glue_webkit__glue.gypi
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-webkit_glue_webkit__glue.gypi,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- webkit/glue/webkit_glue.gypi.orig 2011-04-13 08:01:08.000000000 +0000
-+++ webkit/glue/webkit_glue.gypi
-@@ -466,7 +466,7 @@
- # own hard dependencies.
- 'hard_dependency': 1,
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'dependencies': [
- '<(DEPTH)/build/linux/system.gyp:gtk',
- ],
diff --git a/chromium/patches/patch-webkit_glue_webkit__glue.h b/chromium/patches/patch-webkit_glue_webkit__glue.h
deleted file mode 100644
index ae872043cf..0000000000
--- a/chromium/patches/patch-webkit_glue_webkit__glue.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-webkit_glue_webkit__glue.h,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- webkit/glue/webkit_glue.h.orig 2011-04-13 08:01:08.000000000 +0000
-+++ webkit/glue/webkit_glue.h
-@@ -288,7 +288,7 @@ bool LaunchSelLdr(const char* alleged_ur
- void* nacl_process_handle, int* nacl_process_id);
- #endif
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // Return a read-only file descriptor to the font which best matches the given
- // properties or -1 on failure.
- // charset: specifies the language(s) that the font must cover. See
diff --git a/chromium/patches/patch-webkit_glue_webkitclient__impl.cc b/chromium/patches/patch-webkit_glue_webkitclient__impl.cc
deleted file mode 100644
index 04ae0ab3ac..0000000000
--- a/chromium/patches/patch-webkit_glue_webkitclient__impl.cc
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-webkit_glue_webkitclient__impl.cc,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- webkit/glue/webkitclient_impl.cc.orig 2011-04-13 08:01:08.000000000 +0000
-+++ webkit/glue/webkitclient_impl.cc
-@@ -42,7 +42,7 @@
- #include "webkit/glue/websocketstreamhandle_impl.h"
- #include "webkit/glue/weburlloader_impl.h"
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "v8/include/v8.h"
- #endif
-
-@@ -205,7 +205,7 @@ WebKitClientImpl::~WebKitClientImpl() {
- }
-
- WebThemeEngine* WebKitClientImpl::themeEngine() {
--#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
- return &theme_engine_;
- #else
- return NULL;
diff --git a/chromium/patches/patch-webkit_glue_webkitclient__impl.h b/chromium/patches/patch-webkit_glue_webkitclient__impl.h
deleted file mode 100644
index 7335b4a232..0000000000
--- a/chromium/patches/patch-webkit_glue_webkitclient__impl.h
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-webkit_glue_webkitclient__impl.h,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- webkit/glue/webkitclient_impl.h.orig 2011-04-13 08:01:08.000000000 +0000
-+++ webkit/glue/webkitclient_impl.h
-@@ -10,7 +10,7 @@
- #include "third_party/WebKit/Source/WebKit/chromium/public/WebKitClient.h"
- #if defined(OS_WIN)
- #include "webkit/glue/webthemeengine_impl_win.h"
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- #include "webkit/glue/webthemeengine_impl_linux.h"
- #elif defined(OS_MACOSX)
- #include "webkit/glue/webthemeengine_impl_mac.h"
-@@ -91,7 +91,7 @@ class WebKitClientImpl : public WebKit::
- double shared_timer_fire_time_;
- int shared_timer_suspended_; // counter
-
--#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX)
-+#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_BSD)
- WebThemeEngineImpl theme_engine_;
- #endif
- };
diff --git a/chromium/patches/patch-webkit_plugins_npapi_plugin__lib__posix.cc b/chromium/patches/patch-webkit_plugins_npapi_plugin__lib__posix.cc
deleted file mode 100644
index 36fb46a710..0000000000
--- a/chromium/patches/patch-webkit_plugins_npapi_plugin__lib__posix.cc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-webkit_plugins_npapi_plugin__lib__posix.cc,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- webkit/plugins/npapi/plugin_lib_posix.cc.orig 2011-04-13 08:01:07.000000000 +0000
-+++ webkit/plugins/npapi/plugin_lib_posix.cc
-@@ -9,8 +9,8 @@
- #include <sys/exec_elf.h>
- #else
- #include <elf.h>
--#include <fcntl.h>
- #endif
-+#include <fcntl.h>
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <unistd.h>
diff --git a/chromium/patches/patch-webkit_plugins_ppapi_ppapi__plugin__instance.cc b/chromium/patches/patch-webkit_plugins_ppapi_ppapi__plugin__instance.cc
deleted file mode 100644
index 811096d76a..0000000000
--- a/chromium/patches/patch-webkit_plugins_ppapi_ppapi__plugin__instance.cc
+++ /dev/null
@@ -1,67 +0,0 @@
-$NetBSD: patch-webkit_plugins_ppapi_ppapi__plugin__instance.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- webkit/plugins/ppapi/ppapi_plugin_instance.cc.orig 2011-05-24 08:01:04.000000000 +0000
-+++ webkit/plugins/ppapi/ppapi_plugin_instance.cc
-@@ -64,7 +64,7 @@
- #include "printing/native_metafile_factory.h"
- #endif
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- #include "printing/pdf_ps_metafile_cairo.h"
- #endif
-
-@@ -328,7 +328,7 @@ PluginInstance::PluginInstance(PluginDel
- plugin_pdf_interface_(NULL),
- plugin_selection_interface_(NULL),
- plugin_zoom_interface_(NULL),
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- canvas_(NULL),
- #endif // defined(OS_LINUX)
- plugin_print_interface_(NULL),
-@@ -360,7 +360,7 @@ PluginInstance::~PluginInstance() {
- module_->InstanceDeleted(this);
-
- ResourceTracker::Get()->InstanceDeleted(pp_instance_);
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- ranges_.clear();
- #endif // defined(OS_LINUX)
- }
-@@ -930,7 +930,7 @@ int PluginInstance::PrintBegin(const gfx
- if (!num_pages)
- return 0;
- current_print_settings_ = print_settings;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- canvas_ = NULL;
- ranges_.clear();
- #endif // defined(OS_LINUX)
-@@ -941,7 +941,7 @@ bool PluginInstance::PrintPage(int page_
- DCHECK(plugin_print_interface_);
- PP_PrintPageNumberRange_Dev page_range;
- page_range.first_page_number = page_range.last_page_number = page_number;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- ranges_.push_back(page_range);
- canvas_ = canvas;
- return true;
-@@ -976,7 +976,7 @@ bool PluginInstance::PrintPageHelper(PP_
- void PluginInstance::PrintEnd() {
- // Keep a reference on the stack. See NOTE above.
- scoped_refptr<PluginInstance> ref(this);
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // This hack is here because all pages need to be written to PDF at once.
- if (!ranges_.empty())
- PrintPageHelper(&(ranges_.front()), ranges_.size(), canvas_);
-@@ -1079,7 +1079,7 @@ bool PluginInstance::PrintPDFOutput(PP_R
- #endif // defined(OS_WIN)
-
- bool ret = false;
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- // On Linux we need to get the backing PdfPsMetafile and write the bits
- // directly.
- cairo_t* context = canvas->beginPlatformPaint();
diff --git a/chromium/patches/patch-webkit_plugins_ppapi_ppapi__plugin__instance.h b/chromium/patches/patch-webkit_plugins_ppapi_ppapi__plugin__instance.h
deleted file mode 100644
index b3eeb1e12f..0000000000
--- a/chromium/patches/patch-webkit_plugins_ppapi_ppapi__plugin__instance.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-webkit_plugins_ppapi_ppapi__plugin__instance.h,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- webkit/plugins/ppapi/ppapi_plugin_instance.h.orig 2011-04-13 08:01:07.000000000 +0000
-+++ webkit/plugins/ppapi/ppapi_plugin_instance.h
-@@ -297,7 +297,7 @@ class PluginInstance : public base::RefC
- // to keep the pixels valid until CGContextEndPage is called. We use this
- // variable to hold on to the pixels.
- scoped_refptr<PPB_ImageData_Impl> last_printed_page_;
--#elif defined(OS_LINUX)
-+#elif defined(OS_LINUX) || defined(OS_BSD)
- // On Linux, all pages need to be written to a PDF file in one shot. However,
- // when users print only a subset of all the pages, it is impossible to know
- // if a call to PrintPage() is the last call. Thus in PrintPage(), just store
diff --git a/chromium/patches/patch-webkit_plugins_ppapi_ppb__file__system__impl.cc b/chromium/patches/patch-webkit_plugins_ppapi_ppb__file__system__impl.cc
deleted file mode 100644
index e7ea5c16d7..0000000000
--- a/chromium/patches/patch-webkit_plugins_ppapi_ppb__file__system__impl.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-webkit_plugins_ppapi_ppb__file__system__impl.cc,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- webkit/plugins/ppapi/ppb_file_system_impl.cc.orig 2011-04-13 08:01:07.000000000 +0000
-+++ webkit/plugins/ppapi/ppb_file_system_impl.cc
-@@ -37,7 +37,7 @@ PP_Resource Create(PP_Instance instance,
- }
-
- int32_t Open(PP_Resource file_system_id,
-- int64 expected_size,
-+ int64_t expected_size,
- PP_CompletionCallback callback) {
- scoped_refptr<PPB_FileSystem_Impl> file_system(
- Resource::GetAs<PPB_FileSystem_Impl>(file_system_id));
diff --git a/chromium/patches/patch-webkit_plugins_ppapi_ppb__flash__impl.h b/chromium/patches/patch-webkit_plugins_ppapi_ppb__flash__impl.h
deleted file mode 100644
index 13e6d162b6..0000000000
--- a/chromium/patches/patch-webkit_plugins_ppapi_ppb__flash__impl.h
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-webkit_plugins_ppapi_ppb__flash__impl.h,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- webkit/plugins/ppapi/ppb_flash_impl.h.orig 2011-04-13 08:01:07.000000000 +0000
-+++ webkit/plugins/ppapi/ppb_flash_impl.h
-@@ -33,7 +33,7 @@ class PPB_Flash_Impl {
- uint32_t glyph_count,
- const uint16_t glyph_indices[],
- const PP_Point glyph_advances[])
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- ;
- #else
- { return PP_FALSE; }
diff --git a/chromium/patches/patch-webkit_plugins_ppapi_ppb__pdf__impl.cc b/chromium/patches/patch-webkit_plugins_ppapi_ppb__pdf__impl.cc
deleted file mode 100644
index cbeb211212..0000000000
--- a/chromium/patches/patch-webkit_plugins_ppapi_ppb__pdf__impl.cc
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-webkit_plugins_ppapi_ppb__pdf__impl.cc,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- webkit/plugins/ppapi/ppb_pdf_impl.cc.orig 2011-04-13 08:01:07.000000000 +0000
-+++ webkit/plugins/ppapi/ppb_pdf_impl.cc
-@@ -25,7 +25,7 @@
- namespace webkit {
- namespace ppapi {
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- class PrivateFontFile : public Resource {
- public:
- PrivateFontFile(PluginInstance* instance, int fd)
-@@ -145,7 +145,7 @@ PP_Resource GetFontFileWithFallback(
- PP_Instance instance_id,
- const PP_FontDescription_Dev* description,
- PP_PrivateFontCharset charset) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- PluginInstance* instance = ResourceTracker::Get()->GetInstance(instance_id);
- if (!instance)
- return 0;
-@@ -176,7 +176,7 @@ bool GetFontTableForPrivateFontFile(PP_R
- uint32_t table,
- void* output,
- uint32_t* output_length) {
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- scoped_refptr<PrivateFontFile> font(
- Resource::GetAs<PrivateFontFile>(font_file));
- if (!font.get())
-@@ -301,7 +301,7 @@ const PPB_PDF* PPB_PDF_Impl::GetInterfac
- return &ppb_pdf;
- }
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- bool PrivateFontFile::GetFontTable(uint32_t table,
- void* output,
- uint32_t* output_length) {
diff --git a/chromium/patches/patch-webkit_support_webkit__support__glue.cc b/chromium/patches/patch-webkit_support_webkit__support__glue.cc
deleted file mode 100644
index ce076559bc..0000000000
--- a/chromium/patches/patch-webkit_support_webkit__support__glue.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-webkit_support_webkit__support__glue.cc,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- webkit/support/webkit_support_glue.cc.orig 2011-04-13 08:01:08.000000000 +0000
-+++ webkit/support/webkit_support_glue.cc
-@@ -99,7 +99,7 @@ void EnableSpdy(bool enable) {
- void UserMetricsRecordAction(const std::string& action) {
- }
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- int MatchFontWithFallback(const std::string& face, bool bold,
- bool italic, int charset) {
- return -1;
diff --git a/chromium/patches/patch-webkit_tools_pepper__test__plugin_event__handler.cc b/chromium/patches/patch-webkit_tools_pepper__test__plugin_event__handler.cc
deleted file mode 100644
index 449623bbe9..0000000000
--- a/chromium/patches/patch-webkit_tools_pepper__test__plugin_event__handler.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-webkit_tools_pepper__test__plugin_event__handler.cc,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- webkit/tools/pepper_test_plugin/event_handler.cc.orig 2011-04-13 08:01:08.000000000 +0000
-+++ webkit/tools/pepper_test_plugin/event_handler.cc
-@@ -55,7 +55,7 @@ void EventHandler::addText(const char* c
- }
-
- std::string EventHandler::EventName(double timestamp, int32 type) {
--#if !defined(OS_LINUX)
-+#if !defined(OS_LINUX) && !defined(OS_BSD)
- std::stringstream strstr;
- strstr.setf(std::ios::fixed, std::ios::floatfield);
- strstr << timestamp << ": ";
diff --git a/chromium/patches/patch-webkit_tools_pepper__test__plugin_pepper__test__plugin.gyp b/chromium/patches/patch-webkit_tools_pepper__test__plugin_pepper__test__plugin.gyp
deleted file mode 100644
index 433e382dfc..0000000000
--- a/chromium/patches/patch-webkit_tools_pepper__test__plugin_pepper__test__plugin.gyp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-webkit_tools_pepper__test__plugin_pepper__test__plugin.gyp,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp.orig 2011-04-13 08:01:08.000000000 +0000
-+++ webkit/tools/pepper_test_plugin/pepper_test_plugin.gyp
-@@ -47,11 +47,11 @@
- ],
- },
- }],
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'type': 'shared_library',
- 'cflags': ['-fvisibility=hidden'],
- }],
-- ['OS=="linux" or OS=="openbsd" or OS=="freebsd" and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', {
-+ ['(OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd") and (target_arch=="x64" or target_arch=="arm") and linux_fpic!=1', {
- 'product_name': 'pepper_test_plugin',
- # Shared libraries need -fPIC on x86-64
- 'cflags': ['-fPIC'],
diff --git a/chromium/patches/patch-webkit_tools_test__shell_test__shell.cc b/chromium/patches/patch-webkit_tools_test__shell_test__shell.cc
deleted file mode 100644
index 754010b895..0000000000
--- a/chromium/patches/patch-webkit_tools_test__shell_test__shell.cc
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-webkit_tools_test__shell_test__shell.cc,v 1.2 2011/05/27 13:23:09 rxg Exp $
-
---- webkit/tools/test_shell/test_shell.cc.orig 2011-05-24 08:01:05.000000000 +0000
-+++ webkit/tools/test_shell/test_shell.cc
-@@ -703,7 +703,7 @@ bool LaunchSelLdr(const char* alleged_ur
- return false;
- }
-
--#if defined(OS_LINUX)
-+#if defined(OS_LINUX) || defined(OS_BSD)
- int MatchFontWithFallback(const std::string& face, bool bold,
- bool italic, int charset) {
- return -1;
diff --git a/chromium/patches/patch-webkit_tools_test__shell_test__shell.gypi b/chromium/patches/patch-webkit_tools_test__shell_test__shell.gypi
deleted file mode 100644
index ec1cd8d1fd..0000000000
--- a/chromium/patches/patch-webkit_tools_test__shell_test__shell.gypi
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD: patch-webkit_tools_test__shell_test__shell.gypi,v 1.1 2011/04/28 03:09:03 rxg Exp $
-
---- webkit/tools/test_shell/test_shell.gypi.orig 2011-04-13 08:01:08.000000000 +0000
-+++ webkit/tools/test_shell/test_shell.gypi
-@@ -128,7 +128,7 @@
- 'copy_npapi_test_plugin',
- ],
- }],
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'dependencies': [
- 'test_shell_resources',
- '<(DEPTH)/build/linux/system.gyp:gtk',
-@@ -170,7 +170,7 @@
- 'pak_path': '<(INTERMEDIATE_DIR)/repack/test_shell.pak',
- },
- 'conditions': [
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'actions': [
- {
- 'action_name': 'test_shell_repack',
-@@ -274,7 +274,7 @@
- },
- },
- }],
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'conditions': [
- ['linux_use_tcmalloc==1', {
- 'dependencies': [
-@@ -455,7 +455,7 @@
- },
- },
- }],
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'dependencies': [
- 'test_shell_pak',
- '<(DEPTH)/build/linux/system.gyp:gtk',
-@@ -492,7 +492,7 @@
- '../../../skia/ext/vector_canvas_unittest.cc',
- ],
- }],
-- ['OS=="linux" or OS=="freebsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'conditions': [
- ['linux_use_tcmalloc==1', {
- 'dependencies': [
-@@ -609,13 +609,13 @@
- ],
- },
- }],
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd"', {
- 'sources!': [
- # Needs simple event record type porting
- '../../plugins/npapi/test/plugin_windowless_test.cc',
- ],
- }],
-- ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris") and (target_arch=="x64" or target_arch=="arm")', {
-+ ['(OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris") and (target_arch=="x64" or target_arch=="arm")', {
- # Shared libraries need -fPIC on x86-64
- 'cflags': ['-fPIC']
- }],
-@@ -644,7 +644,7 @@
- },
- ]
- }],
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'copies': [
- {
- 'destination': '<(PRODUCT_DIR)/plugins',
-@@ -656,7 +656,7 @@
- },
- ],
- }],
-- ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-+ ['OS=="linux" or OS=="dragonfly" or OS=="freebsd" or OS=="netbsd" or OS=="openbsd" or OS=="solaris"', {
- 'targets': [
- {
- 'target_name': 'test_shell_resources',
Home |
Main Index |
Thread Index |
Old Index