[go: up one dir, main page]

  1. Publish DEPS for Chromium 46.0.2490.33
    
  2. Incrementing VERSION to 46.0.2490.33
    
    Cr-Commit-Position: refs/branch-heads/2490@{#274}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  3. Revert "Stop unfreezing tabs "frozen" for lazy loads"
    
    This reverts commit 0beb8994ad47d64c20bd957827367b5d8a6b1a44.
    
    Cr-Commit-Position: refs/branch-heads/2490@{#273}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  4. Revert "Do not drop data on the floor in SpdySession::DoReadLoop."
    
    This reverts commit c33e28d3fdf2b648a4dcefc763437cb8bcf93152.
    
    Cr-Commit-Position: refs/branch-heads/2490@{#272}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  5. Incrementing VERSION to 46.0.2490.32
    
    Cr-Commit-Position: refs/branch-heads/2490@{#271}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  6. Do not drop data on the floor in SpdySession::DoReadLoop.
    
    Patch Set 1 adds regression test, watch it specatularily fail in trybot logs.
    Patch Set 2 fixes the issue.
    
    BUG=531570
    
    Review URL: https://codereview.chromium.org/1345453005
    
    Cr-Commit-Position: refs/heads/master@{#348726}
    (cherry picked from commit 125cde33c45c37472639c94e4af73760042bdcb0)
    
    TBR=mef@chromium.org
    
    Review URL: https://codereview.chromium.org/1343233002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#270}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  7. Incrementing VERSION to 46.0.2490.31
    
    Cr-Commit-Position: refs/branch-heads/2490@{#269}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  8. content: Use one worker context per compositor.
    
    Avoid sharing of worker contexts between UI compositors on ChromeOS.
    
    BUG=525811
    R=piman@chromium.org
    
    Review URL: https://codereview.chromium.org/1345943002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#268}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  9. Default certain devices to Tabbed Mode.
    
    BUG=531677
    TBR=newt@chromium.org
    
    Review URL: https://codereview.chromium.org/1350533002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#267}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  10. [Merge Into M46]: Refactor TaskManager's favicon retrieval approach
    
    Instead of listening to unreliable WebContentsObserver events, we now
    make use of the FaviconDriverObserver.
    
    TBR=nick@chromium.org
    BUG=530486,528924
    
    Review URL: https://codereview.chromium.org/1338023002
    
    Cr-Commit-Position: refs/heads/master@{#348773}
    (cherry picked from commit 21a49151acdbe9daa4754ee0b974be39cb23a95b)
    
    Make sure RendererTasks favicons and titles are updated at the right time.
    
    We used to listen to WebContentsObserer::TitleWasSet() which didn't work
    for web pages that don't have title. We also used ti listen to
    WebContentsObserver::DidUpdateFaviconURL() which doesn't necessarily
    mean that the favicon is ready to be caches by RendererTasks.
    
    This CL fixes these issues.
    
    TBR=nick@chromium.org
    BUG=528924,527098
    
    Review URL: https://codereview.chromium.org/1334503002
    
    Cr-Commit-Position: refs/heads/master@{#348237}
    (cherry picked from commit 2313d0d2947c8a6b504c16ce7215b8c7feb577cd)
    
    Review URL: https://codereview.chromium.org/1347913002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#266}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  11. Incrementing VERSION to 46.0.2490.30
    
    Cr-Commit-Position: refs/branch-heads/2490@{#265}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  12. Merge to M46: Fix crash when accessing automation node from stale AX tree
    
    The problem is that the root node of a stale AX tree computes its id
    dynamically, but if that AX tree doesn't exist anymore it was returning
    undefined, and then passing undefined to any of the native bindinds was a
    fatal error.
    
    The solution is just to return -1 instead of undefined as the id.
    
    BUG=526255
    
    Review URL: https://codereview.chromium.org/1308813008
    
    Cr-Commit-Position: refs/heads/master@{#346394}
    (cherry picked from commit ace50646dcd95261ef8e6aca2096458828532fbc)
    
    Review URL: https://codereview.chromium.org/1348503002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#264}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  13. Use ApplicationContext instead of Activity
    
    In document mode, multiple activities could be used concurrently.
    So registering and unregistering a receiver could happen on different ones,
    which causes Chrome crash.
    
    BUG=530097
    TBR=tedchoc@chromium.org
    
    Review URL: https://codereview.chromium.org/1338813004
    
    Cr-Commit-Position: refs/heads/master@{#348741}
    (cherry picked from commit a774b242861f73871f663c8bf4030908684fd6bf)
    
    Review URL: https://codereview.chromium.org/1348453002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#263}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  14. Stop unfreezing tabs "frozen" for lazy loads
    
    When opening a tab in the background on Svelte devices, tabs are
    marked as "frozen" without actually being frozen (no saved state).
    
    * Make CompositorViewHolder load these tabs properly instead of
      trying to unfreeze them.
    
    * Make Tab#unfreezeContents() protected so that nothing can handle
      this.
    
    * Clear out pointers when destroying the objects and clean up
      destruction, in general.
    
    * Stop destroying some TabObservers twice.
    
    * Add a test to catch this.
    
    * Moves process killing to the end of destroy() instead of the middle.
    
    BUG=495877
    TBR=mariakhomenko
    Review URL: https://codereview.chromium.org/1337113007
    
    Cr-Commit-Position: refs/heads/master@{#348755}
    
    Review URL: https://codereview.chromium.org/1339603007 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#262}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  15. [Ozone-DRM] Use CRTC's mode when configuring it for mirror mode
    
    Using the same mode on both CRTCs may not work if the timings are not
    correct. This patch configures the CRTC independently such that each one
    uses its own mode and timings.
    
    Also split modesetting from re-enabling so it is easier to reason when
    the CRTC's current mode can be reused.
    
    BUG=chrome-os-partner:42915
    
    Review URL: https://codereview.chromium.org/1338843002
    
    Cr-Commit-Position: refs/heads/master@{#348613}
    (cherry picked from commit e342544e82671b42b94e1f2f6400ddb0a5c3b49a)
    
    Review URL: https://codereview.chromium.org/1342773006 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#261}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  16. [Ozone-DRM] Modeset when re-mapping windows to controllers
    
    This fixes an issue where the surface associated with a window thinks it
    can submit a buffer, but the controller is waiting for a page flip event
    to finish. This issue is triggered in the following scenario:
    
    - surface1 mapped to display1
    - surface2 mapped to display2
    - surface2 page flips a buffer on display2
    - surface1 is re-mapped to display2
    - surface2 is re-mapped to display1
    - surface1 had no pending buffers, so it thinks it is fine to schedule a
      page flip on display2
    - display2 fails to page flip since it is still waiting for the callback
      from surface2
    
    We had considered using a queue internally, though that would have
    complicated the logic. Since changing display configuration is a rare
    event we decided it would be simpler to just modeset at this point even
    if modesetting would take longer.
    
    BUG=511446, 529806
    
    Review URL: https://codereview.chromium.org/1327413003
    
    Cr-Commit-Position: refs/heads/master@{#348496}
    (cherry picked from commit 569ff0f367864bc65b8abaaab4dec1e57d25ac93)
    
    Force swap buffers when re-creating the buffers
    
    The SwapResult provides a way to signal when the buffers are no longer
    adequate and need to be re-allocated. Currently the surfaceless
    implementation of the GpuBrowserCompositorOutputSurface will re-allocate
    the buffers, however it doesn't swap again. Since the previous buffer
    was rejected the display is showing an old frame.
    
    BUG=511446
    CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
    
    Review URL: https://codereview.chromium.org/1327343003
    
    Cr-Commit-Position: refs/heads/master@{#348246}
    (cherry picked from commit 61df9d531b103895877d163c1635bac16d686952)
    
    Force buffer re-allocation when the backing display changes
    
    When the user changes the primary display and both displays have the
    same resolution, the buffers are never re-allocated. It is then possible
    to encounter the following scenario:
    
    Surface 1 scans out on display A and surface 2 scans out on display B.
    When surface 1 moves to display B and surface 2 to display A there is no
    guarantee that either surface will force re-draws. If, say, surface 1
    starts page flipping it is possible that it would start re-using the
    buffer currently shown on display A which could cause the GPU process to
    wait for display A to release the buffer. At this point the GPU main
    thread is blocked waiting without a possibility to progress since
    surface 2 cannot use the GPU to update. Eventually the watchdog kills
    the GPU process which causes the surfaces to be reallocated and progress
    to continue.
    
    BUG=511446
    
    Review URL: https://codereview.chromium.org/1334483002
    
    Cr-Commit-Position: refs/heads/master@{#347933}
    (cherry picked from commit 5bfd1d7ea19dae7cca921afa01cb0913d99514c0)
    
    Review URL: https://codereview.chromium.org/1343143002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#260}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  17. [Android] Save url in enhanced bookmark edit activity correctly.
    
    If user edited title and url at the same time, url didn't get saved.
    The reason is that we save title first, then UI is refreshed by
    bookmark observer, which resets the url edit text to the original url.
    
    BUG=530794
    
    Review URL: https://codereview.chromium.org/1341793004
    
    Cr-Commit-Position: refs/heads/master@{#348756}
    (cherry picked from commit edf1e4c8c1bf28d70f20570fe3a4707c5add414f)
    
    TBR=newt@chromium.org
    
    Review URL: https://codereview.chromium.org/1334173010 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#259}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  18. [Android] Fix enhanced bookmark crash on exiting while loading.
    
    On phone, the close button on the top-right corner can be tapped while
    the bookmark UI is loading, which led to a crash. So make the
    exiting code doesn't depend on initialization.
    
    BUG=531337
    
    Review URL: https://codereview.chromium.org/1339783004
    
    Cr-Commit-Position: refs/heads/master@{#348731}
    (cherry picked from commit 3d1eeb5b1e01f197658953ac28f854e3aaf46121)
    
    TBR=newt@chromium.org
    
    Review URL: https://codereview.chromium.org/1341363004 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#258}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  19. [Merge into M46] Differentiate between BackgroundContents and background pages
    
    We now report tasks representing BackgroundContents with a prefix
    "Background App: <...>".
    
    TBR=nick@chromium.org
    BUG=525225
    TEST=browser_tests --gtest_filter=BackgroundContentsTagTest.*
    
    Review URL: https://codereview.chromium.org/1304423007
    
    Cr-Commit-Position: refs/heads/master@{#348636}
    (cherry picked from commit 2acb290d7894e18a2c2e6a7ad0d34542e88b2c90)
    
    Review URL: https://codereview.chromium.org/1342773005 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#257}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  20. Allow first party access to ChromeBroserProvider on M.
    
    BUG=531766
    TBR=tedchoc@chromium.org
    
    Review URL: https://codereview.chromium.org/1341953003
    
    Cr-Commit-Position: refs/heads/master@{#348953}
    (cherry picked from commit d4a331993b62557ec4ad40818ffd5d52909c4ed6)
    
    Review URL: https://codereview.chromium.org/1341363003 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#256}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  21. Move Language down on site settings screen
    
    Site settings should be ordered by privacy-sensitve items first.
    Language is not privacy sensitive, so it should appear near the
    bottom, above Storage.
    
    BUG=530800
    TBR=newt@chromium.org
    
    Review URL: https://codereview.chromium.org/1338823004
    
    Cr-Commit-Position: refs/heads/master@{#348524}
    
    Review URL: https://codereview.chromium.org/1344113002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#255}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  22. Merge to 2490 (M46): mac: Add a hack to condition_variable_posix.cc to avoid a crash.
    
    > The Darwin pthreads subsystem has a bug that can cause the program to crash if a
    > conditional variable is destroyed after it has been signalled, but before it has
    > been waited on. This hack is a solution proposed by Apple in its own developer
    > forums.
    >
    > BUG=517681
    >
    > Review URL: https://codereview.chromium.org/1323293005
    >
    > Cr-Commit-Position: refs/heads/master@{#347736}
    BUG=517681
    TBR=mark@chromium.org
    
    Review URL: https://codereview.chromium.org/1345833002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#254}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  23. Fix Data Saver promo crash on pre-L devices.
    
    BUG=530033
    
    Review URL: https://codereview.chromium.org/1335733002
    
    Cr-Commit-Position: refs/heads/master@{#348256}
    (cherry picked from commit 458d52f0d12e005de18650b426f52158f522afc8)
    
    Review URL: https://codereview.chromium.org/1344483004 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#253}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  24. Call SkGraphics::Init for in-process V2
    
    Previous attempt called SkGraphics::Init in renderer init, which races
    with browser side code that uses skia.
    
    Also noticed that nothing ever calls SkGraphics::Init on browser side,
    so this patch calls it in browser process init.
    
    For single-process, RendererMain doesn't run, so SkGraphics::Init is
    called once. For multi-process, SkGraphics::Init is not called in both
    browser and renderer processes.
    
    BUG=525844
    CQ_INCLUDE_TRYBOTS=tryserver.chromium.linux:linux_chromium_tsan_rel_ng
    
    Review URL: https://codereview.chromium.org/1336673002
    
    Cr-Commit-Position: refs/heads/master@{#348223}
    (cherry picked from commit 9847d57ad66bf39d00a6b7baf0587f83dc823805)
    TBR=boliu@chromium.org
    
    Review URL: https://codereview.chromium.org/1344013003 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#252}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  25. Incrementing VERSION to 46.0.2490.29
    
    Cr-Commit-Position: refs/branch-heads/2490@{#251}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  26. Override AppBannerClient::OnDestruct to be a no-op.
    
    RenderFrameObserver::OnDestruct is called by the RenderFrameImpl
    destructor, and by default this method deletes the observer. However,
    RenderFrameImpl also holds a scoped pointer to AppBannerClient, which is
    a RenderFrameObserver. This CL overrides AppBannerClient::OnDestruct to
    be a no-op, preventing a double-call to the AppBannerClient destructor
    and the associated renderer crashes.
    
    BUG=519090
    
    Review URL: https://codereview.chromium.org/1328323002
    
    Cr-Commit-Position: refs/heads/master@{#348007}
    (cherry picked from commit c36d677a4ba85af67c62569d672512393edf5bfc)
    
    Review URL: https://codereview.chromium.org/1335823004 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#250}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  27. Incrementing VERSION to 46.0.2490.28
    
    Cr-Commit-Position: refs/branch-heads/2490@{#249}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  28. gpu: Disable GPU raster on some older Android GPUs
    
    Disable it for Mali-400 where Android is 4.3 or older,
    and on VideoCore IV GPUs, since it seems to cause crashes,
    (or rather watchdog timeouts and unresponsiveness).
    
    BUG=496438,457914
    NOTRY=True
    
    Review URL: https://codereview.chromium.org/1335323002
    
    Cr-Commit-Position: refs/heads/master@{#348504}
    (cherry picked from commit 25a40be6c2877b1615f1853007710a65bc1278ea)
    
    Review URL: https://codereview.chromium.org/1344713002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#248}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  29. Fix list of xtbs in policy_templates.grd and remoting_strings.grd.
    
    policy_templates.grd failed to list "fa", while remoting_strings.grd was
    missing 11 xtbs. As a result, these strings were missing translations in
    several languages.
    
    BUG=518020
    
    Review URL: https://codereview.chromium.org/1308743008
    
    Cr-Commit-Position: refs/heads/master@{#348736}
    (cherry picked from commit 9ccdaf6867b7824767e9e4421be1f279c0d6efd8)
    
    Review URL: https://codereview.chromium.org/1341953002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#247}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  30. Add chrome.virtualKeyboardPrivate.setHotrodKeyboard api
    
    BUG=524291
    
    Review URL: https://codereview.chromium.org/1315233006
    
    Cr-Commit-Position: refs/heads/master@{#347873}
    (cherry picked from commit 582fd8ffce3ba6df325dffc0fe80066855991074)
    
    Review URL: https://codereview.chromium.org/1339763004 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#246}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  31. Updating XTBs based on .GRDs from branch 2490
    
    Cr-Commit-Position: refs/branch-heads/2490@{#245}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  32. Merge to M46 for BUG=510252
    
    Re-land: Enable GpuMemoryBuffers video frames on MacOS.
    
    This patch enables UYVY GpuMemoryBuffers backed VideoFrames on MacOSX
    for software decoded videos.
    This change allows VideoLayers to be promoted to overlays when possible.
    Power measurements showed a significant reduction in Watts consumed
    during video playback: in the tests ran by ccameron@ it went from 3.15
    Watts to 2.13 Watts.
    
    Additionally this change avoids one copy of the VideoFrame in the GPU
    process and moves away another copy from the Compositor thread to
    media.
    
    Unfortunately, for videos where the decoding time is close to the frame
    time, the additional copy might slow down the decoding past the limit,
    causing more dropped frames in these cases.
    
    More benchmark results can be found here:
    https://x20web.corp.google.com/~dcastagna/results_all.html
    
    The first run is with GMB video frames disabled, the second one, enabled.
    
    BUG=485859,510252
    
    Committed: https://crrev.com/96463459619f441a721f96c51c357208604b7475
    Cr-Commit-Position: refs/heads/master@{#345418}
    
    Review URL: https://codereview.chromium.org/1308913003
    
    Cr-Commit-Position: refs/heads/master@{#347566}
    (cherry picked from commit b65e607913fe32132494e877bc1b70108e4d0e20)
    
    BUG=510252
    
    Review URL: https://codereview.chromium.org/1345453006 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#244}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  33. Merge to M46 for BUG=510252
    
    Fix for threaded raster readback of texture backed SkImage.
    
    This converts texture-backed SkImages of video frames to SkBitmaps so that they can be read back on cc's thread before a SkPicture is handed to raster threads as calling into a GrContext or it's corresponding GLContext is not thread safe.
    
    BUG=524717
    
    Review URL: https://codereview.chromium.org/1311783014
    
    Cr-Commit-Position: refs/heads/master@{#348520}
    (cherry picked from commit 691ca62fa359105ef3529d58e8b3205634a88d22)
    
    BUG=510252
    
    Review URL: https://codereview.chromium.org/1345453004 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#243}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  34. Whitelist another StrictMode violation.
    
    It appears to do both a read and a write on KK. Whitelist the write.
    
    BUG=527415
    TBR=agrieve
    
    Review URL: https://codereview.chromium.org/1345443002
    
    Cr-Commit-Position: refs/heads/master@{#348614}
    (cherry picked from commit b1068c58d5c2a1cd4534e57c6e08eb6c976827cb)
    
    Review URL: https://codereview.chromium.org/1337993003 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#242}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  35. Incrementing VERSION to 46.0.2490.27
    
    Cr-Commit-Position: refs/branch-heads/2490@{#241}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  36. Incrementing VERSION to 46.0.2490.26
    
    Cr-Commit-Position: refs/branch-heads/2490@{#240}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  37. Fix audio glitching on Vista due to unreliable OS callbacks.
    
    This reverts part of the fix I made for Windows 10 audio, since it
    inadvertently broke Vista audio.  Vista will frequently underflow
    and ask for more than one buffer at a time. :(
    
    While back-to-back reads _may_ lead to glitches with single buffer
    clients like WebRTC and WebAudio, not allowing them _definitely_
    leads to glitches for all clients (even <audio> which double buffers on
    the browser side).
    
    Further, API documentation does not guarantee we won't be asked for
    more than one buffer regardless of the period size. In practice, outside
    of Vista this does not seem to happen though.
    
    TEST=vista audio glitch free, windows 10 audio glitch free.
    BUG=524947
    TBR=tommi,henrika
    
    Review URL: https://codereview.chromium.org/1318933003
    
    Cr-Commit-Position: refs/heads/master@{#347135}
    (cherry picked from commit cae8b7ed33dcace93561a1e0bb8126cc020001cd)
    
    Review URL: https://codereview.chromium.org/1335363002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#239}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  38. Merge to M46: "Fix prerendering for media elements on Android."
    
    If the user gesture for autoplay is disabled manually or via an
    experiment, prerendered media will play in a hidden frame.
    
    The Android WMPA interface was incorrectly ignoring the defer load
    callback, which allowed prerendering to occur.
    
    Relands https://codereview.chromium.org/1293253003/ with a rename
    to the test class only to fix an ODR violation.
    
    BUG=522157
    TEST=clank no longer plays hidden a/v when user gesture disabled.
    TBR=creis,qinmin
    
    Review URL: https://codereview.chromium.org/1306723004
    
    Cr-Commit-Position: refs/heads/master@{#345432}
    (cherry picked from commit 49f363884bcd513f5063e8264f24656d5a11e7dd)
    
    Review URL: https://codereview.chromium.org/1343543002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#238}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  39. Fix omnibox suggestion alignment when switching RTL <-> LTR
    
    This also changes the alignment behavior to always align all
    suggestions on the same side (regardless if they are a mixture
    of LTR and RTL).  The trigger for the alignment will be the location
    of the text in the omnibox.
    
    BUG=516327
    
    Review URL: https://codereview.chromium.org/1321863002
    
    Cr-Commit-Position: refs/heads/master@{#346495}
    
    Review URL: https://codereview.chromium.org/1335293002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#237}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  40. Fix crash in DownloadOverwriteInfoBarDelegate.
    
    When the DownloadOverwriteInfoBar is dismissed by user action (e.g.
    because a tab was launched only for the download), we shouldn't try and
    remove the infobar ourselves. Propagate the value through to ensure we
    don't double-free it.
    BUG=481758
    TBR=acleung
    
    Review URL: https://codereview.chromium.org/1326033002
    
    Cr-Commit-Position: refs/heads/master@{#347391}
    (cherry picked from commit 84fa1e834dac2ca70989b8f9ae9baea7e0c878ec)
    
    Review URL: https://codereview.chromium.org/1342493002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#236}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  41. Speculative hardening of fullscreen infobar code.
    
    While this probably isn't the principle infobar crash, it does have a
    few bad smells:
    1) InfoBarDelegate's already have an infobar() accessor. Use that
    instead of a cached tab instance.
    2) Many places in infobar code that handle user events check the
    context to ensure they're still valid before handling them but this
    didn't.
    BUG=481758
    TBR=acleung
    
    Review URL: https://codereview.chromium.org/1322063003
    
    Cr-Commit-Position: refs/heads/master@{#347017}
    (cherry picked from commit 4d978263c720d2accbf1ffa35f859bee9f8e3383)
    
    Review URL: https://codereview.chromium.org/1340693002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#235}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  42. Incrementing VERSION to 46.0.2490.25
    
    Cr-Commit-Position: refs/branch-heads/2490@{#234}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  43. customtabs: Don't flash "about:blank" when we start with an initialized renderer.
    
    CustomTabToolbar doesn't show chrome urls in toolbar. This change
    also adds about:blank to the list of urls that doesn't get shown.
    
    BUG=525123
    
    Review URL: https://codereview.chromium.org/1337983002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#233}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  44. Allow the total engagement to trigger an app banner to be varied via a field trial.
    
    This CL allows the total engagement score (composed of points awarded
    for direct and indirect navigations to an origin) to trigger an app
    banner for a site to be varied via a field trial.
    
    BUG=487519
    
    Review URL: https://codereview.chromium.org/1317273003
    
    Cr-Commit-Position: refs/heads/master@{#346344}
    (cherry picked from commit 76c767eed48c18a3cd3cccc226769b751952d091)
    
    Review URL: https://codereview.chromium.org/1339553002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#232}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  45. Allow direct and indirect navigation values to be varied via field trial.
    
    This CL allows the engagement scores assigned to direct and indirect
    navigations to be varied via a field trial. It also makes method names
    related to the setting of values in AppBannerSettingsHelper more
    consistent.
    
    BUG=487519
    
    Review URL: https://codereview.chromium.org/1309803005
    
    Cr-Commit-Position: refs/heads/master@{#345729}
    (cherry picked from commit 633bbe04d2525d7272a78d78f8e3fdd0abe4d5a2)
    
    Review URL: https://codereview.chromium.org/1334153002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#231}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  46. Allow the minimum time between banner trigger visits to be varied via field trials.
    
    The current heuristics for banner triggering are hard-coded. This CL
    allows the minimum time between visits that are counted for the purposes
    of banner triggering to be varied via field trials. The time will
    default to the current value, which is one visit per day (implemented by
    bucketing all visits to local midnight time). The new implementation
    will bucket to a given resolution in minutes, where the specified
    resolution is less than one day and evenly divisible into the number of
    minutes in a day.
    
    BUG=487519
    
    Review URL: https://codereview.chromium.org/1306693005
    
    Cr-Commit-Position: refs/heads/master@{#345228}
    (cherry picked from commit b6d06bfc9c3dceb0a8f4ef88838705b8d5334d5a)
    
    Review URL: https://codereview.chromium.org/1336903002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#230}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  47. Incrementing VERSION to 46.0.2490.24
    
    Cr-Commit-Position: refs/branch-heads/2490@{#229}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  48. Task Manager Should remember the most recently enabled columns.
    
    This CL:
    1- Makes adding and removing columns to the task manager a lot easier
    and cleaner.
    2- Stores/retrieves the columns visibility to/from the local state
    prefs.
    3- Stores/retrieves the sorted column and the sort order.
    
    TBR=thestig@chromium.org
    BUG=452521
    TEST=browser_tests --gtest_filter=NewTaskManagerViewTest.*
    
    Committed: https://crrev.com/4e16add803fbb0ed18413496d3fb4424fa4957c6
    Cr-Commit-Position: refs/heads/master@{#346524}
    
    Review URL: https://codereview.chromium.org/1320563002
    
    Cr-Commit-Position: refs/heads/master@{#346734}
    (cherry picked from commit 4780b87d1c25f68c39abc623199f3e71a477d32d)
    
    Review URL: https://codereview.chromium.org/1332083002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#228}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  49. Make logging of incoming invalidations more verbose.
    
    Currently, when logging an incoming invalidation, the only thing that is logged
    is the account, the authority and: android.util.MapCollections$KeySet@...
    
    This CL changes it so it instead logs a debug version of the invalidation, on
    the form:
    objectSrc:1004,objectId:SESSION,version:1443812489012310,payload(length):50
    Compared to toString(), this debug string prints the length of the payload
    instead of the whole payload.
    
    In addition, it fixes the log tag for the InvalidationClientService to use the
    same as other invalidation-related classes: cr.invalidation.
    
    The current implementation creates a throwaway PendingInvalidation to do the
    logging based on the incoming bundle. With a little bit larger change, it could
    probably be possible to log this earlier in the process and going from
    individual variables to PendingInvalidation and then to a log string and the
    Bundle to be used for the sync request. However, this CL hooks in at the same
    point as where we currently log what we have.
    
    BUG=529957
    
    Review URL: https://codereview.chromium.org/1331743002
    
    Cr-Commit-Position: refs/heads/master@{#348169}
    (cherry picked from commit aad8a57562449d60c10387434111d05b770fedc7)
    
    Review URL: https://codereview.chromium.org/1332993003 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#227}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  50. Disable the extension service worker checks that are crashing the renderer.
    
    They're triggering for hosted apps, which is a bug. It's still not correct and
    that will be fixed soon, but in the meantime don't crash.
    
    BUG=525965, 529516
    TBR=rdevlin.cronin@chromium.org
    NOTRY=true
    NOPRESUBMIT=true
    
    Review URL: https://codereview.chromium.org/1328313002
    
    Cr-Commit-Position: refs/heads/master@{#347859}
    (cherry picked from commit 881d73aac25304b2fc310ba2a63ac2abd4a0cdfc)
    
    Review URL: https://codereview.chromium.org/1336643002
    
    Cr-Commit-Position: refs/branch-heads/2490@{#226}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  51. Report crashes in setup.exe as coming from the same product as the browser.
    
    This regressed in r256585 when the product name of setup.exe changed in
    its resource.
    
    BUG=526710
    TBR=thakis@chromium.org
    
    Review URL: https://codereview.chromium.org/1321853010
    
    Cr-Commit-Position: refs/heads/master@{#347953}
    (cherry picked from commit 61c9d953fbf2e3b68a82372f7e7114fc880e76c1)
    TBR=grt@chromium.org
    
    Review URL: https://codereview.chromium.org/1331203002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#225}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  52. Fix connection to crash service for x64 setup.exe.
    
    Support for this was added to Chrome in r105190, but was accidentally
    left out for setup.exe. <sadface>
    
    BUG=526710
    R=robertshield@chromium.org
    
    Review URL: https://codereview.chromium.org/1313003003
    
    Cr-Commit-Position: refs/heads/master@{#346434}
    (cherry picked from commit 13c6885ccc78eb4b4fe8437e7141fca5b157459a)
    TBR=grt@chromium.org
    
    Review URL: https://codereview.chromium.org/1334733003 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#224}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  53. Hide existing StrictMode violations.
    
    While we work on to resolve these known StrictMode
    violations, it's a poor experience for dogfooders to see
    these every time they are triggered. It is still
    important for developers and dogfooders to see and report
    newly introduced violations with the StrictMode red border
    flash.
    
    BUG=508615,525781,525785,527415,527429
    NOTRY=true
    NOPRESUBMIT=true
    
    Review URL: https://codereview.chromium.org/1334533004
    
    Cr-Commit-Position: refs/heads/master@{#348147}
    (cherry picked from commit b6f61334631ab1ca930b18e1cbb26d6bb7b92dc7)
    
    TBR=yfriedman@chromium.org
    
    Review URL: https://codereview.chromium.org/1336603002
    
    Cr-Commit-Position: refs/branch-heads/2490@{#223}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  54. Merge to M46: Make password suggestion dropdown on password fields less annoying
    
    This CL makes suggestion dropdown on password field (not username field) will be shown only when password field is empty or it was autofilled. So if the user wants to type password manually we will not bother her.
    
    BUG=522689
    TBR=vabr@chromium.org
    
    Review URL: https://codereview.chromium.org/1323993006
    
    Cr-Commit-Position: refs/heads/master@{#347717}
    (cherry picked from commit fe051b75d3ef6bf3104b305ea2150f3d2d919a61)
    
    Review URL: https://codereview.chromium.org/1333883002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#222}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  55. Don't crash the browser when a webui page misbehaves
    
    Just ignore the call (which is what would happen anyways), and upload a
    minidump
    
    BUG=516690
    TBR=creis@chromium.org,dbeam@chromium.org,estade@chromium.org
    
    Review URL: https://codereview.chromium.org/1332513002
    
    Cr-Commit-Position: refs/heads/master@{#347875}
    (cherry picked from commit b2a49780f87f37649ddb706cff538b7b228b5d17)
    
    Review URL: https://codereview.chromium.org/1335563002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#221}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  56. Show hosted app requests to extensions
    
    BUG=526413
    TEST=browser_tests --gtest_filter=ExtensionWebRequestApiTest.HostedAppRequest
    
    Review URL: https://codereview.chromium.org/1311543005
    
    Cr-Commit-Position: refs/heads/master@{#347756}
    (cherry picked from commit 1db473b2e3b66646a7470e543540a44e854cd8f7)
    
    Review URL: https://codereview.chromium.org/1330263002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#220}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  57. Mac: Fix missing toolbar buttons focus ring on 10.8
    
    Change toolbar buttons to be bordered to make the new style "automatic focus ring"
    work on 10.8.
    AppKit skipped the focus ring on these buttons because it's a button without a
    border, image, or label.
    
    Toolbar.xib changes: checked the "Bordered" checkboxes on all the toolbar buttons
    (back, forward, reload, home, wrench).
    
    BUG=527662
    TBR=rsesek@chromium.org
    
    Review URL: https://codereview.chromium.org/1308993009
    
    Cr-Commit-Position: refs/heads/master@{#347760}
    (cherry picked from commit d1780c8b4d1e82270247e09e0b9972660d1efd50)
    
    Review URL: https://codereview.chromium.org/1331763002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#219}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  58. Mac: Fix missing focus rings on toolbar, profile, and tab buttons
    
    This is a reland of http://crrev.com/1160143010, with some additional tweaks.
    It was reverted because it tickled an AppKit crash (crbug.com/504808).
    The hope is that the crash won't reappear now that we link with 10.10 SDK.
    
    In 10.7, AppKit introduced new API for drawing focus rings.
    This automatic focus ring drawing is automatically enabled for applications linking
    with 10.8 sdk or later.
    After we link with 10.10 SDK the new style focus ring gets enabled but we get
    focus rings with double lines. This is because AppKit thinks the buttons are
    bordered (-isBordered is YES) and draws lines inside and outside the borders
    that are actually not there due to drawing overrides.
    
    10.6 before: manually drawn, tab close and avatar buttons missing focus rings.
    10.6 after: no change.
    
    10.7 before: broken, no focus rings on toolbar, avatar, tab close, new tab buttons.
    10.7 after: manually drawn, same as 10.6.
    
    10.8+ before: broken, no focus rings on toolbar, avatar, tab close, new tab buttons.
    10.8+ after: drawn by AppKit.
    
    Toolbar.xib changes:
    Change the toolbar buttons (back, forward, reload, home, wrench) Focus Ring from
    None to Default, to allow the new style focus ring to draw.
    
    BUG=459860, 520471
    TBR=rsesek@chromium.org
    
    Review URL: https://codereview.chromium.org/1310183005
    
    Cr-Commit-Position: refs/heads/master@{#345989}
    (cherry picked from commit 9c75e3773754cfb242c2819cbfb45bd8b5ddf95f)
    
    Review URL: https://codereview.chromium.org/1327203003 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#218}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  59. Mac Overlays: Allow multiple overlays with sandwich strategy.
    
    Allow multiple videos to be promoted to overlays, as long as they don't overlap.
    
    BUG=527222
    TBR=ccameron@chromium.org
    CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
    
    Review URL: https://codereview.chromium.org/1304053016
    
    Cr-Commit-Position: refs/heads/master@{#347805}
    (cherry picked from commit 99750ddf53c9901b1e9f70c2f3c038f24df2c623)
    
    Conflicts:
    	cc/output/overlay_strategy_sandwich.cc
    	cc/output/overlay_strategy_single_on_top.cc
    	cc/output/overlay_strategy_underlay.cc
    
    Review URL: https://codereview.chromium.org/1330953002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#217}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  60. cc: Add support for continuing an iteration after erasing from a QuadList.
    
    EraseAndInvalidateAllPointers() now return a valid Iterator that can be used to
    continue the iteration.
    
    ListContainerBase::end() is modified so that it stays valid after insertion or
    deletion.
    
    This is needed for https://codereview.chromium.org/1304053016.
    
    BUG=527222
    TBR=ccameron@chromium.org
    TEST=ListContainerTest.DeletionWhileIterating
    CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
    
    Review URL: https://codereview.chromium.org/1305343004
    
    Cr-Commit-Position: refs/heads/master@{#347265}
    (cherry picked from commit 047aa237f24ae3484c98cd520560898320cfbb08)
    
    Review URL: https://codereview.chromium.org/1327203002 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#216}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  61. Ethersuggest++ stopped working on CR44. https://codereview.chromium.org/1189033002/patch/20001/30002 made the change in such a way that current URL is not sent to GWS. More details can be found in the bug.
    
    BUG=529447
    
    Review URL: https://codereview.chromium.org/1305163010
    TBR=pkasting@chromium.org
    
    Cr-Commit-Position: refs/heads/master@{#347852}
    (cherry picked from commit 830d6fad89e86dea88c332ba796b1db07dbf8f25)
    
    Review URL: https://codereview.chromium.org/1307743013 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#215}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  62. Incrementing VERSION to 46.0.2490.23
    
    Cr-Commit-Position: refs/branch-heads/2490@{#214}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  63. Let WebRTC notification not show "touch to return" in custom tab
    
    If the WebRTC is initiated from a custom tab, there is no way to return
    to the tab by clicking the notification. This CL fixes the string
    discrepency by removing it.
    
    BUG=524855
    
    Review URL: https://codereview.chromium.org/1327193004
    
    Cr-Commit-Position: refs/heads/master@{#348031}
    TBR=dfalcantara@chromium.org
    
    Review URL: https://codereview.chromium.org/1308833005 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#213}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  64. Revert "[Android WebView] Enable Network Information API"
    
    This reverts commit 7d01bcecee8bda46001ac56a5e38574a9084679b.
    
    Speculative (but with high confidency rate) revert of the patch
    that seems to be causing the "ERR_NETWORK_CHANGED" issue.
    
    BUG=529434
    
    Review URL: https://codereview.chromium.org/1316413004 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#212}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  65. New illustrations for the Data Reduction Proxy promo
    
    Also, fix the button alignment.
    
    BUG=470433, 527266
    
    Review URL: https://codereview.chromium.org/1303213004
    
    Cr-Commit-Position: refs/heads/master@{#347798}
    (cherry picked from commit 963891f0ae6078b07aa256c5024a618905c5d287)
    
    Review URL: https://codereview.chromium.org/1327193005 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#211}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  66. Merge to M46: Enable InstanceID api for beta and stable channels
    
    BUG=527630
    TEST=test updated
    TBR=kalman@chromium.org
    
    Review URL: https://codereview.chromium.org/1306343005
    
    Cr-Commit-Position: refs/heads/master@{#347244}
    (cherry picked from commit 6217c9a2e136c628c7d2941028b975b90f4b285a)
    
    Review URL: https://codereview.chromium.org/1333693003.
    
    Cr-Commit-Position: refs/branch-heads/2490@{#210}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  67. Initialize gpu::Capabilities::timer_queries
    
    BUG=524096
    
    Review URL: https://codereview.chromium.org/1317643004
    
    Cr-Commit-Position: refs/heads/master@{#346263}
    (cherry picked from commit e7bcbf464b505face0ed490930f9ba4bbb24ed6c)
    TBR=boliu@chromium.org
    
    Review URL: https://codereview.chromium.org/1318113007 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#209}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  68. Fix botched merge.
    
    This header file was unnecessarily included (and doesn't exist on the
    branch)
    
    BUG=529910
    
    Review URL: https://codereview.chromium.org/1333673004 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#208}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  69. Merge to m46: Simplify tracking of focused/active window.
    
    BUG=512000
    TBR=dtseng@chromium.org
    Review URL: https://codereview.chromium.org/1310753002
    
    Cr-Commit-Position: refs/heads/master@{#345168}
    
    Review URL: https://codereview.chromium.org/1332653003 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#207}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  70. Merge to M46 for BUG=510252
    
    Video to canvas: don't draw if a SkImage can't be created.
    
    Skia can return nullptr from NewFromAdoptedTexture and NewFromYUVTexturesCopy after
    a context loss.
    If this happens SkCanvasVideoRenderer should not draw anything instead of crashing.
    
    BUG=526615
    
    Review URL: https://codereview.chromium.org/1325173005
    
    Cr-Commit-Position: refs/heads/master@{#347810}
    (cherry picked from commit 35fb56409a8ec2d873d95fdf130f98e39d21e938)
    
    BUG=510252
    
    Review URL: https://codereview.chromium.org/1311003008 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#206}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  71. Merge to M46 for BUG=510252
    
    Allow GL_RGB_YCBCR_422_CHROMIUM in CopyTextureCHROMIUM.
    
    This CL allows us to specify a texture with RGB_YCBCR_422 internal format
    as source for glCopyTextureCHROMIUM.
    
    BUG=
    
    Review URL: https://codereview.chromium.org/1316993003
    
    Cr-Commit-Position: refs/heads/master@{#347456}
    (cherry picked from commit 28bf86ee01379564978c4392bb7f4adc03d3b41a)
    
    media: Fix inconsistent pending_read_ state in VideoRendererImpl.
    
    After asynchronous VideoFrame copies have been added in VideoRendererImpl,
    pending_read_ might end up in an inconsistent state.
    The problem is that while a VideoFrame copy is in flight, pending_read_ is set
    to true.
    The video frame stream might be reset while the copy is happening.
    Previously the expectation was that pending_read_ would be always false when
    OnVideoFrameStreamResetDone was called.
    
    This CL removes the DCHECK and set pending_read_ to false when the video frame
    stream is reset.
    
    This CL also adds a sequence_token that is incremented every time the stream is
    reset. VideoFrames added with a mismatching sequence token will be discarded.
    
    BUG=
    
    Review URL: https://codereview.chromium.org/1319303005
    
    Cr-Commit-Position: refs/heads/master@{#347234}
    (cherry picked from commit bf50c49385df500992b23bf4a49128971ba78d2e)
    
    BUG=510252
    
    Review URL: https://codereview.chromium.org/1329023003 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#205}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  72. Merge to M46 for BUG=510252
    media: Fix inconsistent pending_read_ state in VideoRendererImpl.
    
    After asynchronous VideoFrame copies have been added in VideoRendererImpl,
    pending_read_ might end up in an inconsistent state.
    The problem is that while a VideoFrame copy is in flight, pending_read_ is set
    to true.
    The video frame stream might be reset while the copy is happening.
    Previously the expectation was that pending_read_ would be always false when
    OnVideoFrameStreamResetDone was called.
    
    This CL removes the DCHECK and set pending_read_ to false when the video frame
    stream is reset.
    
    This CL also adds a sequence_token that is incremented every time the stream is
    reset. VideoFrames added with a mismatching sequence token will be discarded.
    
    BUG=
    
    Review URL: https://codereview.chromium.org/1319303005
    
    Cr-Commit-Position: refs/heads/master@{#347234}
    (cherry picked from commit bf50c49385df500992b23bf4a49128971ba78d2e)
    
    BUG=510252
    
    Review URL: https://codereview.chromium.org/1315123004 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#204}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  73. Merge to M46 for BUG=510252
    
    Check ycbcr422 extension to set VideoFrame to GMB format.
    
    crrev.com/1305153005 and crrev.com/1308643003 added ycbcr_422_image
    Chromium extension.
    This CL select the correct VideoFrame format used to convert software
    to GpuMemoryBuffer video frames based on the availability of the extension.
    The internal format used for the images associated to the GMBs has
    been corrected accordingly.
    
    BUG=526311
    
    Review URL: https://codereview.chromium.org/1306243010
    
    Cr-Commit-Position: refs/heads/master@{#346828}
    (cherry picked from commit 6f19dc8a473ef7385d276e545453f397a0d91305)
    
    BUG=510252
    
    Review URL: https://codereview.chromium.org/1311043018 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#203}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  74. Merge to M46 for BUG=510252
    
    gpu: More image_ycbcr_422 support.
    
    crrev.com/1305153005 and crrev.com/1308643003 added ycbcr_422_image
    Chromium extension.
    This CL:
     - adds Capabilities::image_ycbcr_422 to the list of ipc struct
    traits members
     - adds GL_RGB_YCBCR_422_CHROMIUM as a valid image format in
       gles2_implementation.cc
     - adds GL_RGB_YCBCR_422_CHROMIUM as a valid image format in
       gl_image_io_surface.mm
    
    BUG=526311
    
    Review URL: https://codereview.chromium.org/1320433003
    
    Cr-Commit-Position: refs/heads/master@{#346505}
    (cherry picked from commit 7e9e22c8472542c27464d8ae1d0f8a7c72be82c7)
    
    BUG=510252
    
    Review URL: https://codereview.chromium.org/1317263008 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#202}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  75. Merge to M46 for BUG=510252
    Add ycbcr_422 support in image factory.
    
    BUG=524582
    TBR=sievers@chromium.org
    
    Review URL: https://codereview.chromium.org/1308643003
    
    Cr-Commit-Position: refs/heads/master@{#345959}
    (cherry picked from commit 3055ce7afdf11650d499378cb62ede310dc16f94)
    
    media: Remove SkCanvasVideoRenderer cache invalidation.
    
    When VideoFrame carries one native texture, with a GL_TEXTURE_2D target,
    we assumed we could avoid caching the created SkImage, since we just used
    the texture directly for drawing.
    Unfortunately if we're drawing to a software canvas we need to read the pixels
    back from the texture, and that is expensive.
    Keeping the same SkImage allows Skia to cache the expensive operation.
    
    BUG=521531
    
    Review URL: https://codereview.chromium.org/1320613003
    
    Cr-Commit-Position: refs/heads/master@{#345799}
    (cherry picked from commit 771b5cf7667def96ba3de5cb4a4bf38cff12c3b4)
    
    BUG=510252
    
    Review URL: https://codereview.chromium.org/1327513003 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#201}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  76. Merge to M46 for BUG=510252
    
    Add CHROMIUM_ycbcr_422_image extension.
    
    Add an extension that provides a method for GL to process images that
    are defined in '2vuy' video format.
    
    GL_YCRCR_422_CHROMIUM <internalformat> as been added and it is an accepted
    value when creating an image if the extension is supported.
    
    This extension maps to GL_APPLE_ycbcr_422 and will allow us to determine if
    we can use IOSurfaces with that format.
    
    BUG=524582
    
    Review URL: https://codereview.chromium.org/1305153005
    
    Cr-Commit-Position: refs/heads/master@{#345693}
    (cherry picked from commit a93c58151c01a8ccc6d98697f04c851f8992ef92)
    
    Review URL: https://codereview.chromium.org/1319783009 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#200}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  77. Mac Overlays: Enable h264 overlays
    
    Punch a hole from GpuVideoDecodeAccelerator to VTVideoDecodeAccelerator
    via a callback to BindImage, following the model found in
    VaapiVideoDecodeAccelerator. If successful, set allow_overlay on the
    frame's resource.
    
    BUG=527650
    
    Review URL: https://codereview.chromium.org/1320893004
    
    Cr-Commit-Position: refs/heads/master@{#347546}
    (cherry picked from commit 7ed442bbaf3a5038ce6b9d712200557a0854f888)
    
    Review URL: https://codereview.chromium.org/1307863010 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#199}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  78. Verify that cert status is valid before forgetting user exceptions
    
    Adds a check in SSLPolicy when user exceptions for bad certificates are
    forgotten to make sure that the certificate information is valid. Simply
    adds a check that the cert_id is not 0. Also adds unit tests to validate
    this chain of events.
    
    In SSLPolicy, if a user has made an exception for an invalid certificate
    for a host by clicking on an interstitial, that exception is forgotten
    if a good certificate is ever seen for the host. Unfortunately, when we
    checked if the certificate has an error or not, we forgot to check *if
    the certificate info is valid*, and thus we were getting certificate
    information that that was not valid, and by default lists no certificate
    errors. Thus, Chrome thought it found a certificate without an error,
    when what it really found was invalid certificate information.
    
    BUG=516808
    TBR=creis@chromium.org,estark@chromium.org
    
    Review URL: https://codereview.chromium.org/1311453007
    
    Cr-Commit-Position: refs/heads/master@{#346849}
    (cherry picked from commit f4684d1bb87fb11d93888922b1f61e52f0d61042)
    
    Review URL: https://codereview.chromium.org/1324503003 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#198}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  79. Merge to M46 of:
    
    CookieStoreIOS: handle dotted domains correctly
    
    On iOS <9.0, NSHTTPCookie used to leave leading dots in place on the Domain
    attribute of cookies, and CookieStoreIOS used this behavior to differentiate
    host-only cookies (those with no Domain attribute) from those with an explicit
    Domain attribute that happened to match the hostname. On iOS >=9.0, this
    behavior has changed and it is no longer possible to differentiate cookies in
    this manner. Instead, CookieStoreIOS now uses ParsedCookie to check for a
    Domain attribute's presence directly.
    
    This causes CookieStoreIOS to begin supporting trailing dots on URLs: since
    NSHTTPCookie strips trailing dots from the Domain attribute, the previous
    approach of checking the cookie's domain against the URL's host failed when
    the URL's host had a trailing dot. Since CookieStoreIOS now checks directly for
    Domain this problem no longer occurs and the behavior of CookieStoreIOS is
    closer to that of CookieMonster.
    
    This CL also introduces a new flag 'preserves_trailing_dots' into
    CookieStoreTestTraits. This flag indicates that the cookie store does not fold
    the domains 'foo.com.' and 'foo.com' together. CookieMonster does preserve
    trailing dots (ie, does not fold those domains); CookieStoreIOS does not
    preserve trailing dots (ie, does fold those domains).
    
    BUG=516603
    
    Review URL: https://codereview.chromium.org/1318063002
    
    Cr-Commit-Position: refs/heads/master@{#347439}
    (cherry picked from commit 98a0b920f3e659d38298953f8a2fe903df2a4455)
    
    R=droger@chromium.org
    
    Review URL: https://codereview.chromium.org/1315633006 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#197}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  80. InputMethodEngine's cached composition text should be cleared when reset & CommitText.
    
    BUG=522782
    TEST=Verified the bug not repro on local sandbox.
    
    Review URL: https://codereview.chromium.org/1307783003
    
    Cr-Commit-Position: refs/heads/master@{#345554}
    (cherry picked from commit 952eb74f3c048d4f19b36912f244f62acd4172b3)
    
    Review URL: https://codereview.chromium.org/1320573004 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#196}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  81. Don't show bubble over 'Getting started' page on Win10
    
    This works, in that it stops it from getting shown over the first page.
    
    An additional problem on Win10 is that when the user switches to the
    NTP (as that's the default setup on Win10: [Getting started, NTP]) the
    bubble won't show because the Observer only watches navigations. Once
    *another* new tab is created or the user navigates, then it'll show up.
    This is at least an improvement.
    
    TBR=grt@chromium.org
    BUG=521572
    
    Review URL: https://codereview.chromium.org/1330553003
    
    Cr-Commit-Position: refs/heads/master@{#347515}
    (cherry picked from commit dd9b9d3bc79c7a8c457160b6a723a4c44598afec)
    
    Review URL: https://codereview.chromium.org/1310883011 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#195}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  82. Roll cacheinvalidation to include bug fixes for client release 20150819.
    
    BUG=529225
    TBR=zea@chromium.org
    
    Review URL: https://codereview.chromium.org/1330833003
    
    Cr-Commit-Position: refs/heads/master@{#347804}
    (cherry picked from commit 7eaa8afb59217f376ce15c93fb960de67b87c05e)
    
    Review URL: https://codereview.chromium.org/1325653005 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#194}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  83. Incrementing VERSION to 46.0.2490.22
    
    Cr-Commit-Position: refs/branch-heads/2490@{#193}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  84. Merge: "mac: Fix a focus ring visual bug in the media content settings bubble." to 2490.
    
    > The parent view of the button was too small, and the button lay outside the
    > bounds of its parent view. Increasing the size of its parent view fixed the
    > problem.
    >
    > BUG=525544
    >
    > Review URL: https://codereview.chromium.org/1312163006
    >
    > Cr-Commit-Position: refs/heads/master@{#347549}
    BUG=525544
    TBR=andresantoso@chromium.org, groby@chromium.org
    
    Review URL: https://codereview.chromium.org/1328673004 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#192}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  85. Restore main thread EnsureNSPRInit in the Linux ports.
    
    This got lost in the chimera on accident.
    
    BUG=528468
    
    Review URL: https://codereview.chromium.org/1332443002
    
    Cr-Commit-Position: refs/heads/master@{#347573}
    (cherry picked from commit 19d81eb455d41e9f21981025857e11de223ba5d7)
    
    This also merges in https://codereview.chromium.org/1328253002 which was a
    mistake in the original CL.
    
    TBR=rsleevi@chromium.org
    
    Review URL: https://codereview.chromium.org/1326773005 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#191}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  86. Merge to branch 2490 [Password Generation] Add UMA stats for non-generated submission rates
    
    This allows for apples to apples comparison of generated vs. non-generated
    submission success rates on the same forms.
    
    BUG=509827
    
    Review URL: https://codereview.chromium.org/1228783006
    
    Cr-Commit-Position: refs/heads/master@{#345707}
    (cherry picked from commit cc48d848c09fc5014f3aff0b048e3968653bb104)
    
    Review URL: https://codereview.chromium.org/1320713006 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#190}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  87. Track cc histograms using a global "client name" variable.
    
    BUG=526192
    CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
    
    Review URL: https://codereview.chromium.org/1321013004
    
    Cr-Commit-Position: refs/heads/master@{#347565}
    (cherry picked from commit 0d30216f14e3f5620de722412d76cbdb7759ec42)
    
    TBR=chrishtr@chromium.org,wkorman@chromium.org
    
    Review URL: https://codereview.chromium.org/1321913005 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#189}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  88. [Custom tab]Fix a bug that clicking media notification opens blank tab
    
    This CL lets Tab#createBringTabToFrontIntent() return null if the given
    tab id belongs to a custom tab. A "clickable" notion is introduced here
    to describe notifications that do not carry a content intent.
    
    BUG=524855
    
    Review URL: https://codereview.chromium.org/1328663003
    Cr-Commit-Position: refs/heads/master@{#347768}
    TBR=dfalcantara@chromium.org
    
    Review URL: https://codereview.chromium.org/1323263008 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#188}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  89. No StrictMode for stable on userdebug devices.
    
    Some users always run userdebug android builds. Since they
    likely do not work on Chrome and are not dogfooding, it
    is annoying for them to see StrictMode violations in Chrome
    on Android and not be able to do anything about it.
    
    BUG=527851,149471
    
    NOTRY=true
    NOPRESUBMIT=true
    
    Review URL: https://codereview.chromium.org/1330053002
    
    Cr-Commit-Position: refs/heads/master@{#347750}
    (cherry picked from commit 5082ea83221ed6c01df539cf0b61cf72e36eb9bb)
    
    Review URL: https://codereview.chromium.org/1330843002
    
    Cr-Commit-Position: refs/branch-heads/2490@{#187}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  90. Revert of Pre-cache downloads directory path in PathUtils. (patchset #1 id:1 of https://codereview.chromium.org/1281273003/ )
    
    Reason for revert:
    Revert because it breaks new beta. See
    https://code.google.com/p/chromium/issues/detail?id=528377
    
    Original issue's description:
    > Pre-cache downloads directory path in PathUtils.
    >
    > When Chrome tabs are swiped away and user starts Chrome again,
    > their default downloads directory is requested. This causes a
    > StrictMode policy violation since it results in a ~60ms disk
    > read. Thus by adding this call to the initial AsyncTask we
    > save that time when the directory is requested by native.
    >
    > This must only be called in the browser process as the sandbox
    > processes do not need to make the call nor can they make the
    > call(results in NPE).
    >
    > BUG=508615
    >
    > Committed: https://crrev.com/4a7568dffab924d3710a68949dca0717bdad3352
    > Cr-Commit-Position: refs/heads/master@{#342672}
    
    R=wnwen@chromium.org, yfriedman@chromium.org
    TBR=wnwen@chromium.org, yfriedman@google.com, acleung@chromium.org
    NOPRESUBMIT=true
    NOTREECHECKS=true
    NOTRY=true
    BUG=508615
    
    Review URL: https://codereview.chromium.org/1328043002
    
    Cr-Commit-Position: refs/heads/master@{#347518}
    
    Review URL: https://codereview.chromium.org/1315443012 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#186}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  91. [Script Injection] Allow whitelisted extensions to inject scripts everywhere
    
    Fix a regression where whitelisted extensions couldn't inject content scripts on
    other extension pages.
    
    BUG=517370
    TBR=kalman@chromium.org
    
    Review URL: https://codereview.chromium.org/1294393003
    
    Cr-Commit-Position: refs/heads/master@{#345382}
    (cherry picked from commit 29d2ec93b685a04c1ad0ad047ab702c3cc62ba3f)
    
    Review URL: https://codereview.chromium.org/1319143004 .
    
    Cr-Commit-Position: refs/branch-heads/2490@{#185}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}
    
  92. Merge to M46: Check the tab ID before delivering an extension message.
    
    r335753 changed extension messaging to use RenderFrames, which had the
    side-effect of delivering messages to every RenderFrame in a process,
    which may include other tabs.
    
    This patch fixes that by sending the target tab ID along with the message. A
    more principled fix would have been to track RenderFrames on the browser and
    send to precisely the right ones, but this would need to be part of a more
    comprehensive refactor.
    
    I also fixed up ExtensionApiTest.Connect and re-enabled, which was disabled
    years ago due to flakiness. Hopefully my test JS changes will fix that.
    
    BUG=520303
    TBR=rdevlin.cronin@chromium.org, dcheng@chromium.org
    NOTRY=true
    NOPRESUBMIT=true
    
    Review URL: https://codereview.chromium.org/1318153002
    
    Cr-Commit-Position: refs/heads/master@{#346176}
    (cherry picked from commit 1344c7dfde448d4b80693f597b02993b7f6bbd5b)
    
    Review URL: https://codereview.chromium.org/1318823013
    
    Cr-Commit-Position: refs/branch-heads/2490@{#184}
    Cr-Branched-From: 7790a3535f2a81a03685eca31a32cf69ae0c114f-refs/heads/master@{#344925}