libv8 7.3.492.27.1 → 8.4.255.0

data/vendor/depot_tools/third_party/colorama/winterm.py

@@ -15,9 +15,9 @@ class WinColor(object):
 
 # from wincon.h
 class WinStyle(object):
-    NORMAL = 0x00 # dim text, dim background
-    BRIGHT = 0x08 # bright text, dim background
-
+    NORMAL              = 0x00 # dim text, dim background
+    BRIGHT              = 0x08 # bright text, dim background
+    BRIGHT_BACKGROUND   = 0x80 # dim text, bright background
 
 class WinTerm(object):
 
@@ -27,29 +27,45 @@ class WinTerm(object):
         self._default_fore = self._fore
         self._default_back = self._back
         self._default_style = self._style
+        # In order to emulate LIGHT_EX in windows, we borrow the BRIGHT style.
+        # So that LIGHT_EX colors and BRIGHT style do not clobber each other,
+        # we track them separately, since LIGHT_EX is overwritten by Fore/Back
+        # and BRIGHT is overwritten by Style codes.
+        self._light = 0
 
     def get_attrs(self):
-        return self._fore + self._back * 16 + self._style
+        return self._fore + self._back * 16 + (self._style | self._light)
 
     def set_attrs(self, value):
         self._fore = value & 7
         self._back = (value >> 4) & 7
-        self._style = value & WinStyle.BRIGHT
+        self._style = value & (WinStyle.BRIGHT | WinStyle.BRIGHT_BACKGROUND)
 
     def reset_all(self, on_stderr=None):
         self.set_attrs(self._default)
         self.set_console(attrs=self._default)
+        self._light = 0
 
-    def fore(self, fore=None, on_stderr=False):
+    def fore(self, fore=None, light=False, on_stderr=False):
         if fore is None:
             fore = self._default_fore
         self._fore = fore
+        # Emulate LIGHT_EX with BRIGHT Style
+        if light:
+            self._light |= WinStyle.BRIGHT
+        else:
+            self._light &= ~WinStyle.BRIGHT
         self.set_console(on_stderr=on_stderr)
 
-    def back(self, back=None, on_stderr=False):
+    def back(self, back=None, light=False, on_stderr=False):
         if back is None:
             back = self._default_back
         self._back = back
+        # Emulate LIGHT_EX with BRIGHT_BACKGROUND Style
+        if light:
+            self._light |= WinStyle.BRIGHT_BACKGROUND
+        else:
+            self._light &= ~WinStyle.BRIGHT_BACKGROUND
         self.set_console(on_stderr=on_stderr)
 
     def style(self, style=None, on_stderr=False):
@@ -73,48 +89,81 @@ class WinTerm(object):
         position.X += 1
         position.Y += 1
         return position
-    
+
     def set_cursor_position(self, position=None, on_stderr=False):
         if position is None:
-            #I'm not currently tracking the position, so there is no default.
-            #position = self.get_position()
+            # I'm not currently tracking the position, so there is no default.
+            # position = self.get_position()
             return
         handle = win32.STDOUT
         if on_stderr:
             handle = win32.STDERR
         win32.SetConsoleCursorPosition(handle, position)
 
-    def cursor_up(self, num_rows=0, on_stderr=False):
-        if num_rows == 0:
-            return
+    def cursor_adjust(self, x, y, on_stderr=False):
         handle = win32.STDOUT
         if on_stderr:
             handle = win32.STDERR
         position = self.get_position(handle)
-        adjusted_position = (position.Y - num_rows, position.X)
-        self.set_cursor_position(adjusted_position, on_stderr)
+        adjusted_position = (position.Y + y, position.X + x)
+        win32.SetConsoleCursorPosition(handle, adjusted_position, adjust=False)
 
-    def erase_data(self, mode=0, on_stderr=False):
-        # 0 (or None) should clear from the cursor to the end of the screen.
+    def erase_screen(self, mode=0, on_stderr=False):
+        # 0 should clear from the cursor to the end of the screen.
         # 1 should clear from the cursor to the beginning of the screen.
-        # 2 should clear the entire screen. (And maybe move cursor to (1,1)?)
-        #
-        # At the moment, I only support mode 2. From looking at the API, it
-        #    should be possible to calculate a different number of bytes to clear,
-        #    and to do so relative to the cursor position.
-        if mode[0] not in (2,):
-            return
+        # 2 should clear the entire screen, and move cursor to (1,1)
         handle = win32.STDOUT
         if on_stderr:
             handle = win32.STDERR
-        # here's where we'll home the cursor
-        coord_screen = win32.COORD(0,0)
         csbi = win32.GetConsoleScreenBufferInfo(handle)
         # get the number of character cells in the current buffer
-        dw_con_size = csbi.dwSize.X * csbi.dwSize.Y
+        cells_in_screen = csbi.dwSize.X * csbi.dwSize.Y
+        # get number of character cells before current cursor position
+        cells_before_cursor = csbi.dwSize.X * csbi.dwCursorPosition.Y + csbi.dwCursorPosition.X
+        if mode == 0:
+            from_coord = csbi.dwCursorPosition
+            cells_to_erase = cells_in_screen - cells_before_cursor
+        elif mode == 1:
+            from_coord = win32.COORD(0, 0)
+            cells_to_erase = cells_before_cursor
+        elif mode == 2:
+            from_coord = win32.COORD(0, 0)
+            cells_to_erase = cells_in_screen
+        else:
+            # invalid mode
+            return
         # fill the entire screen with blanks
-        win32.FillConsoleOutputCharacter(handle, ' ', dw_con_size, coord_screen)
+        win32.FillConsoleOutputCharacter(handle, ' ', cells_to_erase, from_coord)
         # now set the buffer's attributes accordingly
-        win32.FillConsoleOutputAttribute(handle, self.get_attrs(), dw_con_size, coord_screen );
-        # put the cursor at (0, 0)
-        win32.SetConsoleCursorPosition(handle, (coord_screen.X, coord_screen.Y))
+        win32.FillConsoleOutputAttribute(handle, self.get_attrs(), cells_to_erase, from_coord)
+        if mode == 2:
+            # put the cursor where needed
+            win32.SetConsoleCursorPosition(handle, (1, 1))
+
+    def erase_line(self, mode=0, on_stderr=False):
+        # 0 should clear from the cursor to the end of the line.
+        # 1 should clear from the cursor to the beginning of the line.
+        # 2 should clear the entire line.
+        handle = win32.STDOUT
+        if on_stderr:
+            handle = win32.STDERR
+        csbi = win32.GetConsoleScreenBufferInfo(handle)
+        if mode == 0:
+            from_coord = csbi.dwCursorPosition
+            cells_to_erase = csbi.dwSize.X - csbi.dwCursorPosition.X
+        elif mode == 1:
+            from_coord = win32.COORD(0, csbi.dwCursorPosition.Y)
+            cells_to_erase = csbi.dwCursorPosition.X
+        elif mode == 2:
+            from_coord = win32.COORD(0, csbi.dwCursorPosition.Y)
+            cells_to_erase = csbi.dwSize.X
+        else:
+            # invalid mode
+            return
+        # fill the entire screen with blanks
+        win32.FillConsoleOutputCharacter(handle, ' ', cells_to_erase, from_coord)
+        # now set the buffer's attributes accordingly
+        win32.FillConsoleOutputAttribute(handle, self.get_attrs(), cells_to_erase, from_coord)
+
+    def set_title(self, title):
+        win32.SetConsoleTitle(title)

data/vendor/depot_tools/update_depot_tools

@@ -45,7 +45,7 @@ fi
 
 # We want to update the bundled tools even under MinGW.
 if [ $MINGW = 0 ]; then
-  $COMSPEC /c `cygpath -w "$base_dir/bootstrap/win/win_tools.bat"`
+  $COMSPEC //c `cygpath -w "$base_dir/bootstrap/win_tools.bat"`
   case $? in
     123)
       # msys environment was upgraded, need to quit.
@@ -100,13 +100,18 @@ function update_git_repo {
   fi
 
   git fetch -q origin &> /dev/null
-  local REBASE_TXT STATUS
-  REBASE_TXT=$(git rebase -q origin/master 2>&1)
+  local CHECKOUT_TXT STATUS
+  CHECKOUT_TXT=$(git checkout -q origin/master 2>&1)
   STATUS=$?
   if [[ $STATUS -ne 0 ]]; then
     echo "depot_tools update failed. Conflict in $base_dir" >&2
-    echo "$REBASE_TXT" >&2
-    git rebase --abort 2> /dev/null
+    echo "$CHECKOUT_TXT" >&2
+  fi
+  # Having python3 on depot_tools causes problems if users put depot_tools in
+  # PATH before system's python3, so remove it if present.
+  # See crbug.com/1017812.
+  if [[ -e python3 ]]; then
+    rm python3
   fi
   return $STATUS
 }
@@ -114,15 +119,20 @@ function update_git_repo {
 # Update git checkouts.
 if [ "X$DEPOT_TOOLS_UPDATE" != "X0" ]; then
   if [ -e "$base_dir/.git" ]; then
-    cd $base_dir
+    cd "$base_dir"
     update_git_repo
     cd - > /dev/null
   fi
 
-  # Sync CIPD and CIPD client tools.
+  # Sync CIPD-boostrapped packages.
   source "$base_dir/cipd_bin_setup.sh"
   cipd_bin_setup
 
-  find "$base_dir" | grep -i ".*\.pyc" | xargs rm -f;
+  # Don't bootstrap Python 3 on windows, since it is already done by
+  # bootstrap/win_tools.bat.
+  if [ "X$MINGW" != "X0" -a "X$DEPOT_TOOLS_BOOTSTRAP_PYTHON3" != "X0" ]; then
+    source "$base_dir/bootstrap_python3"
+    bootstrap_python3
+  fi
 fi
 

data/vendor/depot_tools/update_depot_tools.bat

@@ -13,32 +13,33 @@ setlocal
 IF "%~nx0"=="update_depot_tools.bat" (
   COPY /Y "%~dp0update_depot_tools.bat" "%TEMP%\update_depot_tools_tmp.bat" >nul
   if errorlevel 1 goto :EOF
-  "%TEMP%\update_depot_tools_tmp.bat" "%~dp0" %*
+  REM Use call/exit to avoid leaving an orphaned window title.
+  call "%TEMP%\update_depot_tools_tmp.bat" "%~dp0" %*
+  exit /b
 )
 
 set DEPOT_TOOLS_DIR=%~1
 SHIFT
 
+:: Shall skip automatic update?
 IF EXIST "%DEPOT_TOOLS_DIR%.disable_auto_update" GOTO :EOF
+IF "%DEPOT_TOOLS_UPDATE%" == "0" GOTO :EOF
 
 set GIT_URL=https://chromium.googlesource.com/chromium/tools/depot_tools.git
 
-:: Will download git and python.
-call "%DEPOT_TOOLS_DIR%bootstrap\win\win_tools.bat"
-if errorlevel 1 goto :EOF
+:: Download git for the first time if it's not present.
+call git --version > nul 2>&1
+if %errorlevel% == 0 goto :GIT_UPDATE
+call "%DEPOT_TOOLS_DIR%bootstrap\win_tools.bat"
+if errorlevel 1 (
+  echo Error updating depot_tools, no revision tool found.
+  goto :EOF
+)
+
+:GIT_UPDATE
 :: Now clear errorlevel so it can be set by other programs later.
 set errorlevel=
 
-:: Shall skip automatic update?
-IF "%DEPOT_TOOLS_UPDATE%" == "0" GOTO :EOF
-
-:: We need .\.git\. to be able to sync.
-IF EXIST "%DEPOT_TOOLS_DIR%.git\." GOTO :GIT_UPDATE
-echo Error updating depot_tools, no revision tool found.
-goto :EOF
-
-
-:GIT_UPDATE
 cd /d "%DEPOT_TOOLS_DIR%."
 call git config remote.origin.fetch > NUL
 for /F %%x in ('git config --get remote.origin.url') DO (
@@ -51,7 +52,7 @@ for /F %%x in ('git config --get remote.origin.url') DO (
   )
 )
 call git fetch -q origin > NUL
-call git rebase -q origin/master > NUL
+call git checkout -q origin/master > NUL
 if errorlevel 1 (
   echo Failed to update depot_tools.
   goto :EOF
@@ -59,3 +60,6 @@ if errorlevel 1 (
 
 :: Sync CIPD and CIPD client tools.
 call "%~dp0\cipd_bin_setup.bat"
+
+:: Update git and python
+call "%DEPOT_TOOLS_DIR%bootstrap\win_tools.bat"

data/vendor/depot_tools/upload_metrics.py

@@ -4,18 +4,19 @@
 # found in the LICENSE file.
 
 import sys
-import urllib2
+
+from third_party.six.moves import urllib
+from third_party.six.moves import input # pylint: disable=redefined-builtin
 
 import metrics_utils
 
 
 def main():
-  metrics = raw_input()
+  metrics = input()
   try:
-    urllib2.urlopen(metrics_utils.APP_URL + '/upload', metrics)
-  except urllib2.HTTPError:
-    pass
-  except urllib2.URLError:
+    urllib.request.urlopen(
+        metrics_utils.APP_URL + '/upload', metrics.encode('utf-8'))
+  except (urllib.error.HTTPError, urllib.error.URLError):
     pass
 
   return 0

data/vendor/depot_tools/upload_to_google_storage.py

@@ -5,10 +5,17 @@
 
 """Uploads files to Google Storage content addressed."""
 
+from __future__ import print_function
+
 import hashlib
 import optparse
 import os
-import Queue
+
+try:
+  import Queue as queue
+except ImportError:  # For Py3 compatibility
+  import queue
+
 import re
 import stat
 import sys
@@ -56,13 +63,13 @@ def get_md5_cached(filename):
   # See if we can find an existing MD5 sum stored in a file.
   if os.path.exists('%s.md5' % filename):
     with open('%s.md5' % filename, 'rb') as f:
-      md5_match = re.search('([a-z0-9]{32})', f.read())
+      md5_match = re.search('([a-z0-9]{32})', f.read().decode())
       if md5_match:
         return md5_match.group(1)
   else:
     md5_hash = get_md5(filename)
     with open('%s.md5' % filename, 'wb') as f:
-      f.write(md5_hash)
+      f.write(md5_hash.encode())
     return md5_hash
 
 
@@ -77,7 +84,7 @@ def _upload_worker(
     if gsutil.check_call('ls', file_url)[0] == 0 and not force:
       # File exists, check MD5 hash.
       _, out, _ = gsutil.check_call_with_retries('ls', '-L', file_url)
-      etag_match = re.search('ETag:\s+([a-z0-9]{32})', out)
+      etag_match = re.search(r'ETag:\s+([a-z0-9]{32})', out)
       if etag_match:
         remote_md5 = etag_match.group(1)
         # Calculate the MD5 checksum to match it to Google Storage's ETag.
@@ -140,11 +147,11 @@ def upload_to_google_storage(
 
   # Start up all the worker threads plus the printer thread.
   all_threads = []
-  ret_codes = Queue.Queue()
+  ret_codes = queue.Queue()
   ret_codes.put((0, None))
-  upload_queue = Queue.Queue()
+  upload_queue = queue.Queue()
   upload_timer = time.time()
-  stdout_queue = Queue.Queue()
+  stdout_queue = queue.Queue()
   printer_thread = PrinterThread(stdout_queue)
   printer_thread.daemon = True
   printer_thread.start()
@@ -169,15 +176,15 @@ def upload_to_google_storage(
           'Main> Found hash for %s, sha1 calculation skipped.' % filename)
       with open(filename + '.sha1', 'rb') as f:
         sha1_file = f.read(1024)
-      if not re.match('^([a-z0-9]{40})$', sha1_file):
-        print >> sys.stderr, 'Invalid sha1 hash file %s.sha1' % filename
+      if not re.match('^([a-z0-9]{40})$', sha1_file.decode()):
+        print('Invalid sha1 hash file %s.sha1' % filename, file=sys.stderr)
         return 1
-      upload_queue.put((filename, sha1_file))
+      upload_queue.put((filename, sha1_file.decode()))
       continue
     stdout_queue.put('Main> Calculating hash for %s...' % filename)
     sha1_sum = get_sha1(filename)
     with open(filename + '.sha1', 'wb') as f:
-      f.write(sha1_sum)
+      f.write(sha1_sum.encode())
     stdout_queue.put('Main> Done calculating hash for %s.' % filename)
     upload_queue.put((filename, sha1_sum))
   hashing_duration = time.time() - hashing_start
@@ -191,19 +198,19 @@ def upload_to_google_storage(
   printer_thread.join()
 
   # Print timing information.
-  print 'Hashing %s files took %1f seconds' % (
-      len(input_filenames), hashing_duration)
-  print 'Uploading took %1f seconds' % (time.time() - upload_timer)
+  print('Hashing %s files took %1f seconds' % (
+      len(input_filenames), hashing_duration))
+  print('Uploading took %1f seconds' % (time.time() - upload_timer))
 
   # See if we ran into any errors.
   max_ret_code = 0
   for ret_code, message in ret_codes.queue:
     max_ret_code = max(ret_code, max_ret_code)
     if message:
-      print >> sys.stderr, message
+      print(message, file=sys.stderr)
 
   if not max_ret_code:
-    print 'Success!'
+    print('Success!')
 
   return max_ret_code
 

data/vendor/depot_tools/vpython

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Copyright 2018 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
@@ -34,9 +34,9 @@ then
 fi
 
 
-MYPATH=$(dirname "${BASH_SOURCE[0]}")
+base_dir=$(dirname "$0")
 
-source "$MYPATH/cipd_bin_setup.sh"
+source "$base_dir/cipd_bin_setup.sh"
 cipd_bin_setup &> /dev/null
 
-exec "$MYPATH/.cipd_bin/vpython" "$@"
+exec "$base_dir/.cipd_bin/vpython" "$@"

data/vendor/depot_tools/vpython.bat

@@ -4,4 +4,4 @@
 :: found in the LICENSE file.
 
 call "%~dp0\cipd_bin_setup.bat" > nul 2>&1
-"%~dp0\.cipd_bin\vpython.exe" %*
+"%~dp0\.cipd_bin\vpython.exe" -vpython-interpreter "%~dp0\python.bat" %*

data/vendor/depot_tools/vpython3

@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+
+# Copyright 2019 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.
+
+if [[ $VPYTHON_BYPASS == "manually managed python not supported by chrome operations" ]]
+then
+  NEWARGS=()
+  while [[ $# -gt 0 ]]
+  do
+    case "$1" in
+      -vpython-tool*) # these tools all do something vpython related and quit
+        exit 0
+        ;;
+      -vpython*=*) # delete any vpython-specific flag (w/ attached argument)
+        shift
+        ;;
+      -vpython*) # delete any vpython-specific flag (w/ separate argument)
+        shift
+        shift
+        ;;
+      --)     # stop parsing
+        NEWARGS+=( "$@" )
+        break
+        ;;
+      *)      # regular arg
+        NEWARGS+=( "$1" )
+        shift
+        ;;
+    esac
+  done
+  exec "python3" "${NEWARGS[@]}"
+fi
+
+
+base_dir=$(dirname "$0")
+
+source "$base_dir/cipd_bin_setup.sh"
+cipd_bin_setup &> /dev/null
+
+# If Python bootstrapping is not disabled, make sure Python has been
+# bootstrapped and add it to the front of PATH.
+if [[ $(uname -s) = MINGW* || $(uname -s) = CYGWIN* ]]; then
+  cmd.exe //c $0.bat "$@"
+elif [[ $DEPOT_TOOLS_BOOTSTRAP_PYTHON3 != 0 ]]; then
+  if [[ ! -e "$base_dir/python3_bin_reldir.txt" ]]; then
+    source "$base_dir/bootstrap_python3"
+    bootstrap_python3
+  fi
+  PYTHON3_BIN_RELDIR="$base_dir/$(cat "$base_dir/python3_bin_reldir.txt" | xargs echo)"
+  exec "$base_dir/.cipd_bin/vpython3" -vpython-interpreter  "$PYTHON3_BIN_RELDIR/python3" "$@"
+else
+  exec "$base_dir/.cipd_bin/vpython3" "$@"
+fi