Publish DEPS for Chromium 57.0.2987.100
Incrementing VERSION to 57.0.2987.100
Cr-Commit-Position: refs/branch-heads/2987@{#806}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Incrementing VERSION to 57.0.2987.99
Cr-Commit-Position: refs/branch-heads/2987@{#805}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Do not attempt to retry failed EarlGrey test cases
This is because EarlGrey doesn't have arguments that allow specific test cases to be
selected. The retry logic will therefore end up retrying the entire test suite on an
failure, which is very time consuming.
BUG=697230
Review-Url: https://codereview.chromium.org/2736183002
Cr-Commit-Position: refs/heads/master@{#455562}
(cherry picked from commit 988de943b3986b91f53de6aecbad1dfc1d7a2268)
Review-Url: https://codereview.chromium.org/2741583002 .
Cr-Commit-Position: refs/branch-heads/2987@{#804}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Disable Form-Not-Secure warning when |autofill_client_| is null
This is a temporary fix for an M57 crasher when Form-Not-Secure is
enabled.
PasswordAutofillManager doesn't generally seem to allow for the possibility that
|autofill_client_| is null, yet it's possible for it to be null, in the case of
the SimpleWebViewDialog ChromeOS captive portal login. In a follow-up, we should
figure out whether PasswordAutofillManager is intended to support a null
|autofill_client_| and also whether SimpleWebViewDialog is supposed to work
with password autofill.
BUG=678149
[email protected]
Review-Url: https://codereview.chromium.org/2733043005
Cr-Commit-Position: refs/heads/master@{#455213}
(cherry picked from commit 88c753c103d76fd3697f7fcef962011588e3975f)
Review-Url: https://codereview.chromium.org/2740673004 .
Cr-Commit-Position: refs/branch-heads/2987@{#803}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Incrementing VERSION to 57.0.2987.98
Cr-Commit-Position: refs/branch-heads/2987@{#802}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
[Merge M-57] Add a warning for the deprecation of content-initiated data URL navigations
This CL adds a console warning when a page navigates the top level frame to a
data URL.
The browser tests are added to WebContentsImpl tests to be consistent with
the view-source URL tests.
This CL also updates most of the layout tests to avoid loading data URLs at
the top level. The only exceptions are xss-DENIED-* tests which will be updated
when the actual blocking happens.
BUG=594215
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_site_isolation
Review-Url: https://codereview.chromium.org/2694903007
Cr-Commit-Position: refs/heads/master@{#455226}
(cherry picked from commit b29954e8ac243142eaedbcc3c6e54d480373ee38)
Review-Url: https://codereview.chromium.org/2741513002 .
Cr-Commit-Position: refs/branch-heads/2987@{#801}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
[Extensions] Don't allow setting an opener outside of the same window
Extensions can set a tab's opener (as seen by the tab strip model) using
different APIs. However, the TabStripModel only updates openers (such as
when the tab is removed) for tabs that it contains. This meant that if
an extension set an opener to a tab that wasn't within the
TabStripModel, subsequent queries or events would fail when we tried to
look up the opener id.
Don't allow extensions to set an opener outside of the owning
TabStripModel.
Note: this is intentionally a small change, which unfortunately means we
aren't handling all cases as gracefully as possible. However, it's low-
risk, and should stop us from crashing.
BUG=698681
Review-Url: https://codereview.chromium.org/2737103002
Cr-Commit-Position: refs/heads/master@{#455355}
(cherry picked from commit 5b3827b6349b6d0d7f30d84b930a5c60ef7f7fff)
Review-Url: https://codereview.chromium.org/2733363004 .
Cr-Commit-Position: refs/branch-heads/2987@{#800}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
[Reading List] Expand all Wikipedia sections on distillation.
Most part of Wikipedia articles is hidden when the page loads.
DOM distiller will eventually handle this issue, but for the time being, this is a workaround.
The workaround set the style to block before distilling the page.
BUG=647667, 699215
Review-Url: https://codereview.chromium.org/2730863002
Cr-Commit-Position: refs/heads/master@{#455186}
(cherry picked from commit f2b4f5683185e5bfdc90c42f97d49ed3e06ca1f2)
Review-Url: https://codereview.chromium.org/2733323004 .
Cr-Commit-Position: refs/branch-heads/2987@{#799}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Retry each failed iOS test case separately
BUG=697230
Review-Url: https://codereview.chromium.org/2726143002
Cr-Commit-Position: refs/heads/master@{#454466}
(cherry picked from commit 1cc152a6b78db34bd3c07977b32c5bcd2769d084)
Review-Url: https://codereview.chromium.org/2735313002 .
Cr-Commit-Position: refs/branch-heads/2987@{#798}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Incrementing VERSION to 57.0.2987.97
Cr-Commit-Position: refs/branch-heads/2987@{#797}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
When resolving the locale, use pt-PT for unsupported pt-**
This also maps "pt" -> "pt-BR", and "zh"->"zh-CN".
Chrome has two .pak files for Portuguese: pt-PT and pt-BR. This is
different from most locales in that there is no plain "pt.pak", which
would be selected by normal locale resolving logic. The other exceptions
are zh and en, both of which already have special-case fallback logic
(with the exception of a bare "zh", which this CL addresses).
This change adds equivalent fallback logic for pt-PT.
BUG=691594
Review-Url: https://codereview.chromium.org/2733303002
Cr-Commit-Position: refs/heads/master@{#455326}
(cherry picked from commit 6f16f9098ad2c1da54ac2ca6ea3b203c177b6119)
Review-Url: https://codereview.chromium.org/2741443002 .
Cr-Commit-Position: refs/branch-heads/2987@{#796}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Incrementing VERSION to 57.0.2987.96
Cr-Commit-Position: refs/branch-heads/2987@{#795}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
[Merge M57] Fix crash whem window created before shelf creation.
This fix crash due race condition in multi-profile mode in case some
window is created before shelf initialized. Easiest way to repo is
on fresh machine first sign-in to public account, sign-out, sign-in
to corp Google account. ARC++ OptIn window should pop-up on start.
NOTRY=true
NOPRESUBMIT=true
[email protected]
BUG=684860
TEST=Manually, no more crashes.
Review-Url: https://codereview.chromium.org/2736993002
Cr-Commit-Position: refs/heads/master@{#455315}
(cherry picked from commit a89719254bb2ba3420b3eefb14b811f711532f99)
Review-Url: https://codereview.chromium.org/2728423004
Cr-Commit-Position: refs/branch-heads/2987@{#794}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
exo: Cleanup and make buffer release code more robust.
Since the introduction of CompositorFrameSinkHolder it's possible
for release callbacks to be lost. This is because we rely on the
use count to drop to 0 but we're only guaranteed to get a callback
for the last frame as we only keep one CompositorFrameSinkHolder
reference.
This removes the use count in favor of a simple cancelable callback.
The use count was never necessary as attaching the buffer to
multiple surfaces is a client behavior that results in undefined
release callback behavior. Running the callback when the last
attachment is released is not worse then sending it when all
attachments have been released.
BUG=659601
TEST=exo_unittests --gtest_filter=BufferTest.*
Review-Url: https://codereview.chromium.org/2666233002
Cr-Commit-Position: refs/heads/master@{#447593}
(cherry picked from commit 2cd69789c0cc1bf7b35f6c5673ba1db6f2273cf0)
Review-Url: https://codereview.chromium.org/2736753006 .
Cr-Commit-Position: refs/branch-heads/2987@{#793}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Adjust GetPreferredSize() for ARC's intent picker.
Removing GetPreferredSize(), BubbleDialogDelegateView will pick up the
correct values after placing set_button_row_insets in the right place.
Also replacing BoxLayout with GridLayout so we have the flexibility of
adding/removing padding rows around the contained ScrollView.
BUG=694883
TEST=Steps to reproduce in the bug.
Review-Url: https://codereview.chromium.org/2710133002
Cr-Commit-Position: refs/heads/master@{#453852}
(cherry picked from commit 2e8976ab56dd366d516525fb2ebef0755ebe5b2a)
Review-Url: https://codereview.chromium.org/2728373005 .
Cr-Commit-Position: refs/branch-heads/2987@{#792}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Revert of Correctly update the popup window position (patchset #6 id:160001 of https://codereview.chromium.org/2583873002/ )
Reason for revert:
Breaking M57
crbug/698627
Original issue's description:
> Correctly update the popup window position
>
> It was updating the child window instead.
> This CL hooks up the bounds change to the desktop widget correctly.
>
> BUG=612270
> TEST=fixed test harness to do the correct check.
>
> Review-Url: https://codereview.chromium.org/2583873002
> Cr-Commit-Position: refs/heads/master@{#442741}
> Committed: https://chromium.googlesource.com/chromium/src/+/0aafa24f1ad6b4331bdb65db12ffc1842ba69b1d
[email protected],[email protected],[email protected]
BUG=612270, 698627
Review-Url: https://codereview.chromium.org/2728293004
Cr-Commit-Position: refs/heads/master@{#455231}
(cherry picked from commit 2ba9b1f20d4f158b5cdeb359d9ab7d836e09858a)
Review-Url: https://codereview.chromium.org/2732383002 .
Cr-Commit-Position: refs/branch-heads/2987@{#791}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Specify device type for authcode requests to DMServer.
Defines device type enum for the robot auth code request.
This is required for the migration to CreateOAuthToken call to LSO backend.
BUG=693702
Review-Url: https://codereview.chromium.org/2714163003
Cr-Commit-Position: refs/heads/master@{#453583}
(cherry picked from commit 35275d0100464cc6f401e8307ae9dc2dc32d6cd8)
Review-Url: https://codereview.chromium.org/2733143003 .
Cr-Commit-Position: refs/branch-heads/2987@{#790}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
[M57] Enable ARC kiosk mode always when ARC is available
This removes --enable-arc-kiosk flag and instead uses --arc-available
to make this decision.
BUG=697741
TEST=./unit_tests --gtest_filter="ChromeArcUtilTest.*"
TEST=./components_unittests --gtest_filter="ArcUtilTest.*"
(cherry-picked from 67e99111e67ac5aeae011a14154e054160bf98c4)
[email protected], [email protected]
Review-Url: https://codereview.chromium.org/2730003002 .
Cr-Commit-Position: refs/branch-heads/2987@{#789}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
[Merge M57] arc: Handle position conflict in app list items.
It is not guaranteed that sync items have unique positions. This may
cause crash in case web store app has conflicting pos with some other
app.
TEST=Unit test added
BUG=692802
NOTRY=true
NOPRESUBMIT=true
[email protected]
Review-Url: https://codereview.chromium.org/2732633003
Cr-Commit-Position: refs/heads/master@{#455195}
(cherry picked from commit 11f9ee62d5cb9fbc3d3f1458e145b06be67f78ae)
Review-Url: https://codereview.chromium.org/2732333002
Cr-Commit-Position: refs/branch-heads/2987@{#788}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Merge "[NTP::SectionOrder] Disable ClickBasedRanker by default."
This is a merge of https://codereview.chromium.org/2739633002 into M57
(branch 2987).
Original description:
BUG=646841
Review-Url: https://codereview.chromium.org/2739633002
Cr-Commit-Position: refs/heads/master@{#455076}
(cherry picked from commit 5b3981679d8eee4fdbb16d612b571de4ab71498f)
Review-Url: https://codereview.chromium.org/2735243002 .
Cr-Commit-Position: refs/branch-heads/2987@{#787}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
[Merge M57] arc: Provide more logging for network failures.
This add more loggin for network failures and handles network
timeouts as dedicated UMA entry.
NOTRY=true
NOPRESUBMIT=true
[email protected],[email protected],[email protected]
BUG=697579
Test=Manually. Emulate network unavailble error. GMS Services error
is shown. chrome:://histograms shows value 19 recorded. Update
only ARC side and repeat the test to validate condition with
mojo different versions. The same error is shown but UMA
value 14 is recorded in UMA (legacy case)
Review-Url: https://codereview.chromium.org/2723263003
Cr-Commit-Position: refs/heads/master@{#454501}
(cherry picked from commit 337f3e54b359b2b83950d4e61d5c6b05108bc630)
Review-Url: https://codereview.chromium.org/2736033003
Cr-Commit-Position: refs/branch-heads/2987@{#786}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
[Payments] Fix focus bug in the expiration date CVC unmaskp prompt.
BUG=697408
Review-Url: https://codereview.chromium.org/2722283004
Cr-Commit-Position: refs/heads/master@{#454594}
(cherry picked from commit 298bf2e2d0ccfc87571bae60b2c0259d58f0d18e)
Review-Url: https://codereview.chromium.org/2735843003 .
Cr-Commit-Position: refs/branch-heads/2987@{#785}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
[Merge M57] arc: Handle metrics for Auth operations.
This handles messages with Auth operation metrics and add it to
UMA.
TEST=Locally, new metrics appear in chrome://histograms
BUG=b/35707115
BUG=695542
[email protected],[email protected],[email protected]
NOTRY=true
NOPRESUBMIT=true
Approval at b/35707115
Review-Url: https://codereview.chromium.org/2704383006
Cr-Commit-Position: refs/heads/master@{#452722}
(cherry picked from commit 052c11832f70f11fb220abb005bcf93143d2e4e8)
Review-Url: https://codereview.chromium.org/2734983002
Cr-Commit-Position: refs/branch-heads/2987@{#784}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Media: fix memory leak because of the document holding on an EventListener.
MediaControls checks if they are part of a document or not in order to unregister
most of its event listeners when removed from a document to avoid leaking memory
until the document is closed.
The approach taken in this CL is the most "web based" because the controls are
using events. Another approach would be to use internal callbacks (from
ContainerNode) or even have a `addWeakEventListener` method in EventTarget. The
latter might be an interesting solution.
BUG=680898
[email protected],[email protected]
Review-Url: https://codereview.chromium.org/2725873002
Cr-Commit-Position: refs/heads/master@{#454060}
(cherry picked from commit 8daac32c17f494d496fb2ca3768d67d9bd77db5e)
Review-Url: https://codereview.chromium.org/2736853003 .
Cr-Commit-Position: refs/branch-heads/2987@{#783}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Merge "[NTP::PhysicalWeb] Disable feature by default."
This is a merge of https://codereview.chromium.org/2719473002 into M57
(branch 2987).
Original description:
BUG=666647
Review-Url: https://codereview.chromium.org/2719473002
Cr-Commit-Position: refs/heads/master@{#452802}
(cherry picked from commit 8ea3b8e1f7c6738a53e11c4dc58ca795a3116be2)
Review-Url: https://codereview.chromium.org/2732233002 .
Cr-Commit-Position: refs/branch-heads/2987@{#782}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Remove VoiceSearchProvider::CreateVoiceSearchBar().
This functionality is now covered by BuildVoiceSearchBar().
BUG=679719
Review-Url: https://codereview.chromium.org/2642783008
Cr-Commit-Position: refs/heads/master@{#445825}
(cherry picked from commit c2cdf6f411f8c5e8e7232fbf32b4b1eacea48268)
Review-Url: https://codereview.chromium.org/2737563003 .
Cr-Commit-Position: refs/branch-heads/2987@{#781}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Fix memory management of VoiceSearchBarView.
The VoiceSearchProvider is written in ARC, so the returned value is
autoreleased despite the function having "Created" in the name. This
CL correctly retains the returned value to prevent over-releasing the
view.
BUG=679719
Review-Url: https://codereview.chromium.org/2644703003
Cr-Commit-Position: refs/heads/master@{#445769}
(cherry picked from commit d297fb597145bbfc86fb1c243091669f09dc6df5)
Review-Url: https://codereview.chromium.org/2738653002 .
Cr-Commit-Position: refs/branch-heads/2987@{#780}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Use targetFrame to decide whether to allow load in static html view.
StaticHtmlViewController intercepts attempted main frame navigations
and performs the load using the UrlLoader protocol. Currently,
navigations are ignored unless their reported sourceFrame is the main
frame. However, this has the mistaken behavior of intercepting loads
that are initiated by the main frame, but are intended for a subframe.
Additionally, the current implementation will not intercept navigations
triggered by JavaScript (e.g. setting window.location to a new URL), as
these are reported as having a nil sourceFrame, but the main frame as the
targetFrame. Since the same-origin policy is enforced by WebKit before
WKWebView navigation callbacks can occur, we can assume that an
navigation with the main frame as the targetFrame are valid and should be
intercepted.
BUG=695262
Review-Url: https://codereview.chromium.org/2728243002
Cr-Commit-Position: refs/heads/master@{#454723}
(cherry picked from commit 0f799230c0f27e3e8882868f46d9d5cefe9c8c6d)
Review-Url: https://codereview.chromium.org/2734843004 .
Cr-Commit-Position: refs/branch-heads/2987@{#779}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
arc/power: add suspend/resume hooks
This allows us to alert the instance when we're about to suspend
and when we've come back. The instance can use this information
to do any data serialization it needs to, generally by pausing
the running apps, before we go to S3.
BUG=http://b/33561103
TEST=open camera app, suspend/resume, ensure app has survived
[email protected],[email protected],[email protected]
NOTRY=true
NOPRESUBMIT=true
Review-Url: https://codereview.chromium.org/2654653006
Cr-Commit-Position: refs/heads/master@{#446732}
(cherry picked from commit 470fda14d38d91e398fdb645778b66b0851e841c)
Review-Url: https://codereview.chromium.org/2739593002
Cr-Commit-Position: refs/branch-heads/2987@{#778}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Incrementing VERSION to 57.0.2987.95
Cr-Commit-Position: refs/branch-heads/2987@{#777}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
[Merge to M-57] Fix crash in captive portal dialog dialog on ChromeOS
|web_contents| can be null in LocationBar::GetExtensionName
when a captive portal dialog is displayed before login in ChromeOS.
Return early in that case.
This isn't the right fix but a bandaid. The proper fix will
change ChromeOS captive portal dialog to return a proper WebContents.
BUG=680329
Review-Url: https://codereview.chromium.org/2655823003
Cr-Commit-Position: refs/heads/master@{#453672}
(cherry picked from commit 08e6bdcd00b6b07b9269ae38de22fd0e8b7e65ac)
Review-Url: https://codereview.chromium.org/2734973003 .
Cr-Commit-Position: refs/branch-heads/2987@{#776}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Updating XTBs based on .GRDs from branch 2987
Cr-Commit-Position: refs/branch-heads/2987@{#775}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Fix a crash when receiving PAUSE action but no service is routed
In some situations the notification might fire PAUSE action although the
session has no routed service. This is due to the intents fired by
Android is asynchronous. This CL adds a null-check to solve the issue.
BUG=698645
Review-Url: https://codereview.chromium.org/2733843003
Cr-Commit-Position: refs/heads/master@{#454945}
(cherry picked from commit 2fe2e35b5b0b1bd56218c7d8a452966c57593e90)
Review-Url: https://codereview.chromium.org/2733103003 .
Cr-Commit-Position: refs/branch-heads/2987@{#774}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Don't initialize the sandbox when --no-sandbox specified
[email protected]
BUG=636206
Review-Url: https://codereview.chromium.org/2653343005
Cr-Commit-Position: refs/heads/master@{#446726}
(cherry picked from commit a81db3431cff3883382781baa815435ec9eedb35)
Review-Url: https://codereview.chromium.org/2735733004 .
Cr-Commit-Position: refs/branch-heads/2987@{#773}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
HSTS preload list removals for Chrome 58.
safic.net:
> • [oakwood] - audio stream server will not properly support https, oversite on
> configuration preload and subdomains have been removed from headers.
BUG=655854
Review-Url: https://codereview.chromium.org/2649223002 .
Cr-Commit-Position: refs/heads/master@{#454161}
(cherry picked from commit a739725e13c66cd34417847fb9f4a08854a5902f)
Review-Url: https://codereview.chromium.org/2738533002 .
Cr-Commit-Position: refs/branch-heads/2987@{#772}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Skip page refresh navigation in navigation observer
Since page refresh navigations have the same source and destination url,
and do not help us attribute downloads, we can safely skip them (and
save the quota for other meaningful navigations).
BUG=698121
Review-Url: https://codereview.chromium.org/2728123003
Cr-Commit-Position: refs/heads/master@{#454658}
(cherry picked from commit 0a5231e4ca6ec1af9908e4b35590da1cdf4918fa)
Review-Url: https://codereview.chromium.org/2734913002 .
Cr-Commit-Position: refs/branch-heads/2987@{#771}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Extract fallback locale pak file when system locale is unsupported
BUG=697679
Review-Url: https://codereview.chromium.org/2731133002
Cr-Commit-Position: refs/heads/master@{#454871}
(cherry picked from commit 8faedec47ad63dadb7214bd8da34467a0c0edfb0)
Review-Url: https://codereview.chromium.org/2737553002 .
Cr-Commit-Position: refs/branch-heads/2987@{#770}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Don't allow GuestView JS objects to inherit global prototype.
Allowing objects like GuestViewImpl and GuestViewContainer to
inherit prototypes from the global JS object can allow arbitrary user
code to be attached to these objects, and potentially executed.
This CL prevents this by forcing the inherited __proto__ objects
to be null.
BUG=695476
Review-Url: https://codereview.chromium.org/2712913005
Cr-Commit-Position: refs/heads/master@{#452976}
(cherry picked from commit 5934185d281ff83961832317620da5468e7cf703)
Review-Url: https://codereview.chromium.org/2730383002 .
Cr-Commit-Position: refs/branch-heads/2987@{#769}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Don't change workspace metrics when using accessibility keyboard in touchview mode.
Changing workspace metrics causes relayouting in Android app and
making input focus leave an input field. This behavior triggers
keyboard flickering.
BUG=696436
TEST=Manual test by steps described in the bug.
[email protected],[email protected]
Review-Url: https://codereview.chromium.org/2716273002
Cr-Commit-Position: refs/heads/master@{#453589}
(cherry picked from commit 7fd6ca24a1fa92bcaa0484e6792aacb2b87f34ef)
Review-Url: https://codereview.chromium.org/2736633002 .
Cr-Commit-Position: refs/branch-heads/2987@{#768}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Incrementing VERSION to 57.0.2987.94
Cr-Commit-Position: refs/branch-heads/2987@{#767}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Incrementing VERSION to 57.0.2987.93
Cr-Commit-Position: refs/branch-heads/2987@{#766}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Ensure WindowProxy reinitialization on navigations if needed.
When returning a Window reference to JS, Blink calls ToV8() to
convert the C++ DOMWindow pointer to an associated JS DOM wrapper,
which ensures the associated WindowProxy is initialized. During a
navigation that requires switching DOMWindows, the WindowProxy is
detached from the old DOMWindow by calling setDOMWindow() and
later reattached to the new DOMWindow by calling
ScriptController::updateDocument().
As an optimization, 246e25c5bd72fac9dce3b9b1254e5590d0444d09
skipped initialization of the WindowProxy if it's global proxy
reference was null. Skipping initialization is safe here since a
null global proxy reference means that ToV8() was never called,
and JS cannot hold any references to the Window object. Thus, it
is unnecessary to ensure that the global proxy is attached to a
DOMWindow.
40458d4dd913d5fd6f4f1bb2da083a8a7136a9af cleaned up the complex
WindowProxy initialization logic but introduced a subtle bug:
it changed updateDocument() to be a no-op if the WindowProxy is
not initialized. Unfortunately, this means that any existing
script references to that Window object will be broken unless
WindowProxy reinitialization is triggered by something else,
such as loading a <script> tag in the new Document or getting
a new reference to the Window.
BUG=690178
Review-Url: https://codereview.chromium.org/2732483004
Cr-Commit-Position: refs/heads/master@{#454552}
(cherry picked from commit bee44e2b6c7a93b28e1082743784045447498476)
Review-Url: https://codereview.chromium.org/2735573002 .
Cr-Commit-Position: refs/branch-heads/2987@{#765}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Fix two flaky media notification tests
There are two media notification tests flaky because of the test
pages are not set properly in BUILD.gn. This CL adds two test
pages in `media/session` test data directory so that they are
copied onto the device as they are executed. The `media/session`
test data directory is already in BUILD.gn so no changes there
needed.
BUG=697453
Review-Url: https://codereview.chromium.org/2722233002
Cr-Commit-Position: refs/heads/master@{#453991}
(cherry picked from commit 778f0744fecc3c50d4d23b0df97e3eaef9cbf817)
Review-Url: https://codereview.chromium.org/2731153002 .
Cr-Commit-Position: refs/branch-heads/2987@{#764}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Fix two notification update issues on page navigation
This CL fixes two issues that causes the notification to update
improperly on navigation:
* The notification should reset for same-origin but non-same-page
navigation (in Java).
* When the RenderFrameHost navigates away, the MediaSession members
stored in MediaSessionServiceImpl should also be reset.
BUG=696716
Review-Url: https://codereview.chromium.org/2723803002
Cr-Commit-Position: refs/heads/master@{#453906}
(cherry picked from commit efb50702d432d69e593cf0bafb85ab82093d5395)
Review-Url: https://codereview.chromium.org/2736493002 .
Cr-Commit-Position: refs/branch-heads/2987@{#763}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Media Session: add test for crash with command send on iframe during unload.
This is adding a test for the crash that was fixed on trunk. The test
represents the minimal test case that we have been able to find.
BUG=695398
[email protected]
Review-Url: https://codereview.chromium.org/2711293003
Cr-Commit-Position: refs/heads/master@{#452806}
(cherry picked from commit 16e2688ef7b85f68799f5f1e1b5ed557f19c746b)
Review-Url: https://codereview.chromium.org/2734543003 .
Cr-Commit-Position: refs/branch-heads/2987@{#762}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
[merge m57] Use chrome::kChromeVersion in installer::GetModulePath().
Before this CL, installer::GetModulePath() used the version in the
VS_VERSION_INFO resource of the current module to construct the path
to another module. Unfortunately, reading that resource sometimes
crashed. With this CL, installer::GetModulePath() uses the
chrome::kChromeVersion constant instead. This contains the same
value as the VS_VERSION_INFO resource.
BUG=682987
Review-Url: https://codereview.chromium.org/2656443002
Cr-Commit-Position: refs/heads/master@{#448055}
(cherry picked from commit 58feb04ce1dda2ff33edaf1973de3f4fefb5f56e)
Review-Url: https://codereview.chromium.org/2728143003 .
Cr-Commit-Position: refs/branch-heads/2987@{#761}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Incrementing VERSION to 57.0.2987.92
Cr-Commit-Position: refs/branch-heads/2987@{#760}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
[DevTools] Console should wait for the main target
BUG=694761
NOTRY=true
NOPRESUBMIT=true
Review-Url: https://codereview.chromium.org/2726933002
Cr-Commit-Position: refs/heads/master@{#454054}
(cherry picked from commit 13edaa9f1b449a0de7fb6529c5227751668a4ec9)
Review-Url: https://codereview.chromium.org/2733463003
Cr-Commit-Position: refs/branch-heads/2987@{#759}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Updating XTBs based on .GRDs from branch 2987
Cr-Commit-Position: refs/branch-heads/2987@{#758}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
[Android] Fix a custom search engine bounces when it selected and unselected as default engine
When there are mutliple custom search engines displayed on setting page,
selecting and unselecting all except the top one will make them bounce
between default list and custom engine list. The right behaivor should
be the selected custom engine should remain in the same place and be
updated next time loading the setting page.
It is caused using their indexes to decide whether two engines are the
same. However, selecting/unselecting a custom engine will make Chrome
reorder the engine list which changes the selected/unselected one's
index and forces Chrome to refresh the list on Android.
To fix it, index of a search engine should not be used to decide whether
two engines are the same.
BUG=692343
NOTRY=true
NOPRESUBMIT=true
Review-Url: https://codereview.chromium.org/2691033007
Cr-Commit-Position: refs/heads/master@{#451890}
(cherry picked from commit 06aa457920d30616cc4c47c23057714694e3b3a7)
Review-Url: https://codereview.chromium.org/2729253002
Cr-Commit-Position: refs/branch-heads/2987@{#757}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Don't look up font size preferences on Android.
These are not configurable on Android so we should rely on the default
value on the WebPreferences object. The use of the unnecessary pref
appears to have caused the value to be reused from an unrelated pref
when the resource ID space changed.
Detailed rationale:
* The default value for the font size preference is coming from a resource.
* That resource isn't defined on Android, only on all desktop platforms.
* This nevertheless used to work for some reason, but that changed with the
resource ID reshuffle http://crrev.com/427236. Why precisely this used to work
and why it's now broken is not yet fully understood.
* This CL fixes this by removing the pref completely, given that there are no
other sources for the pref anyway, and the WebPreferences struct has its own
default, which matches what's in the GRD file on other platforms. Because this is
for 56 cherry-pick and the resource ID situation is not yet fully understood, this
seems like a safer fix than, for instance, trying to add a new resource to the
Android GRD file.
BUG=696364
Review-Url: https://codereview.chromium.org/2724203003
Cr-Commit-Position: refs/heads/master@{#454437}
(cherry picked from commit 0df335a1ea5a09d4860168bc05bbf0d11e802bf5)
Review-Url: https://codereview.chromium.org/2734513002 .
Cr-Commit-Position: refs/branch-heads/2987@{#756}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Merge r454579 (with the accidental changes removed) and r454581:
Unset child account flag when the account is removed.
Don't prohibit signout on Android when the signed in account has been removed.
For child accounts, users are prohibited from signing out. If the
account is removed from Google Play Services however, we do need to sign
out to ensure account consistency. Right now this goes through the same
code path as a manual signout, so we manually reenable signing out
before triggering it.
[email protected]
BUG=698207
Review-Url: https://codereview.chromium.org/2725333003 .
Cr-Commit-Position: refs/branch-heads/2987@{#755}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Revert "Make document.rootScroller into an origin trial"
This reverts commit f2b6b4c6b17f90d48d986c3856f4a422ddbdbc2c.
BUG=680190
Review-Url: https://codereview.chromium.org/2731763002 .
Cr-Commit-Position: refs/branch-heads/2987@{#754}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Do not load about:blank if iframe requested to load invalid URL.
https://codereview.chromium.org/2397623002 prevents loading the page
with invalid url and loads about blank:instead. This CL prevents
loading about:blank if request is coming from iframe.
BUG=694865
Review-Url: https://codereview.chromium.org/2709383002
Cr-Commit-Position: refs/heads/master@{#452371}
(cherry picked from commit 74d58648b7106e3cf8dc31f667eb5e902e15caaa)
Review-Url: https://codereview.chromium.org/2726083006 .
Cr-Commit-Position: refs/branch-heads/2987@{#753}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Fix compile failure in Deprecation.cpp (missing M60 enum value)
BUG=685727
[email protected]
NOTRY=true
NOPRESUBMIT=true
Review-Url: https://codereview.chromium.org/2725353002
Cr-Commit-Position: refs/branch-heads/2987@{#752}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
[ShaderDiskCache] Keep the Entry* alive for duration of cache call
The disk cache takes an Entry** argument for calls to open an entry.
The backing Entry* must stay alive until the call completes.
BUG=663589
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Review-Url: https://codereview.chromium.org/2728643002
Cr-Commit-Position: refs/heads/master@{#454270}
(cherry picked from commit f22f70a9ea38fd490fbf809660566cae77538b90)
Review-Url: https://codereview.chromium.org/2730903003 .
Cr-Commit-Position: refs/branch-heads/2987@{#751}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Add a deprecation message to rtcpMuxPolicy of negotiate.
When parsing the RTCConfiguration, if the RtcpMuxPolicy is explicitly set
to be "negotiate", the deprecation message will be return to the console.
If this is approved, the change will be merged to M57.
BUG=chromium:685727
Review-Url: https://codereview.chromium.org/2720763004
Cr-Commit-Position: refs/heads/master@{#453771}
(cherry picked from commit 918bb2c91f07a2cce51cea68554bd56566dec0dc)
Review-Url: https://codereview.chromium.org/2725293004 .
Cr-Commit-Position: refs/branch-heads/2987@{#750}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Add a use counter for RtcpMuxPolicy of "negotiate".
When parsing the RTCConfiguration, if the RtcpMuxPolicy is "negotiate",
it will be counted. The number will be used to estimate the risk of
removing this feature.
Intent to deprecate thread: https://groups.google.com/a/chromium.org/forum/#!topic/blink-dev/OP2SGSWF5lo
BUG=chromium:685727
Review-Url: https://codereview.chromium.org/2679093006
Cr-Commit-Position: refs/heads/master@{#451162}
(cherry picked from commit 887a0d5ac980c21eebecb133a75e08dc2fe048bf)
Review-Url: https://codereview.chromium.org/2733583002 .
Cr-Commit-Position: refs/branch-heads/2987@{#749}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
[merge m57] Prefer returning a SingleThreadTaskRunner in SequencedTaskRunnerHandle::Get().
Currently:
- When a thread has a SingleThreadTaskRunner but not
SequencedTaskRunner, SequencedTaskRunnerHandle::Get() and
ThreadTaskRunnerHandle::Get() are equivalent.
- ThreadTaskRunnerHandle::Get() can only be called from a thread that
has a SingleThreadTaskRunner.
- Having both a SequencedTaskRunner and a SingleThreadTaskRunner on the
same thread is prevented by a DCHECK.
That means that replacing ThreadTaskRunnerHandle::Get() with
SequencedTaskRunnerHandle::Get() shouldn't change anything.
Unfortunately, RLZ sets a SingleThreadTaskRunner on a thread that
already has a SequencedTaskRunner.
To make the replacement of ThreadTaskRunnerHandle::Get() with
SequencedTaskRunnerHandle::Get() a true no-op under the assumption
that a SingleThreadTaskRunner can be registered on a thread that
already has a SequencedTaskRunner, this CL gives priority to the
SingleThreadTaskRunner in SequencedTaskRunnerHandle::Get().
This change will be reverted once RLZ stops setting a
SingleThreadTaskRunner on a thread that already has a
SequencedTaskRunner.
BUG=693711, 618530
Review-Url: https://codereview.chromium.org/2714813005
Cr-Commit-Position: refs/heads/master@{#452980}
(cherry picked from commit 533c31e78be276dcaa843dc66efd4fee697d9573)
Review-Url: https://codereview.chromium.org/2725873006 .
Cr-Commit-Position: refs/branch-heads/2987@{#748}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Mac: Fix crash in ExternalProtocolDialogController due to null WebContents.
Since r448894 ExternalProtocolDialogController started dereferencing
a possibly-null WebContents that it did not previously.
To fix, check for null in before proceeding with setting block state, and
just release the dialog window.
BUG=696456
NOTRY=true
NOPRESUBMIT=true
Review-Url: https://codereview.chromium.org/2719243002
Cr-Commit-Position: refs/heads/master@{#453472}
(cherry picked from commit b6d636ad5973cf4ac21ffe5a8e7e1e1a25d9949b)
Review-Url: https://codereview.chromium.org/2728033002
Cr-Commit-Position: refs/branch-heads/2987@{#747}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Make SSLConfigManager notify clients if the SHA-1 policy changes
An oversight in the comparator for the SSLConfigManager that handles
the logic for determining when an SSLConfig is "new" (and thus
should invalidate all existing SSLConfigs) meant that changes to the
SHA-1 policy for local anchors wouldn't be immediately propagated.
BUG=697154
Review-Url: https://codereview.chromium.org/2723783002
Cr-Commit-Position: refs/heads/master@{#453772}
(cherry picked from commit 39f9eb3f5301f73d385c6d65601c60dba4fae63e)
Review-Url: https://codereview.chromium.org/2730623005 .
Cr-Commit-Position: refs/branch-heads/2987@{#746}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Relax text validation in FrameSelection::selectWordAroundPosition
This CL fixes text select failure in the cases that |startOfWord|
returns VisiblePosition before space like " bar".
In that case, selectWordAroundPosition failed.
This CL covers the case to check text contains characters rather than
separators.
The root cause is that though |previousBoundary| in |startOfWord| finds
correct position of " |bar", |mostBackWordPosition| of canonicalization
moves to "| bar". We can fix it changing function signature from
VisiblePosition to Position. However it changes editing code widely.
I think that is a kind of refactoring, but that is massive change. I will
do it after branch-cut.
BUG=658765
TEST=webkit_unit_test --gtest_filter=FrameSelectionTest.SelectWordAroundPosition2, by hand with https://jsfiddle.net/fpt03tv5/1/
Review-Url: https://codereview.chromium.org/2723913002
Cr-Commit-Position: refs/heads/master@{#453860}
(cherry picked from commit 8b8542139c3680bd68c6fa07b3df6cfd8706b3c9)
Review-Url: https://codereview.chromium.org/2732593002 .
Cr-Commit-Position: refs/branch-heads/2987@{#745}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Incrementing VERSION to 57.0.2987.91
Cr-Commit-Position: refs/branch-heads/2987@{#744}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Move bottom container to be behind scrim
Previously it was possible for the infobars to show on top of the
scrim and omnibox results container. This change simply moves the
bottom container (the view that holds the info bars) and the bottom
bar stub to have a lower priority in the view hierarchy. This allows
the scrim and omnibox results to draw on top of them.
BUG=694982
Review-Url: https://codereview.chromium.org/2721073002
Cr-Commit-Position: refs/heads/master@{#454297}
(cherry picked from commit 8cf8189a738fbb42e352fa123e1349b0c2c4ed01)
Review-Url: https://codereview.chromium.org/2726083004 .
Cr-Commit-Position: refs/branch-heads/2987@{#743}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Extend Physical Web iOS auto-enable behavior beyond first launch.
On Chrome start, we check whether the device state permits us to
auto-enable the Physical Web feature to perform foreground scanning for
nearby Bluetooth LE devices broadcasting URLs.
Previously, if the auto-enable conditions were not met, the Physical Web
preference would be set to the explicitly-disabled state. With this change,
the preference is left in an onboarding state and Chrome will check again
the next time Chrome is started.
BUG=695184
Review-Url: https://codereview.chromium.org/2704343005
Cr-Commit-Position: refs/heads/master@{#452571}
(cherry picked from commit 0e3b410bacaa28cde0c2be4c2eba96451c6ca72a)
Review-Url: https://codereview.chromium.org/2725803007 .
Cr-Commit-Position: refs/branch-heads/2987@{#742}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Make sure DCHECK compiles out completely if DCHECKS aren't enabled.
The MSVC optimizer can get confused when expressions that create
temporaries are completely optimized out.
Before:
2017-01-24 05:59 PM 1,139,712 chrome.exe
2017-01-24 05:53 PM 48,618,496 chrome.dll
2017-01-24 05:59 PM 68,739,584 chrome_child.dll
After:
2017-01-24 06:51 PM 1,136,128 chrome.exe
2017-01-24 06:45 PM 48,265,216 chrome.dll
2017-01-24 06:51 PM 68,245,504 chrome_child.dll
This results in a total savings of ~830KB in a mostly official build.
These numbers don't include the effect of full_wpo_on_official=true,
but it's been confirmed that this codegen bug happens either way.
BUG=684105
[email protected]
Review-Url: https://codereview.chromium.org/2653073002
Cr-Commit-Position: refs/heads/master@{#446054}
(cherry picked from commit fc670f47ae174fb59497fe5d3315b10cc7601cad)
Review-Url: https://codereview.chromium.org/2724253004 .
Cr-Commit-Position: refs/branch-heads/2987@{#741}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
cc: Fix vertex opacity shaders
Fix a typo that indexed by quad, not vertex.
Add a pixel test to prevent regressions.
BUG=694986
CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
Review-Url: https://codereview.chromium.org/2724563003
Cr-Commit-Position: refs/heads/master@{#453865}
(cherry picked from commit 8558df98469ef25bcd685bd9f9b0dc080ad2dc5b)
Review-Url: https://codereview.chromium.org/2724183003 .
Cr-Commit-Position: refs/branch-heads/2987@{#740}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Update Google services personalization message for child accounts.
BUG=696664
Review-Url: https://codereview.chromium.org/2727663002
Cr-Commit-Position: refs/heads/master@{#453948}
(cherry picked from commit c7172cd2851a304d7c831cb23b3a7b3e3134e9d1)
Review-Url: https://codereview.chromium.org/2726823005 .
Cr-Commit-Position: refs/branch-heads/2987@{#739}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Incrementing VERSION to 57.0.2987.90
Cr-Commit-Position: refs/branch-heads/2987@{#738}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Fix "Android screen orientation lock should lock/unlock the same activity"
Branch build was broken by commit refs/branch-heads/2987@{#729} (61e8789e236b926389dd2a8ca9ad9cd19b391168)
that was merged in https://codereview.chromium.org/2721243003.
This patch fixes the compile error.
BUG=684497
[email protected]
[email protected]
Review-Url: https://codereview.chromium.org/2730683003 .
Cr-Commit-Position: refs/branch-heads/2987@{#737}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Files app: Work around the issue about opening menus by keeping references to <hr>s.
Files app's settings menu uses cr.ui.Menu, and <hr>s in the menu needs to be
decorated by cr.ui.MenuItem. However, in some cases, the <hr>s can lose the
decorated functions for some reason (suspected that it's by GC for <hr> wrappers).
This behavior be worked around by explicitly keeping reference to those <hr>s.
BUG=689255
TEST=confirmed 300+ trials of repro step did not reproduce the issue. It reproduced around 10% without the patch.
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation
[email protected]
Review-Url: https://codereview.chromium.org/2712403003
Cr-Commit-Position: refs/heads/master@{#453557}
(cherry picked from commit 3bc177a7e5b7d15e6635613373ac316263576150)
Review-Url: https://codereview.chromium.org/2728573003 .
Cr-Commit-Position: refs/branch-heads/2987@{#736}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Incrementing VERSION to 57.0.2987.89
Cr-Commit-Position: refs/branch-heads/2987@{#735}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
[Re-Merge 57] Remove redundant separator at end of the spelling correction context menu
In some editing cases (reporting a issue) inspect is not the last item.
BUG=695800
Review-Url: https://codereview.chromium.org/2713333002
Cr-Commit-Position: refs/heads/master@{#453565}
(cherry picked from commit 0f26be86266baa146ff07b69aace687393d8fc36)
Review-Url: https://codereview.chromium.org/2724973002 .
Cr-Commit-Position: refs/branch-heads/2987@{#734}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Revert "Remove redundant separator at end of the spelling correction context menu"
The merge was incorrect, breaking compile. Will re-merge soon.
This reverts commit dc2bb753a4f87323a7d6473a6421d16f2e3da769.
BUG=697621, 695800
[email protected]
Review-Url: https://codereview.chromium.org/2722143003 .
Cr-Commit-Position: refs/branch-heads/2987@{#733}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Merge M57: Update welcome page URL to new format.
BUG=695647
TEST=install Chrome, verify welcome page loads correctly.
Review-Url: https://codereview.chromium.org/2710333002
Cr-Commit-Position: refs/heads/master@{#453511}
(cherry picked from commit 896dcfde5fc56946c1fc84931d9bfdf6b627241f)
Review-Url: https://codereview.chromium.org/2725973002 .
Cr-Commit-Position: refs/branch-heads/2987@{#732}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Ignore asynchronous tasks after closing payment request
BUG=696933
Review-Url: https://codereview.chromium.org/2722963003
Cr-Commit-Position: refs/heads/master@{#454017}
(cherry picked from commit 894e52cdd03c7d9c753892d98029e492236bed36)
Review-Url: https://codereview.chromium.org/2722303002 .
Cr-Commit-Position: refs/branch-heads/2987@{#731}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Remove redundant separator at end of the spelling correction context menu
In some editing cases (reporting a issue) inspect is not the last item.
Review URL: https://codereview.chromium.org/2713333002
BUG=695800
NOTRY=true
NOPRESUBMIT=true
(cherry picked from commit 0f26be86266baa146ff07b69aace687393d8fc36)
Review-Url: https://codereview.chromium.org/2721343003
Cr-Commit-Position: refs/branch-heads/2987@{#730}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Android screen orientation lock should lock/unlock the same activity
Screen orientation lock used to lock/unlock the focused Activity, rather
than the Activity associated with the WebContents that triggered the
lock/unlock. If unlocking is triggered by a background WebContents, this
would result in the wrong Activity getting unlocked, and hence the
original Activity remaining in a permanently locked state!
This patch makes ScreenOrientationProvider always lock/unlock the
associated Activity, even if it's not the foreground one.
As well as a dedicated test (testUnlockWithDownloadViewerActivity in
VideoFullscreenOrientationLockChromeTest), some additional tests are
added to VideoFullscreenOrientationLockTest for cases that already
worked but didn't have test coverage.
And it fixes a null pointer exception that came up in Shell.java during some of the tests.
BUG=684497
Review-Url: https://codereview.chromium.org/2696303004
Cr-Commit-Position: refs/heads/master@{#453679}
(cherry picked from commit a2fe96582d0daf599ddcb5c4a655018de5c87755)
Review-Url: https://codereview.chromium.org/2721243003 .
Cr-Commit-Position: refs/branch-heads/2987@{#729}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Incrementing VERSION to 57.0.2987.88
Cr-Commit-Position: refs/branch-heads/2987@{#728}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Merge M57: "Notify WASAPIAudioOutputStream users of rendering errors."
Upstream tracks error information and uses it to determine if a stream
is acceptable for reuse. Rendering failures should cause the destruction
of the stream, not allow reuse.
BUG=695228
TEST=unplug/replug continues to work.
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Review-Url: https://codereview.chromium.org/2720433002
Cr-Commit-Position: refs/heads/master@{#453005}
(cherry picked from commit f1327bc594c83f73c44f83f1ac1b1ae63893487d)
Review-Url: https://codereview.chromium.org/2722053002 .
Cr-Commit-Position: refs/branch-heads/2987@{#727}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Remove the MessageLoop::DestructionObserver from mojo bindings.
Mojo connection error handlers running during browser shutdown have been
a cause of several crashes due to the error handlers running after their
dependency (e.g. a KeyedService or a RenderProcessHost) has shut down.
From a brief survey of users of StrongBinding, none appear to perform
any tear-down that is necessary during process shutdown. Further, the
vast majority of threads (and thread pools) run for close to the life of
the process, so any these connection error handlers will generally only
be triggered during shutdown. Thus, in production this causes slower,
less-stable browser shutdowns without any real benefit.
Additionally, SequencedTaskRunner does not have a MessageLoop and is not
expected to support a similar destruction observer. Thus, to improve
compatibility with future support for running mojo bindings on
SequencedTaskRunners, this removes MessageLoop::DestructionObserver from
mojo bindings.
BUG=678155
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Review-Url: https://codereview.chromium.org/2633053002
Cr-Commit-Position: refs/heads/master@{#447085}
(cherry picked from commit 14e09ca425d1ee9572f69d29cdd00cff1a1b2bfc)
Review-Url: https://codereview.chromium.org/2720403003 .
Cr-Commit-Position: refs/branch-heads/2987@{#726}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Chrome OS component updater: UpdateSeverity::LOW
Use UpdateSeverity::LOW icon for Flash updates.
TEST=test_that <ip> desktopui_FlashSanityCheck.download-omaha-component
See black arrow in grey instead of yellow circle.
BUG=688532
NOTRY=true
NOPRESUBMIT=true
Review-Url: https://codereview.chromium.org/2720613007
Cr-Commit-Position: refs/heads/master@{#453540}
(cherry picked from commit 2d0c679aff7cac0b26ca5c3652745db3393a817b)
Review-Url: https://codereview.chromium.org/2720383002
Cr-Commit-Position: refs/branch-heads/2987@{#725}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Incrementing VERSION to 57.0.2987.87
Cr-Commit-Position: refs/branch-heads/2987@{#724}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Make FrameView::dispose() not crash if the frame is already detached.
The underlying problem is that the FrameView disposal is being deferred,
so the Frame ends up getting detached before the FrameView is disposed.
However, this is crashing in M57, so make a simple bandaid fix for now.
BUG=672376
Review-Url: https://codereview.chromium.org/2720833004
Cr-Commit-Position: refs/heads/master@{#453347}
(cherry picked from commit fd36629d851e7d408130418f29b0e1f0f4b967ef)
Review-Url: https://codereview.chromium.org/2720343002 .
Cr-Commit-Position: refs/branch-heads/2987@{#723}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Make kbps optional when computing effective connection type
Make kbps optional when computing effective connection type since
the kbps is always available.
This change only affects GetRecentEffectiveConnectionType(), and not
GetEffectiveConnectionType(). The former is used only for recording
accuracy.
BUG=696616
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.android:android_cronet_tester
Review-Url: https://codereview.chromium.org/2717883002
Cr-Commit-Position: refs/heads/master@{#453394}
(cherry picked from commit 73f1a3b3440892c277003ef73862420592b93ab6)
Review-Url: https://codereview.chromium.org/2719993006 .
Cr-Commit-Position: refs/branch-heads/2987@{#722}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Cherry-pick 6af23a933a0d from Crashpad.
6af23a933a0d Use best-effort allocation in
ProcessInfo::BuildHandleVector
BUG=683158
Review-Url: https://codereview.chromium.org/2688583002
Cr-Commit-Position: refs/heads/master@{#449103}
(cherry picked from commit f161e046ad6ce06ba97c78b9c0618e4bb863eb80)
Change-Id: I2b1160c21c5f4668d8625a709fbc0ab1935927f6
Review-Url: https://codereview.chromium.org/2720903004 .
Cr-Commit-Position: refs/branch-heads/2987@{#721}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
[Webview, Child Accounts] Correct whitelisted package for signin.
The whitelisted package in https://codereview.chromium.org/2713513004
was wrong. Correct it.
BUG=695048
Review-Url: https://codereview.chromium.org/2721563004
Cr-Commit-Position: refs/heads/master@{#453658}
(cherry picked from commit f6540d645e081de0da1c98957e1fdf0f82e091aa)
Review-Url: https://codereview.chromium.org/2723633003 .
Cr-Commit-Position: refs/branch-heads/2987@{#720}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
[Webview, Child Accounts] Always allow Google Play Services to show the reauthentication page.
The reauthentication page is necessary to fix account issues e.g. after
a password change. The whitelisting is only for accounts.google.com
and only if the calling package is the Google Play Services UI.
BUG=695048
Review-Url: https://codereview.chromium.org/2713513004
Cr-Commit-Position: refs/heads/master@{#452528}
(cherry picked from commit 47c6658e306effae6981843a7352972048e7c7ef)
Review-Url: https://codereview.chromium.org/2718403002 .
Cr-Commit-Position: refs/branch-heads/2987@{#719}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Merge M57: Update Flash plugin metadata versions to latest version.
https://helpx.adobe.com/security/products/flash-player/apsb17-04.html
BUG=412078
CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation
Review-Url: https://codereview.chromium.org/2692933003
Cr-Commit-Position: refs/heads/master@{#450408}
(cherry picked from commit 6e04321f7bab55671c1a0d4a60e298524b1b6ead)
Review-Url: https://codereview.chromium.org/2726653002 .
Cr-Commit-Position: refs/branch-heads/2987@{#718}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Do not show pinned tabs on multiple instances
BUG=691781
Review-Url: https://codereview.chromium.org/2709393006
Cr-Commit-Position: refs/heads/master@{#453294}
(cherry picked from commit 4349089ebb28a0509a0fc20af83c9a2c0912c3ed)
Review-Url: https://codereview.chromium.org/2719383002 .
Cr-Commit-Position: refs/branch-heads/2987@{#717}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Incrementing VERSION to 57.0.2987.86
Cr-Commit-Position: refs/branch-heads/2987@{#716}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
call UnmapViewOfFile if the context failed
BUG=693124
Review-Url: https://codereview.chromium.org/2715823002
Cr-Commit-Position: refs/heads/master@{#452825}
(cherry picked from commit ad02b4ef8f2fcb669de0e32f7e30edf998f859b9)
Review-Url: https://codereview.chromium.org/2719853007 .
Cr-Commit-Position: refs/branch-heads/2987@{#715}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Fix Missing PSL Info Tooltip on Android 4.4 and below
This change fixes an issue with the display of the PSL Info Tooltip for Android
versions 4.4 and below.
[email protected],[email protected]
[email protected]
BUG=693076
Review-Url: https://codereview.chromium.org/2702383004
Cr-Commit-Position: refs/heads/master@{#452421}
(cherry picked from commit 0dacf44e4d7c806b7d7c6ae1db4f5b344f75aa55)
Review-Url: https://codereview.chromium.org/2726483003 .
Cr-Commit-Position: refs/branch-heads/2987@{#714}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
[Reading List] Check web state after the distillation delay.
It is possible that the web state has been released before the timeout
of the timer.
If this is the case, it means that the distillation was aborted.
Early return in that case.
There is no Cancelable delayed task. As the current situation is simple (only one
task is running at a time), store the ID of the task, and increment it when cancelling.
This is inspired by RunIfNotCanceled, but adapted to this much simpler situation.
Check the current ID when the task runs. If the ID was incremented, the task is cancelled.
BUG=695493
Review-Url: https://codereview.chromium.org/2717483003
Cr-Commit-Position: refs/heads/master@{#452540}
(cherry picked from commit d7e66510bedbf95d90337071155f8b07036cb002)
Review-Url: https://codereview.chromium.org/2724583002 .
Cr-Commit-Position: refs/branch-heads/2987@{#713}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Manually revert merge changes to a test file that don't compile.
https://codereview.chromium.org/2706953002 cherry picked a CL that had
test changes depending on multiple other CLs. Manually fixing this on
a merge branch is difficult, instead the test changes are being removed.
NOTRY=true
NOPRESUBMIT=true
BUG=696388
Review-Url: https://codereview.chromium.org/2721843003
Cr-Commit-Position: refs/branch-heads/2987@{#712}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
Report built_in_version to Omaha for Flash updates.
Report the built in Flash version to Omaha server for Flash updates, to
prevent a stale component update from being delivered.
BUG=695654
Review-Url: https://codereview.chromium.org/2711593006
Cr-Commit-Position: refs/heads/master@{#452919}
(cherry picked from commit 421c3a3a8e73cf590f69624b15e8187a0ec413ba)
Review-Url: https://codereview.chromium.org/2724523002 .
Cr-Commit-Position: refs/branch-heads/2987@{#711}
Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943}
