diff options
Diffstat (limited to 'extra/chromium')
| -rw-r--r-- | extra/chromium/.footprint | 100 | ||||
| -rw-r--r-- | extra/chromium/.md5sum | 3 | ||||
| -rw-r--r-- | extra/chromium/Pkgfile | 37 | ||||
| -rw-r--r-- | extra/chromium/chromium-html5-video-mimetypes.patch | 48 | ||||
| -rw-r--r-- | extra/chromium/issue1620003_1_2.diff | 13 | ||||
| -rw-r--r-- | extra/chromium/issue2019002_21001.diff | 182 |
6 files changed, 328 insertions, 55 deletions
diff --git a/extra/chromium/.footprint b/extra/chromium/.footprint index 8ad3ace39..166857808 100644 --- a/extra/chromium/.footprint +++ b/extra/chromium/.footprint @@ -66,48 +66,38 @@ drwxr-xr-x root/root usr/lib/chromium/resources/bookmark_manager/ drwxr-xr-x root/root usr/lib/chromium/resources/bookmark_manager/css/ -rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/css/bmm.css -rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/css/bmm.css.js --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/css/list.css --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/css/menu.css --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/css/tree.css --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/css/tree.css.js drwxr-xr-x root/root usr/lib/chromium/resources/bookmark_manager/images/ --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/images/bookmark_bar_folder_mac.png -rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/images/bookmark_manager_recent.png -rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/images/bookmark_manager_search.png -rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/images/bookmarks_favicon.png -rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/images/bookmarks_section.png --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/images/default_favicon.png --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/images/folder_closed.png --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/images/folder_closed_rtl.png --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/images/folder_open.png --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/images/folder_open_rtl.png +-rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/images/bookmarks_section_32.png drwxr-xr-x root/root usr/lib/chromium/resources/bookmark_manager/js/ -rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/bmm.js drwxr-xr-x root/root usr/lib/chromium/resources/bookmark_manager/js/bmm/ --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/bmm/bookmarklist.js --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/bmm/bookmarktree.js --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/bmm/treeiterator.js --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/cr.js -drwxr-xr-x root/root usr/lib/chromium/resources/bookmark_manager/js/cr/ --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/cr/event.js --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/cr/eventtarget.js --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/cr/promise.js --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/cr/ui.js -drwxr-xr-x root/root usr/lib/chromium/resources/bookmark_manager/js/cr/ui/ --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/cr/ui/command.js --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/cr/ui/contextmenuhandler.js --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/cr/ui/list.js --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/cr/ui/listitem.js --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/cr/ui/listselectionmodel.js --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/cr/ui/menu.js --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/cr/ui/menubutton.js --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/cr/ui/menuitem.js --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/cr/ui/tree.js --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/i18ntemplate.js --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/localstrings.js --rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/util.js +-rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/bmm/bookmark_list.js +-rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/bmm/bookmark_tree.js +-rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/js/bmm/tree_iterator.js -rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/main.html -rw-r--r-- root/root usr/lib/chromium/resources/bookmark_manager/manifest.json +drwxr-xr-x root/root usr/lib/chromium/resources/calendar_app/ +-rw-r--r-- root/root usr/lib/chromium/resources/calendar_app/128.png +-rw-r--r-- root/root usr/lib/chromium/resources/calendar_app/24.png +-rw-r--r-- root/root usr/lib/chromium/resources/calendar_app/32.png +-rw-r--r-- root/root usr/lib/chromium/resources/calendar_app/48.png +-rw-r--r-- root/root usr/lib/chromium/resources/calendar_app/manifest.json +drwxr-xr-x root/root usr/lib/chromium/resources/docs_app/ +-rw-r--r-- root/root usr/lib/chromium/resources/docs_app/128.png +-rw-r--r-- root/root usr/lib/chromium/resources/docs_app/24.png +-rw-r--r-- root/root usr/lib/chromium/resources/docs_app/32.png +-rw-r--r-- root/root usr/lib/chromium/resources/docs_app/48.png +-rw-r--r-- root/root usr/lib/chromium/resources/docs_app/manifest.json +drwxr-xr-x root/root usr/lib/chromium/resources/gmail_app/ +-rw-r--r-- root/root usr/lib/chromium/resources/gmail_app/128.png +-rw-r--r-- root/root usr/lib/chromium/resources/gmail_app/24.png +-rw-r--r-- root/root usr/lib/chromium/resources/gmail_app/32.png +-rw-r--r-- root/root usr/lib/chromium/resources/gmail_app/48.png +-rw-r--r-- root/root usr/lib/chromium/resources/gmail_app/manifest.json drwxr-xr-x root/root usr/lib/chromium/resources/inspector/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/DevTools.js drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ @@ -283,17 +273,61 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/ -rw-r--r-- root/root usr/lib/chromium/resources/inspector/popover.css -rw-r--r-- root/root usr/lib/chromium/resources/inspector/textViewer.css drwxr-xr-x root/root usr/lib/chromium/resources/net_internals/ +-rw-r--r-- root/root usr/lib/chromium/resources/net_internals/dataview.js -rw-r--r-- root/root usr/lib/chromium/resources/net_internals/detailsview.js +-rw-r--r-- root/root usr/lib/chromium/resources/net_internals/dnsview.js +-rw-r--r-- root/root usr/lib/chromium/resources/net_internals/httpcacheview.js -rw-r--r-- root/root usr/lib/chromium/resources/net_internals/index.html --rw-r--r-- root/root usr/lib/chromium/resources/net_internals/layoutmanager.js -rw-r--r-- root/root usr/lib/chromium/resources/net_internals/loggrouper.js -rw-r--r-- root/root usr/lib/chromium/resources/net_internals/logviewpainter.js -rw-r--r-- root/root usr/lib/chromium/resources/net_internals/main.css -rw-r--r-- root/root usr/lib/chromium/resources/net_internals/main.js +-rw-r--r-- root/root usr/lib/chromium/resources/net_internals/proxyview.js -rw-r--r-- root/root usr/lib/chromium/resources/net_internals/requestsview.js +-rw-r--r-- root/root usr/lib/chromium/resources/net_internals/resizableverticalsplitview.js -rw-r--r-- root/root usr/lib/chromium/resources/net_internals/sourceentry.js +-rw-r--r-- root/root usr/lib/chromium/resources/net_internals/tabswitcherview.js +-rw-r--r-- root/root usr/lib/chromium/resources/net_internals/testview.js -rw-r--r-- root/root usr/lib/chromium/resources/net_internals/timelineviewpainter.js +-rw-r--r-- root/root usr/lib/chromium/resources/net_internals/topmidbottomview.js -rw-r--r-- root/root usr/lib/chromium/resources/net_internals/util.js +-rw-r--r-- root/root usr/lib/chromium/resources/net_internals/view.js +drwxr-xr-x root/root usr/lib/chromium/resources/shared/ +drwxr-xr-x root/root usr/lib/chromium/resources/shared/css/ +-rw-r--r-- root/root usr/lib/chromium/resources/shared/css/list.css +-rw-r--r-- root/root usr/lib/chromium/resources/shared/css/menu.css +-rw-r--r-- root/root usr/lib/chromium/resources/shared/css/tree.css +-rw-r--r-- root/root usr/lib/chromium/resources/shared/css/tree.css.js +drwxr-xr-x root/root usr/lib/chromium/resources/shared/images/ +-rw-r--r-- root/root usr/lib/chromium/resources/shared/images/bookmark_bar_folder_mac.png +-rw-r--r-- root/root usr/lib/chromium/resources/shared/images/folder_closed.png +-rw-r--r-- root/root usr/lib/chromium/resources/shared/images/folder_closed_rtl.png +-rw-r--r-- root/root usr/lib/chromium/resources/shared/images/folder_open.png +-rw-r--r-- root/root usr/lib/chromium/resources/shared/images/folder_open_rtl.png +drwxr-xr-x root/root usr/lib/chromium/resources/shared/js/ +-rw-r--r-- root/root usr/lib/chromium/resources/shared/js/class_list.js +-rw-r--r-- root/root usr/lib/chromium/resources/shared/js/cr.js +drwxr-xr-x root/root usr/lib/chromium/resources/shared/js/cr/ +-rw-r--r-- root/root usr/lib/chromium/resources/shared/js/cr/event_target.js +-rw-r--r-- root/root usr/lib/chromium/resources/shared/js/cr/link_controller.js +-rw-r--r-- root/root usr/lib/chromium/resources/shared/js/cr/promise.js +-rw-r--r-- root/root usr/lib/chromium/resources/shared/js/cr/ui.js +drwxr-xr-x root/root usr/lib/chromium/resources/shared/js/cr/ui/ +-rw-r--r-- root/root usr/lib/chromium/resources/shared/js/cr/ui/command.js +-rw-r--r-- root/root usr/lib/chromium/resources/shared/js/cr/ui/context_menu_handler.js +-rw-r--r-- root/root usr/lib/chromium/resources/shared/js/cr/ui/list.js +-rw-r--r-- root/root usr/lib/chromium/resources/shared/js/cr/ui/list_item.js +-rw-r--r-- root/root usr/lib/chromium/resources/shared/js/cr/ui/list_selection_model.js +-rw-r--r-- root/root usr/lib/chromium/resources/shared/js/cr/ui/menu.js +-rw-r--r-- root/root usr/lib/chromium/resources/shared/js/cr/ui/menu_button.js +-rw-r--r-- root/root usr/lib/chromium/resources/shared/js/cr/ui/menu_item.js +-rw-r--r-- root/root usr/lib/chromium/resources/shared/js/cr/ui/position_util.js +-rw-r--r-- root/root usr/lib/chromium/resources/shared/js/cr/ui/splitter.js +-rw-r--r-- root/root usr/lib/chromium/resources/shared/js/cr/ui/tree.js +-rw-r--r-- root/root usr/lib/chromium/resources/shared/js/i18n_template.js +-rw-r--r-- root/root usr/lib/chromium/resources/shared/js/local_strings.js +-rw-r--r-- root/root usr/lib/chromium/resources/shared/js/parse_html_subset.js +-rw-r--r-- root/root usr/lib/chromium/resources/shared/js/util.js drwxr-xr-x root/root usr/share/ drwxr-xr-x root/root usr/share/applications/ -rw-r--r-- root/root usr/share/applications/chromium.desktop diff --git a/extra/chromium/.md5sum b/extra/chromium/.md5sum index 74b79047b..54536992c 100644 --- a/extra/chromium/.md5sum +++ b/extra/chromium/.md5sum @@ -1,5 +1,2 @@ 897de25e9c25a01f8b1b67abe554a6b7 chromium.desktop 93cd6f5f53b15546dc9d3de49118534c chromium.sh -dfbc18bb26dffa2dc6d4d3a857730902 drop_sse2.patch -ae9e26e6c2d164e6af0e513dae2273a3 ffmpeg_branding_mime.patch -bb75bfdfe85db26639abbea9054b85f9 libpng-1.4.patch diff --git a/extra/chromium/Pkgfile b/extra/chromium/Pkgfile index 852a84552..e9eb370b3 100644 --- a/extra/chromium/Pkgfile +++ b/extra/chromium/Pkgfile @@ -2,14 +2,17 @@ # URL: http://www.google.com # Maintainer: NuTyX core team # Packager: sibelle at free dot fr -# Depends on: libjpeg, nss, gconf, alsa-lib, xdg-utils, hicolor-icon-theme, bzip2, libxslt, ffmpeg, p5-event, libevent, pyopenssl + +##### ATTENTION : Ne pas lever git des deps ###### + +# Depends on: git, subversion, libjpeg, nss, gconf, alsa-lib, xdg-utils, hicolor-icon-theme, bzip2, libxslt, ffmpeg, p5-event, libevent, pyopenssl name=chromium -build=46198 -version=5.0.394.0 +build=47269 +version=6.0.404.0 release=1 -source=(chromium.desktop chromium.sh drop_sse2.patch ffmpeg_branding_mime.patch libpng-1.4.patch) +source=(chromium.desktop chromium.sh) build() { @@ -33,7 +36,7 @@ build() { cd chromium-$build # Pour obtenir la plus recente revision d'une maj majeure - if [ ! -d depot_tools]; then + if [ ! -d depot_tools ]; then svn co -r$build -q http://src.chromium.org/svn/trunk/tools/depot_tools/ depot_tools fi @@ -42,22 +45,22 @@ build() { if [ ! -f .gclient ]; then gclient.py config http://src.chromium.org/svn/releases/$version - sed -e '15i\ "src/third_party/WebKit/LayoutTests": None,' \ + sed -e '15i\ "src/third_party/WebKit/LayoutTests": None,' \ -e '15i\ "src/chrome/tools/test/reference_build": None,' \ -e '15i\ "src/third_party/ffmpeg/binaries/chromium/linux/ia32": None,' \ -e '15i\ "src/third_party/ffmpeg/binaries/chromium/linux/ia32_dbg": None,' \ -e '15i\ "src/third_party/ffmpeg/binaries/chromium/linux/x64": None,' \ -e '15i\ "src/third_party/ffmpeg/binaries/chromium/linux/x64_dbg": None,' \ -i .gclient - gclient.py sync --force --nohooks + + gclient.py sync --force --nohooks fi for i in ${nonessential_dirs[@]}; do - rm -rf $i + [ -d "$i" ] && rm -rf "$i" done - find . -name '.svn' -type d -delete find . -iname '*.dll' -delete find . -iname '*.exe' -delete find . -iname '*.o' -delete @@ -67,7 +70,7 @@ build() { export GYP_GENERATORS='make' export BUILDTYPE='Release' - export GYP_DEFINES="gcc_version=44 \ + export GYP_DEFINES="gcc_version=45 \ no_strict_aliasing=1 \ linux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ linux_strip_binary=1 \ @@ -76,23 +79,19 @@ build() { use_system_libjpeg=1 \ use_system_libxslt=1 \ use_system_bzip2=1 \ - use_system_libpng=1 \ - use_system_ffmpeg=1 \ + uise_system_libpng=1 \ + use_system_ffmpeg=0 \ use_system_yasm=1 \ use_system_libevent=1 \ use_system_ssl=0" - patch -p0 -i $SRC/ffmpeg_branding_mime.patch - # i686 does not include SSE2 - # see http://code.google.com/p/chromium/issues/detail?id=9007 - patch -p0 -i $SRC/drop_sse2.patch - # see http://codereview.chromium.org/569009/show - patch -p0 -i $SRC/libpng-1.4.patch export PATH=./depot_tools/:$PATH - gclient.py runhooks --force + + gclient.py runhooks --force cd src + make chrome chrome_sandbox cd $SRC/$name-$build diff --git a/extra/chromium/chromium-html5-video-mimetypes.patch b/extra/chromium/chromium-html5-video-mimetypes.patch new file mode 100644 index 000000000..f4e534a16 --- /dev/null +++ b/extra/chromium/chromium-html5-video-mimetypes.patch @@ -0,0 +1,48 @@ +--- + net/base/mime_util.cc | 4 ---- + 1 file changed, 4 deletions(-) + +Index: src/net/base/mime_util.cc +=================================================================== +--- src.orig/net/base/mime_util.cc ++++ src/net/base/mime_util.cc +@@ -183,39 +183,35 @@ + // A list of media types: http://en.wikipedia.org/wiki/Internet_media_type + // A comprehensive mime type list: http://plugindoc.mozdev.org/winmime.php + static const char* const supported_media_types[] = { + // Ogg. + "video/ogg", + "audio/ogg", + "application/ogg", + +-#if defined(GOOGLE_CHROME_BUILD) + // MPEG-4. + "video/mp4", + "video/x-m4v", + "audio/mp4", + "audio/x-m4a", + + // MP3. + "audio/mp3", + "audio/x-mp3", + "audio/mpeg", +-#endif + }; + + // List of supported codecs when passed in with <source type="...">. + // + // Refer to http://wiki.whatwg.org/wiki/Video_type_parameters#Browser_Support + // for more information. + static const char* const supported_media_codecs[] = { +-#if defined(GOOGLE_CHROME_BUILD) + "avc1", + "mp4a", +-#endif + "theora", + "vorbis", + }; + + // Note: does not include javascript types list (see supported_javascript_types) + static const char* const supported_non_image_types[] = { + "text/html", + "text/xml", diff --git a/extra/chromium/issue1620003_1_2.diff b/extra/chromium/issue1620003_1_2.diff new file mode 100644 index 000000000..fd1ebd1b8 --- /dev/null +++ b/extra/chromium/issue1620003_1_2.diff @@ -0,0 +1,13 @@ +Index: chrome/browser/cocoa/browser_frame_view.mm +=================================================================== +--- chrome/browser/cocoa/browser_frame_view.mm (revision 43477) ++++ chrome/browser/cocoa/browser_frame_view.mm (working copy) +@@ -243,7 +243,7 @@ + + [[NSGraphicsContext currentContext] setPatternPhase:phase]; + [themeImageColor set]; +- NSRectFill(dirtyRect); ++ NSRectFillUsingOperation(dirtyRect, NSCompositeSourceOver); + themed = YES; + } else if (gradient) { + NSPoint startPoint = NSMakePoint(NSMinX(bounds), NSMaxY(bounds)); diff --git a/extra/chromium/issue2019002_21001.diff b/extra/chromium/issue2019002_21001.diff new file mode 100644 index 000000000..9890be55f --- /dev/null +++ b/extra/chromium/issue2019002_21001.diff @@ -0,0 +1,182 @@ +Index: app/clipboard/clipboard_unittest.cc +diff --git a/app/clipboard/clipboard_unittest.cc b/app/clipboard/clipboard_unittest.cc +index d15247b51ba25af077154b8ce391fe2f47e961af..89702f1ae20b7a008ec729a75a27de4dfe026b75 100644 +--- a/app/clipboard/clipboard_unittest.cc ++++ b/app/clipboard/clipboard_unittest.cc +@@ -232,7 +232,7 @@ TEST_F(ClipboardTest, SharedBitmapTest) { + ASSERT_TRUE(shared_buf.Map(bytes)); + memcpy(shared_buf.memory(), fake_bitmap, bytes); + base::SharedMemoryHandle handle_to_share; +- base::ProcessHandle current_process = NULL; ++ base::ProcessHandle current_process = base::kNullProcessHandle; + #if defined(OS_WIN) + current_process = GetCurrentProcess(); + #endif +Index: chrome/browser/search_engines/template_url.cc +diff --git a/chrome/browser/search_engines/template_url.cc b/chrome/browser/search_engines/template_url.cc +index fe8356149d730aee4cc4525f29a4c213f646727a..43dae528ae41dcf12e37d5e8de59004026c4cb6d 100644 +--- a/chrome/browser/search_engines/template_url.cc ++++ b/chrome/browser/search_engines/template_url.cc +@@ -102,7 +102,7 @@ bool TemplateURLRef::ParseParameter(size_t start, + // Remove the parameter from the string. + url->erase(start, end - start + 1); + if (parameter == kSearchTermsParameter) { +- replacements->push_back(Replacement(SEARCH_TERMS, static_cast<int>(start))); ++ replacements->push_back(Replacement(SEARCH_TERMS, start)); + } else if (parameter == kCountParameter) { + if (!optional) + url->insert(start, kDefaultCount); +@@ -115,30 +115,26 @@ bool TemplateURLRef::ParseParameter(size_t start, + url->insert(start, IntToWString(page_offset_)); + } + } else if (parameter == kLanguageParameter) { +- replacements->push_back(Replacement(LANGUAGE, static_cast<int>(start))); ++ replacements->push_back(Replacement(LANGUAGE, start)); + } else if (parameter == kInputEncodingParameter) { +- replacements->push_back(Replacement(ENCODING, static_cast<int>(start))); ++ replacements->push_back(Replacement(ENCODING, start)); + } else if (parameter == kOutputEncodingParameter) { + if (!optional) + url->insert(start, kOutputEncodingType); + } else if (parameter == kGoogleAcceptedSuggestionParameter) { +- replacements->push_back(Replacement(GOOGLE_ACCEPTED_SUGGESTION, +- static_cast<int>(start))); ++ replacements->push_back(Replacement(GOOGLE_ACCEPTED_SUGGESTION, start)); + } else if (parameter == kGoogleBaseURLParameter) { +- replacements->push_back(Replacement(GOOGLE_BASE_URL, +- static_cast<int>(start))); ++ replacements->push_back(Replacement(GOOGLE_BASE_URL, start)); + } else if (WideToUTF16Hack(parameter) == + ASCIIToUTF16(kGoogleBaseSuggestURLParameter)) { +- replacements->push_back(Replacement(GOOGLE_BASE_SUGGEST_URL, +- static_cast<int>(start))); ++ replacements->push_back(Replacement(GOOGLE_BASE_SUGGEST_URL, start)); + } else if (parameter == kGoogleOriginalQueryForSuggestionParameter) { + replacements->push_back(Replacement(GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION, +- static_cast<int>(start))); ++ start)); + } else if (parameter == kGoogleRLZParameter) { +- replacements->push_back(Replacement(GOOGLE_RLZ, static_cast<int>(start))); ++ replacements->push_back(Replacement(GOOGLE_RLZ, start)); + } else if (parameter == kGoogleUnescapedSearchTermsParameter) { +- replacements->push_back(Replacement(GOOGLE_UNESCAPED_SEARCH_TERMS, +- static_cast<int>(start))); ++ replacements->push_back(Replacement(GOOGLE_UNESCAPED_SEARCH_TERMS, start)); + } else { + // It can be some garbage but can also be a javascript block. Put it back. + url->insert(start, full_parameter); +Index: chrome/browser/search_engines/template_url.h +diff --git a/chrome/browser/search_engines/template_url.h b/chrome/browser/search_engines/template_url.h +index 90cd7341ca17818e2ba792e2d24be8c266420a6e..5a5c67f18a1611c646a5c722b39cc7efeb4e8db5 100644 +--- a/chrome/browser/search_engines/template_url.h ++++ b/chrome/browser/search_engines/template_url.h +@@ -136,9 +136,10 @@ class TemplateURLRef { + + // Used to identify an element of the raw url that can be replaced. + struct Replacement { +- Replacement(ReplacementType type, int index) : type(type), index(index) {} ++ Replacement(ReplacementType type, size_t index) ++ : type(type), index(index) {} + ReplacementType type; +- int index; ++ size_t index; + }; + + // The list of elements to replace. +Index: chrome/browser/search_engines/template_url_unittest.cc +diff --git a/chrome/browser/search_engines/template_url_unittest.cc b/chrome/browser/search_engines/template_url_unittest.cc +index b2ef832b1bc1b5a37e8c9b6d4e61a3c1371977ce..5f9bfff80929da9683e1aca58ffe079bab947187 100644 +--- a/chrome/browser/search_engines/template_url_unittest.cc ++++ b/chrome/browser/search_engines/template_url_unittest.cc +@@ -421,7 +421,7 @@ TEST_F(TemplateURLTest, ParseParameterKnown) { + EXPECT_TRUE(url_ref.ParseParameter(0, 12, &parsed_url, &replacements)); + EXPECT_EQ(std::wstring(), parsed_url); + ASSERT_EQ(1U, replacements.size()); +- EXPECT_EQ(0, replacements[0].index); ++ EXPECT_EQ(static_cast<size_t>(0), replacements[0].index); + EXPECT_EQ(TemplateURLRef::SEARCH_TERMS, replacements[0].type); + } + +@@ -468,7 +468,7 @@ TEST_F(TemplateURLTest, ParseURLTwoParameters) { + EXPECT_EQ(L"{}{}", + url_ref.ParseURL(L"{}{{searchTerms}}", &replacements, &valid)); + ASSERT_EQ(1U, replacements.size()); +- EXPECT_EQ(3, replacements[0].index); ++ EXPECT_EQ(static_cast<size_t>(3), replacements[0].index); + EXPECT_EQ(TemplateURLRef::SEARCH_TERMS, replacements[0].type); + EXPECT_TRUE(valid); + } +@@ -479,7 +479,7 @@ TEST_F(TemplateURLTest, ParseURLNestedParameter) { + bool valid = false; + EXPECT_EQ(L"{", url_ref.ParseURL(L"{{searchTerms}", &replacements, &valid)); + ASSERT_EQ(1U, replacements.size()); +- EXPECT_EQ(1, replacements[0].index); ++ EXPECT_EQ(static_cast<size_t>(1), replacements[0].index); + EXPECT_EQ(TemplateURLRef::SEARCH_TERMS, replacements[0].type); + EXPECT_TRUE(valid); + } +Index: chrome/plugin/webplugin_delegate_stub.cc +diff --git a/chrome/plugin/webplugin_delegate_stub.cc b/chrome/plugin/webplugin_delegate_stub.cc +index 9b1ec53c8accbd22cd7e66b18540857629510708..0f47bd85cb7bfdeb5a0dcd66e0b2685428c5e5bf 100644 +--- a/chrome/plugin/webplugin_delegate_stub.cc ++++ b/chrome/plugin/webplugin_delegate_stub.cc +@@ -158,7 +158,7 @@ void WebPluginDelegateStub::OnInit(const PluginMsg_Init_Params& params, + command_line.GetSwitchValue(switches::kPluginPath)); + + +- gfx::PluginWindowHandle parent = 0; ++ gfx::PluginWindowHandle parent = gfx::kNullPluginWindow; + #if defined(OS_WIN) + parent = gfx::NativeViewFromId(params.containing_window); + #elif defined(OS_LINUX) +Index: chrome/renderer/webplugin_delegate_pepper.cc +diff --git a/chrome/renderer/webplugin_delegate_pepper.cc b/chrome/renderer/webplugin_delegate_pepper.cc +index 683382d76a89d5e6a8b15bb676f9a1b099ad7018..c545c875b3ec9899713ee6c86f43340261faa311 100644 +--- a/chrome/renderer/webplugin_delegate_pepper.cc ++++ b/chrome/renderer/webplugin_delegate_pepper.cc +@@ -395,7 +395,7 @@ NPError WebPluginDelegatePepper::Device2DInitializeContext( + // This is a windowless plugin, so set it to have no handle. Defer this + // until we know the plugin will use the 2D device. If it uses the 3D device + // it will have a window handle. +- plugin_->SetWindow(0); ++ plugin_->SetWindow(gfx::kNullPluginWindow); + + scoped_ptr<Graphics2DDeviceContext> g2d(new Graphics2DDeviceContext(this)); + NPError status = g2d->Initialize(window_rect_, config, context); +Index: webkit/glue/plugins/plugin_host.cc +diff --git a/webkit/glue/plugins/plugin_host.cc b/webkit/glue/plugins/plugin_host.cc +index 41d2fa288727c0d0db0a064f3a94ba24782c69a2..a6e0fde83d3883e967b265e953ae1538f88303ff 100644 +--- a/webkit/glue/plugins/plugin_host.cc ++++ b/webkit/glue/plugins/plugin_host.cc +@@ -656,7 +656,7 @@ NPError NPN_GetValue(NPP id, NPNVariable variable, void* value) { + + NPError rv = NPERR_GENERIC_ERROR; + +- switch (variable) { ++ switch (static_cast<int>(variable)) { + case NPNVWindowNPObject: { + scoped_refptr<NPAPI::PluginInstance> plugin = FindInstance(id); + NPObject *np_object = plugin->webplugin()->GetWindowScriptNPObject(); +Index: webkit/glue/plugins/webplugin_impl.cc +diff --git a/webkit/glue/plugins/webplugin_impl.cc b/webkit/glue/plugins/webplugin_impl.cc +index 8a0e75e63b6f4570c7d78f6ce8afc8eca4ba9251..693232ba1fdde8de816717dffc29b19acf59f6f1 100644 +--- a/webkit/glue/plugins/webplugin_impl.cc ++++ b/webkit/glue/plugins/webplugin_impl.cc +@@ -412,7 +412,7 @@ WebPluginImpl::WebPluginImpl( + WebFrame* webframe, const WebPluginParams& params, + const base::WeakPtr<WebPluginPageDelegate>& page_delegate) + : windowless_(false), +- window_(0), ++ window_(gfx::kNullPluginWindow), + accepts_input_events_(false), + page_delegate_(page_delegate), + webframe_(webframe), +@@ -473,7 +473,7 @@ void WebPluginImpl::SetWindow(gfx::PluginWindowHandle window) { + + void WebPluginImpl::WillDestroyWindow(gfx::PluginWindowHandle window) { + DCHECK_EQ(window, window_); +- window_ = 0; ++ window_ = gfx::kNullPluginWindow; + if (page_delegate_) + page_delegate_->WillDestroyPluginWindow(window); + } |