Index: head/www/chromium/Makefile =================================================================== --- head/www/chromium/Makefile (revision 426522) +++ head/www/chromium/Makefile (revision 426523) @@ -1,419 +1,419 @@ # Created by: Florent Thoumie # $FreeBSD$ PORTNAME= chromium PORTVERSION= 52.0.2743.116 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www MASTER_SITES= http://commondatastorage.googleapis.com/chromium-browser-official/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} # default, but needed to get distinfo correct if TEST is on MAINTAINER= chromium@FreeBSD.org COMMENT= Google web browser based on WebKit LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi BROKEN_FreeBSD_9=does not patch CFLAGS+= -isystem${LOCALBASE}/include -I${PREFIX}/include/atk-1.0 BUILD_DEPENDS= ${LOCALBASE}/bin/gperf:devel/gperf \ bash:shells/bash \ yasm:devel/yasm \ flock:sysutils/flock \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat \ ${LOCALBASE}/share/usbids/usb.ids:misc/usbids \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2 \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply \ ${PYTHON_PKGNAMEPREFIX}html5lib>0:www/py-html5lib LIB_DEPENDS= libasound.so:audio/alsa-lib \ libcairo.so:graphics/cairo \ libcups.so:print/cups \ libdbus-1.so:devel/dbus \ libdbus-glib-1.so:devel/dbus-glib \ libdrm.so:graphics/libdrm \ libexpat.so:textproc/expat2 \ libFLAC.so:audio/flac \ libfreetype.so:print/freetype2 \ libgnome-keyring.so:security/libgnome-keyring \ libharfbuzz.so:print/harfbuzz \ libevent.so:devel/libevent2 \ libexif.so:graphics/libexif \ libfontconfig.so:x11-fonts/fontconfig \ libgcrypt.so:security/libgcrypt \ libicuuc.so:devel/icu \ libjsoncpp.so:devel/jsoncpp \ libnspr4.so:devel/nspr \ libnss3.so:security/nss \ libpci.so:devel/libpci \ libpng.so:graphics/png \ libre2.so:devel/re2 \ libsnappy.so:archivers/snappy \ libspeechd.so:accessibility/speech-dispatcher \ libspeex.so:audio/speex \ libwebp.so:graphics/webp \ libxml2.so:textproc/libxml2 RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins \ alsa-lib>=1.1.1_1:audio/alsa-lib \ droid-fonts-ttf>0:x11-fonts/droid-fonts-ttf \ xdg-open:devel/xdg-utils ONLY_FOR_ARCHS= i386 amd64 USES= bison cpe desktop-file-utils execinfo jpeg \ ninja perl5 pkgconfig python:2,build shebangfix tar:xz # chromium requires a recent compiler (C++11 capable, but clang 3.4 is # not able to build chromium. OTOH clang36 on FreeBSD 9.3 cannot build # chromium as the libc++ includes are not up to the task. USES flags # have to be set before bsd.ports.pre.mk and thereby cannot depend on # bsd.ports.pre.mk's variables, so I'm using a hack here. .if exists(/usr/lib/libc++.a) USES+= compiler:c++14-lang .else USES+= compiler:c++11-lib .endif CPE_VENDOR= google CPE_PRODUCT= chrome USE_PERL5= build USE_XORG= scrnsaverproto x11 xcomposite xcursor xext xdamage xfixes xi \ xproto xrandr xrender xscrnsaver xtst USE_GNOME= atk glib20 gtk20 dconf libxslt MAKE_ARGS= -C out/${BUILDTYPE} SHEBANG_FILES= chrome/tools/build/linux/chrome-wrapper ALL_TARGET= chrome INSTALLS_ICONS= yes #TODO bz@ : install libwidevinecdm.so (see # third_party/widevine/cdm/widevine_cdm.gyp) # See build/common.gypi for all the available variables. GYP_DEFINES+= \ clang_use_chrome_plugins=0 \ linux_breakpad=0 \ linux_use_heapchecker=0 \ linux_strip_binary=1 \ use_aura=1 \ test_isolation_mode=noop \ disable_nacl=1 \ enable_extensions=1 \ enable_one_click_signin=1 \ enable_openmax=1 \ enable_webrtc=1 \ werror= \ no_gc_sections=1 \ OS=freebsd \ os_ver=${OSVERSION} \ prefix_dir=${LOCALBASE} \ python_ver=${PYTHON_VER} \ use_allocator=none \ use_cups=1 \ linux_link_gsettings=1 \ linux_link_libpci=1 \ linux_link_libspeechd=1 \ libspeechd_h_prefix=speech-dispatcher/ \ usb_ids_path=${LOCALBASE}/share/usbids/usb.ids \ want_separate_host_toolset=0 \ use_system_bzip2=1 \ use_system_flac=1 \ use_system_harfbuzz=1 \ use_system_icu=1 \ use_system_jsoncpp=1 \ use_system_libevent=1 \ use_system_libexif=1 \ use_system_libjpeg=1 \ use_system_libpng=1 \ use_system_libusb=1 \ use_system_libwebp=1 \ use_system_libxml=1 \ use_system_libxslt=1 \ use_system_nspr=1 \ use_system_protobuf=0 \ use_system_re2=1 \ use_system_snappy=1 \ use_system_speex=1 \ use_system_xdg_utils=1 \ use_system_yasm=1 \ v8_use_external_startup_data=0 # allow removal of third_party/adobe GYP_DEFINES+= flapper_version_h_file='${WRKSRC}/flapper_version.h' # FreeBSD Chromium Api Key # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . # Note: these are for FreeBSD use ONLY. For your own distribution, # please get your own set of keys. GYP_DEFINES+= google_api_key=AIzaSyBsp9n41JLW8jCokwn7vhoaMejDFRd1mp8 \ google_default_client_id=996322985003.apps.googleusercontent.com \ google_default_client_secret=IR1za9-1VK0zZ0f_O8MVFicn SUB_FILES= chromium-browser.desktop chrome SUB_LIST+= COMMENT="${COMMENT}" OPTIONS_DEFINE= CODECS GCONF PULSEAUDIO TEST KERBEROS DEBUG DRIVER CODECS_DESC= Compile and enable patented codecs like H.264 DRIVER_DESC= Install chromedriver OPTIONS_DEFAULT= CODECS GCONF KERBEROS OPTIONS_SUB= yes GCONF_USE= GNOME=gconf2 PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio DRIVER_MAKE_ARGS=chromedriver TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} .include .if ${PORT_OPTIONS:MCODECS} GYP_DEFINES+= ffmpeg_branding=Chrome GYP_DEFINES+= proprietary_codecs=1 .else GYP_DEFINES+= ffmpeg_branding=Chromium GYP_DEFINES+= proprietary_codecs=0 .endif .if ${PORT_OPTIONS:MGCONF} GYP_DEFINES+= use_gconf=1 .else GYP_DEFINES+= use_gconf=0 .endif .if ${PORT_OPTIONS:MPULSEAUDIO} GYP_DEFINES+= use_pulseaudio=1 .else GYP_DEFINES+= use_pulseaudio=0 .endif .if empty(MACHINE_CPU:Msse2) GYP_DEFINES+= disable_sse2=1 .endif .if !exists(/usr/libdata/pkgconfig/libusb-1.0.pc) EXTRA_PATCHES+= ${FILESDIR}/extra-patch-libusb-pc .endif # pointed out by "Tomek" on freebsd-chromium@ .if !exists(/usr/lib/libexecinfo.so) CFLAGS+= -fno-omit-frame-pointer EXTRA_PATCHES+= ${FILESDIR}/extra-patch-fixup-ffmpeg .endif .if ${PORT_OPTIONS:MTEST} .include "Makefile.tests" ALL_TARGET+= ${TEST_TARGETS} .endif DEBUG_MAKE_ENV= V=1 .if ${PORT_OPTIONS:MDEBUG} BUILDTYPE= Debug .else BUILDTYPE= Release .endif CONFIGURE_ENV+= CC="${CC}" \ CXX="${CXX}" \ GYP_GENERATORS=ninja \ GYP_DEFINES="${GYP_DEFINES}" MAKE_ENV+= BUILDTYPE=${BUILDTYPE} \ GPERF="${LOCALBASE}/bin/gperf" .include .if ${CHOSEN_COMPILER_TYPE} == gcc GYP_DEFINES+= gcc_version=${CXX:S/g++//} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-gcc CFLAGS+= -fno-stack-protector # gcc 4.8 cannot find __stack_chk_fail_local .else GYP_DEFINES+= clang=1 CFLAGS+= -Wno-unknown-warning-option \ -D_LIBCPP_TRIVIAL_PAIR_COPY_CTOR=1 # work around base r261801 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang CONFIGURE_ENV+= AR=/usr/bin/ar .endif .if ! ${PORT_OPTIONS:MKERBEROS} GYP_DEFINES+= use_kerberos=0 .endif # according to portlint the below is passed via bsd.port.mk, # but 'make -V CONFIGURE_ENV' does not show it: CONFIGURE_ENV+= CFLAGS="${CFLAGS}" \ CPPFLAGS="${CPPFLAGS}" \ CXXFLAGS="${CXXFLAGS}" \ LDFLAGS="${LDFLAGS}" pre-everything:: @${ECHO_MSG} @${ECHO_MSG} "To build Chromium, you should have around 2 GB of memory" .if ${PORT_OPTIONS:MDEBUG} @${ECHO_MSG} "and lots of free diskspace (~ 8.5GB)." .else @${ECHO_MSG} "and a fair amount of free diskspace (~ 3.7GB)." .endif @${ECHO_MSG} @${ECHO_MSG} "Make sure you have Python build with the SEM option ON" @${ECHO_MSG} "(default in python27-2.7.8 since r361735)" post-patch: @${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|" \ ${WRKSRC}/crypto/crypto.gyp \ ${WRKSRC}/v8/src/v8.gyp \ ${WRKSRC}/v8/gypfiles/toolchain.gypi @${REINPLACE_CMD} -e "s|/usr/local|${PREFIX}|" \ ${WRKSRC}/chrome/common/chrome_paths.cc \ ${WRKSRC}/base/base.gyp pre-configure: # phajdan-jr: list of things *not* to remove, so maybe the script # should be called "keep_bundled_libraries.py" cd ${WRKSRC} && ${PYTHON_CMD} \ ./build/linux/unbundle/remove_bundled_libraries.py \ 'base/third_party/dmg_fp' \ 'base/third_party/dynamic_annotations' \ 'base/third_party/icu' \ 'base/third_party/nspr' \ 'base/third_party/superfasthash' \ 'base/third_party/symbolize' \ 'base/third_party/valgrind' \ 'base/third_party/xdg_mime' \ 'base/third_party/xdg_user_dirs' \ 'breakpad/src/third_party/curl' \ 'chrome/third_party/mock4js' \ 'chrome/third_party/mozilla_security_manager' \ 'courgette/third_party' \ 'net/third_party/mozilla_security_manager' \ 'net/third_party/nss' \ 'third_party/WebKit' \ 'third_party/analytics' \ 'third_party/angle' \ 'third_party/angle/src/third_party' \ 'third_party/blanketjs' \ 'third_party/brotli' \ 'third_party/boringssl' \ 'third_party/cacheinvalidation' \ 'third_party/catapult' \ 'third_party/catapult/third_party/beautifulsoup4' \ 'third_party/catapult/third_party/py_vulcanize' \ 'third_party/catapult/third_party/py_vulcanize/py_vulcanize' \ 'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \ 'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \ 'third_party/catapult/tracing' \ 'third_party/catapult/tracing/third_party' \ 'third_party/cld' \ 'third_party/cros_system_api' \ 'third_party/dom_distiller_js' \ 'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \ 'third_party/ffmpeg' \ 'third_party/gardiner_mod' \ 'third_party/fips181' \ 'third_party/flot' \ 'third_party/google_input_tools' \ 'third_party/google_input_tools/third_party/closure_library' \ 'third_party/google_input_tools/third_party/closure_library/third_party/closure' \ 'third_party/hunspell' \ 'third_party/iccjpeg' \ 'third_party/icu/icu.isolate' \ 'third_party/jinja2' \ 'third_party/jstemplate' \ 'third_party/khronos' \ 'third_party/leveldatabase' \ 'third_party/libaddressinput' \ 'third_party/libjingle' \ 'third_party/libphonenumber' \ 'third_party/libsrtp' \ 'third_party/libvpx' \ 'third_party/libvpx/source/libvpx/third_party/x86inc' \ 'third_party/libwebm' \ 'third_party/libxml/chromium' \ 'third_party/libXNVCtrl' \ 'third_party/libyuv' \ 'third_party/lss' \ 'third_party/lzma_sdk' \ 'third_party/markupsafe' \ 'third_party/mesa' \ 'third_party/modp_b64' \ 'third_party/mt19937ar' \ 'third_party/openh264' \ 'third_party/openmax_dl' \ 'third_party/opus' \ 'third_party/ots' \ 'third_party/pdfium' \ 'third_party/pdfium/third_party' \ 'third_party/ply' \ 'third_party/polymer' \ 'third_party/protobuf' \ 'third_party/protobuf/third_party' \ 'third_party/protobuf/third_party/six' \ 'third_party/pywebsocket' \ 'third_party/qcms' \ 'third_party/qunit' \ 'third_party/sfntly' \ 'third_party/sinonjs' \ 'third_party/skia' \ 'third_party/smhasher' \ 'third_party/sqlite' \ 'third_party/tcmalloc' \ 'third_party/tlslite' \ 'third_party/usrsctp' \ 'third_party/web-animations-js' \ 'third_party/webdriver' \ 'third_party/webrtc' \ 'third_party/widevine' \ 'third_party/woff2' \ 'third_party/x86inc' \ 'third_party/yasm' \ 'third_party/zlib' \ 'url/third_party/mozilla' \ 'v8/src/third_party/valgrind' \ 'v8/src/third_party/fdlibm' \ --do-remove || ${FALSE} cd ${WRKSRC} && ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gyp_files.py \ ${GYP_DEFINES:C/^/-D/} || ${FALSE} # allow removal of third_party/adobe ${ECHO_CMD} > ${WRKSRC}/flapper_version.h # missing file: file is in -testdata only, but configure stage # will fail if it's not there. do not break TESTS build while # allowing regular build without pulling in -testdata. ${TOUCH} ${WRKSRC}/chrome/test/data/webui/i18n_process_css_test.html do-configure: cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/gyp_chromium chrome/chrome.gyp --depth . test regression-test: build .for t in ${TEST_TARGETS} cd ${WRKSRC}/out/${BUILDTYPE} && ${SETENV} LC_ALL=en_US.UTF-8 \ ./${t} --gtest_filter=-${EXCLUDE_${t}:ts:} || ${TRUE} .endfor do-install: @${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_MAN} ${WRKSRC}/out/${BUILDTYPE}/chrome.1 ${STAGEDIR}${MANPREFIX}/man/man1 .for s in 22 24 48 64 128 256 @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps ${INSTALL_DATA} ${WRKSRC}/chrome/app/theme/chromium/product_logo_${s}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}x${s}/apps/chrome.png .endfor ${INSTALL_SCRIPT} ${WRKSRC}/chrome/tools/build/linux/chrome-wrapper \ ${STAGEDIR}${DATADIR} .for p in chrome_100_percent content_resources keyboard_resources resources ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${p}.pak \ ${STAGEDIR}${DATADIR} .endfor ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \ ${STAGEDIR}${DATADIR} cd ${WRKSRC}/out/${BUILDTYPE} && \ ${COPYTREE_SHARE} "locales pseudo_locales resources" ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${DESKTOPDIR} ${INSTALL_DATA} ${WRKDIR}/chromium-browser.desktop \ ${STAGEDIR}${DESKTOPDIR} ${INSTALL_SCRIPT} ${WRKDIR}/chrome ${STAGEDIR}${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/mksnapshot \ ${STAGEDIR}${DATADIR} .if ${PORT_OPTIONS:MDRIVER} ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chromedriver \ ${STAGEDIR}${PREFIX}/bin .endif .include Index: head/www/chromium/files/patch-components_url__formatter_url__formatter.cc =================================================================== --- head/www/chromium/files/patch-components_url__formatter_url__formatter.cc (nonexistent) +++ head/www/chromium/files/patch-components_url__formatter_url__formatter.cc (revision 426523) @@ -0,0 +1,33 @@ +https://chromium.googlesource.com/chromium/src.git/+/424584b4984bde7c831f42e9fb47f1ad583a1c46%5E%21/ + +--- components/url_formatter/url_formatter.cc.orig 2016-08-03 19:02:17 UTC ++++ components/url_formatter/url_formatter.cc +@@ -429,9 +429,9 @@ void IDNSpoofChecker::SetAllowedUnicodeS + // section at + // http://www.unicode.org/Public/security/latest/xidmodifications.txt) are + // are added to the allowed set. The list has to be updated when a new +- // version of Unicode is released. The current version is 8.0.0 and ICU 58 +- // will have Unicode 9.0 data. +-#if U_ICU_VERSION_MAJOR_NUM < 58 ++ // version of Unicode is released. The current version is 9.0.0 and ICU 60 ++ // will have Unicode 10.0 data. ++#if U_ICU_VERSION_MAJOR_NUM < 60 + const icu::UnicodeSet aspirational_scripts( + icu::UnicodeString( + // Unified Canadian Syllabics +@@ -445,13 +445,13 @@ void IDNSpoofChecker::SetAllowedUnicodeS + // Yi + "\\uA000-\\uA48C" + // Miao +- "\\U00016F00-\\U00016F44\\U00016F50-\\U00016F7F" ++ "\\U00016F00-\\U00016F44\\U00016F50-\\U00016F7E" + "\\U00016F8F-\\U00016F9F]", + -1, US_INV), + *status); + allowed_set.addAll(aspirational_scripts); + #else +-#error "Update aspirational_scripts per Unicode 9.0" ++#error "Update aspirational_scripts per Unicode 10.0" + #endif + + // U+0338 is included in the recommended set, while U+05F4 and U+2027 are in Property changes on: head/www/chromium/files/patch-components_url__formatter_url__formatter.cc ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/www/chromium/files/patch-third__party_WebKit_Source_platform_text_TextBreakIterator.cpp =================================================================== --- head/www/chromium/files/patch-third__party_WebKit_Source_platform_text_TextBreakIterator.cpp (nonexistent) +++ head/www/chromium/files/patch-third__party_WebKit_Source_platform_text_TextBreakIterator.cpp (revision 426523) @@ -0,0 +1,64 @@ +https://chromium.googlesource.com/chromium/src.git/+/e60b571faa3f14dd9119a6792dccf12f8bf80192%5E%21/ + +--- third_party/WebKit/Source/platform/text/TextBreakIterator.cpp.orig 2016-08-03 19:02:36 UTC ++++ third_party/WebKit/Source/platform/text/TextBreakIterator.cpp +@@ -27,6 +27,9 @@ + #include "wtf/StdLibExtras.h" + #include "wtf/text/CharacterNames.h" + ++#include ++#include ++ + namespace blink { + + unsigned numGraphemeClusters(const String& string) +@@ -123,13 +126,18 @@ static const unsigned char asciiLineBrea + { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0) }, // DEL + }; + ++#if U_ICU_VERSION_MAJOR_NUM >= 58 ++#define BA_LB_COUNT (U_LB_COUNT - 3) ++#else ++#define BA_LB_COUNT U_LB_COUNT ++#endif + // Line breaking table for CSS word-break: break-all. This table differs from + // asciiLineBreakTable in: + // - Indices are Line Breaking Classes defined in UAX#14 Unicode Line Breaking + // Algorithm: http://unicode.org/reports/tr14/#DescriptionOfProperties + // - 1 indicates additional break opportunities. 0 indicates to fallback to + // normal line break, not "prohibit break." +-static const unsigned char breakAllLineBreakClassTable[][U_LB_COUNT / 8 + 1] = { ++static const unsigned char breakAllLineBreakClassTable[][BA_LB_COUNT / 8 + 1] = { + // XX AI AL B2 BA BB BK CB CL CM CR EX GL HY ID IN IS LF NS NU OP PO PR QU SA SG SP SY ZW NL WJ H2 H3 JL JT JV CP CJ HL RI + { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0) }, // XX + { B(0, 1, 1, 0, 1, 0, 0, 0), B(0, 0, 0, 0, 0, 1, 0, 0), B(0, 0, 0, 1, 1, 0, 1, 0), B(1, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 1, 0) }, // AI +@@ -179,10 +187,10 @@ static const unsigned char breakAllLineB + #undef AL + + static_assert(WTF_ARRAY_LENGTH(asciiLineBreakTable) == asciiLineBreakTableLastChar - asciiLineBreakTableFirstChar + 1, "asciiLineBreakTable should be consistent"); +-static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == U_LB_COUNT, "breakAllLineBreakClassTable should be consistent"); ++static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == BA_LB_COUNT, ++ "breakAllLineBreakClassTable should be consistent"); + +-static inline bool shouldBreakAfter(UChar lastCh, UChar ch, UChar nextCh) +-{ ++static inline bool shouldBreakAfter(UChar lastCh, UChar ch, UChar nextCh) { + // Don't allow line breaking between '-' and a digit if the '-' may mean a minus sign in the context, + // while allow breaking in 'ABCD-1234' and '1234-5678' which may be in long URLs. + if (ch == '-' && isASCIIDigit(nextCh)) +@@ -210,10 +218,11 @@ static inline ULineBreak lineBreakProper + + static inline bool shouldBreakAfterBreakAll(ULineBreak lastLineBreak, ULineBreak lineBreak) + { +- if (lineBreak >= 0 && lineBreak < U_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < U_LB_COUNT) { +- const unsigned char* tableRow = breakAllLineBreakClassTable[lastLineBreak]; +- return tableRow[lineBreak / 8] & (1 << (lineBreak % 8)); +- } ++ if (lineBreak >= 0 && lineBreak < BA_LB_COUNT && lastLineBreak >= 0 && ++ lastLineBreak < BA_LB_COUNT) { ++ const unsigned char* tableRow = breakAllLineBreakClassTable[lastLineBreak]; ++ return tableRow[lineBreak / 8] & (1 << (lineBreak % 8)); ++ } + return false; + } + Property changes on: head/www/chromium/files/patch-third__party_WebKit_Source_platform_text_TextBreakIterator.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property