Publish DEPS for Chromium 47.0.2526.69
Incrementing VERSION to 47.0.2526.69
Cr-Commit-Position: refs/branch-heads/2526@{#456}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Merge M47: Update Flash plugin metadata versions to latest version.
https://helpx.adobe.com/security/products/flash-player/apsb15-28.html
BUG=412078
[email protected]
Review URL: https://codereview.chromium.org/1458853003
Cr-Commit-Position: refs/heads/master@{#360371}
(cherry picked from commit 8dd71df302440688917462a92d8c6528f04e02a4)
Review URL: https://codereview.chromium.org/1461853002.
Cr-Commit-Position: refs/branch-heads/2526@{#455}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Updating XTBs based on .GRDs from branch 2526
Cr-Commit-Position: refs/branch-heads/2526@{#454}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Merge to M47: "kiosk: Flush installed app files and cached crx"
> So that they don't get corrupted after unclean shutdown.
> - Update UseSafeInstallation to enable flush in kiosk mode;
> - Added a |flush_on_put_| bool to ExternalCache and make it
> flush cached crx when the bool is set;
> - Update KioskAppManager to set the bool flag when
> initializing its ExternalCache;
>
> BUG=555220
>
> Review URL: https://codereview.chromium.org/1448723002
>
> Cr-Commit-Position: refs/heads/master@{#360142}
> (cherry picked from commit 8ed1dda1b6102aaeb8320bd58963a8b4c39ba756)
>
> Review URL: https://codereview.chromium.org/1462463003
>
> Cr-Commit-Position: refs/heads/master@{#360420}
> (cherry picked from commit 2dcf0d1707d1029743635f419c0ca45ef6737dcd)
[email protected]
Review URL: https://codereview.chromium.org/1457103003 .
Cr-Commit-Position: refs/branch-heads/2526@{#453}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
manual merge test
Only proceed HTTP auth interstitial if it's still valid
This is the alternative approach to https://codereview.chromium.org/1399623005/
BUG=540949
Review URL: https://codereview.chromium.org/1416543004
Cr-Commit-Position: refs/heads/master@{#359879}
(cherry picked from commit 99ebf5f38be84b3eba0a56098d704a1c832d7015)
Review URL: https://codereview.chromium.org/1454983005 .
Cr-Commit-Position: refs/branch-heads/2526@{#452}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Revert "Remove obsolete LTR scrollbar padding hack."
Breaks caret rendering at rightmost edge of some situations.
This reverts commit 5fdc15a7ec5c12ea3a708796c8cb3338c474f0fa.
BUG=548596,523969
TBR=chrishtr
Review URL: https://codereview.chromium.org/1451103005
Cr-Commit-Position: refs/heads/master@{#360247}
(cherry picked from commit 4a57b23cb4eb0a97fa04a7e11c97d5f0b6c15896)
Review URL: https://codereview.chromium.org/1457043002 .
Cr-Commit-Position: refs/branch-heads/2526@{#451}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
cc/ipc: Add missing entry in the IPC struct for cc::CompositorFrameMetadata.
BUG=538332
Review URL: https://codereview.chromium.org/1406283012
Cr-Commit-Position: refs/heads/master@{#356333}
(cherry picked from commit c8a4fd86621240299e6b16afd2ea70251fe970ff)
Review URL: https://codereview.chromium.org/1459633002 .
Cr-Commit-Position: refs/branch-heads/2526@{#450}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Cancel HTTP Auth interstitial on page initiated cross-origin redirects.
Chrome displays HTTP Auth dialogs over a blank interstitial if the navigation
was initiated by a page (i.e. redirected) and the auth origin is different than
the page origin. This interstitial is cancelled when the user cancels the auth
dialog, but it's not cancelled if the dialog is cancelled by another redirect
initiated by the page.
This CL ensures that if a redirect closes the auth dialog, the interstitial is
cancelled as well.
BUG=533778
Review URL: https://codereview.chromium.org/1376983003
Cr-Commit-Position: refs/heads/master@{#356079}
(cherry picked from commit 228a90a790692c23fe4994c638529c70c88b8b72)
Review URL: https://codereview.chromium.org/1456873002 .
Cr-Commit-Position: refs/branch-heads/2526@{#449}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Block javascript: document navigations during page dismissal events.
This basically reflects the logic from FrameLoader::startLoad. Before this patch, javascript: document navigations could be performed during page dismissal events. This could be problematic, especially that dismissal events prevent loaders from being stopped or detached.
This patch adds a bail-out condition to FrameLoader::replaceDocumentWhileExecutingJavaScriptURL.
BUG=556724
Review URL: https://codereview.chromium.org/1451123002
Cr-Commit-Position: refs/heads/master@{#360242}
(cherry picked from commit e6fabc430b0f6a52dacc47860d66da09c79c310b)
Review URL: https://codereview.chromium.org/1461503002 .
Cr-Commit-Position: refs/branch-heads/2526@{#448}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Only set nil serialized state for history.pushState() navigations.
Setting it for every navigation triggered |-webPageChanged|, which
pruned forward entries in the navigation stack.
BUG=557221
Review URL: https://codereview.chromium.org/1459483002
Cr-Commit-Position: refs/heads/master@{#360238}
(cherry picked from commit dc3d2f04349e0bc143f5689bc08fd80922ec6f9a)
Review URL: https://codereview.chromium.org/1457543005 .
Cr-Commit-Position: refs/branch-heads/2526@{#447}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Incrementing VERSION to 47.0.2526.68
Cr-Commit-Position: refs/branch-heads/2526@{#446}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Revert "Manual merge - Only proceed HTTP auth interstitial if it's still valid"
This reverts commit ab012cca8a73afd4e572e1368dbff3385d571dd4.
BUG=540949
Review URL: https://codereview.chromium.org/1450283003 .
Cr-Commit-Position: refs/branch-heads/2526@{#445}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Add locks to Partitions' init and shutdown
Otherwise, a thread could call allocation functions (e.g. fastMalloc) in the middle of initialization/shutdown.
Also, we shouldn't decommit pages when Partitions are not initialized.
BUG=514141
Review URL: https://codereview.chromium.org/1436733002
Cr-Commit-Position: refs/heads/master@{#359552}
(cherry picked from commit 230a91a0b79577d3bb903e39bbadacd4af098bff)
Review URL: https://codereview.chromium.org/1447343003 .
Cr-Commit-Position: refs/branch-heads/2526@{#444}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Don't allow navigations in Document::detach.
When navigating to a javascript: URL, Blink detaches the original
Document. This process may detach plugin elements, causing a nested
message loop to run.
Document::detach() creates a ScriptForbiddenScope to prevent script from
breaking invariants. Since plugins were detached synchronously, any
script trying to execute in the nested message loop would be blocked.
However, the fix for https://crbug.com/524120 defers plugin updates to
happen outside the ScriptForbiddenScope. Thus, it is now possible to
attach a *new* Document with a synchronous navigation while the old
Document is being detached.
BUG=546545
Review URL: https://codereview.chromium.org/1444183003
Cr-Commit-Position: refs/heads/master@{#360190}
(cherry picked from commit 66ad73d642b9cf824f4b1f300811ed1ee6963da7)
Review URL: https://codereview.chromium.org/1458643003 .
Cr-Commit-Position: refs/branch-heads/2526@{#443}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Manual merge - Only proceed HTTP auth interstitial if it's still valid
This is the alternative approach to https://codereview.chromium.org/1399623005/
BUG=540949
Review URL: https://codereview.chromium.org/1416543004
Cr-Commit-Position: refs/heads/master@{#359879}
(cherry picked from commit 99ebf5f38be84b3eba0a56098d704a1c832d7015)
Review URL: https://codereview.chromium.org/1460543002 .
Cr-Commit-Position: refs/branch-heads/2526@{#442}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Revert "Only proceed HTTP auth interstitial if it's still valid"
This reverts commit e712ef16f6e37331fa9e1fcf41ef0f73b2753808.
BUG=540949
Review URL: https://codereview.chromium.org/1457653002 .
Cr-Commit-Position: refs/branch-heads/2526@{#441}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Only proceed HTTP auth interstitial if it's still valid
This is the alternative approach to https://codereview.chromium.org/1399623005/
BUG=540949
Review URL: https://codereview.chromium.org/1416543004
Cr-Commit-Position: refs/heads/master@{#359879}
(cherry picked from commit 99ebf5f38be84b3eba0a56098d704a1c832d7015)
Review URL: https://codereview.chromium.org/1453313002 .
Cr-Commit-Position: refs/branch-heads/2526@{#440}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Disables JavaScript window.scrollTo() calls during user scroll.
Since JavaScript can execute asynchronously, during user scroll it would
appear as "user interaction" and calls to window.scrollTo() can cause
Chrome to go into full screen and hide the omnibox toolbar.
BUG=554257
Review URL: https://codereview.chromium.org/1444523005
Cr-Commit-Position: refs/heads/master@{#359692}
(cherry picked from commit f090890d622ea6aacffb630ae093458affb71d1c)
Review URL: https://codereview.chromium.org/1452903005 .
Cr-Commit-Position: refs/branch-heads/2526@{#439}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Merge to M47: Erase BrowserAccessibilityManager from global map on destruction.
I introduced g_ax_tree_id_map in r342251 to keep track of
BrowserAccessibilityManager objects by ID, but forgot to remove
them from the map on destruction, leading to possible crashes.
BUG=368298
Review URL: https://codereview.chromium.org/1415943003
Cr-Commit-Position: refs/heads/master@{#356940}
(cherry picked from commit f1f375001a723cbb5af0970047b9dfb12f553b3f)
Review URL: https://codereview.chromium.org/1449343002 .
Cr-Commit-Position: refs/branch-heads/2526@{#438}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Merge to M47: Fix accessibility support for Mac OS X 10.11 "El Capitan"
In OS X 10.11, VoiceOver makes heavier use of AXUIElementsForSearchPredicate,
and our implementation wasn't quite right:
The algorithm should depend on the node the query is called on, in addition
to the (optional) start node. Results should only be siblings of the
node the query is called on, or descendants. If the immediate descendants
only flag is set, it should return only children of the node the query was
called on - the start node isn't the parent, it's the position within the
children to start with.
BUG=546330,530824
Review URL: https://codereview.chromium.org/1409043002
Plus: Don't crash if start node is set to null explicitly.
Review URL: https://codereview.chromium.org/1419963006
Cr-Commit-Position: refs/heads/master@{#354629}
(cherry picked from commit 249d06319dae095b7cc5fbd6ffd37a2e83083838)
Review URL: https://codereview.chromium.org/1453653002 .
Cr-Commit-Position: refs/branch-heads/2526@{#437}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Add more archive file extensions to safebrowsing download protection.
BUG=551713
Review URL: https://codereview.chromium.org/1438643002
Cr-Commit-Position: refs/heads/master@{#359272}
(cherry picked from commit 25d4331c462f682c620e4137e2f3a589b066b098)
Review URL: https://codereview.chromium.org/1445273003 .
Cr-Commit-Position: refs/branch-heads/2526@{#436}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Refresh Public Suffic List to the latest version
This updates from revision
509db00ef21795e58bfc2c576cebf72c8ee7a6f9 (2015-09-24)
to revision
edf1735751c24e736018dc51f1be7dea686b6304 (2015-11-12)
[email protected]
BUG=37436
Review URL: https://codereview.chromium.org/1442623003
Cr-Commit-Position: refs/heads/master@{#359496}
(cherry picked from commit fcad8fd543f6672c4ac47c4fc6b5ab4703bfa244)
Review URL: https://codereview.chromium.org/1451223002 .
Cr-Commit-Position: refs/branch-heads/2526@{#435}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Incrementing VERSION to 47.0.2526.67
Cr-Commit-Position: refs/branch-heads/2526@{#434}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
profile_shortcut_manager_win: Bump version to 4.
This forces badged profile icons to be regenerated with the new MD
version of the Chrome logo. Also added README to instruct people to
update this constant in the future.
BUG=548976
Review URL: https://codereview.chromium.org/1408183005
Cr-Commit-Position: refs/heads/master@{#358560}
(cherry picked from commit d12dd6b148981a61cf6a41b2ffac766201ffe5e6)
Review URL: https://codereview.chromium.org/1447293002 .
Cr-Commit-Position: refs/branch-heads/2526@{#433}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Always set the state object for history navigations.
The JavaScript popstate event is expected to fire for all history
navigations, regardless of whether there is actually state associated
with the navigation.
BUG=552613
Review URL: https://codereview.chromium.org/1443483002
Cr-Original-Commit-Position: refs/heads/master@{#359719}
Cr-Commit-Position: refs/branch-heads/2526@{#432}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Updating XTBs based on .GRDs from branch 2526
Cr-Commit-Position: refs/branch-heads/2526@{#431}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Save-Page-As-Complete-Html: Fixing how links are rewritten in subframes (M47 fix).
This CL fixes how links are rewritten in subframes, by tweaking how
WebPageSerializerImpl.cpp decides whether to include the directory name
in links it rewrites to local paths. (only links rewritten for the main
frame should include the "directory" part).
Rewriting of links in subframes has regressed in crrev.com/1320453004 [1],
which stopped using "recursive" serialization mode of WebPageSerializerImpl.
In "recursive" serialization mode only the main frame would use a
non-empty directory name in WebPageSerializerImpl::serialize [2].
Note that crrev.com/1320453004 has initially landed in 47.0.2522.0.
The fix for M48 is in crrev.com/1442733002, but the fix is difficult to
merge into M47 (because of the amount of serialization-related changes
that happened during M48). Reverting the CL that introduced the
regression is an option, but seems more complicated (see
crrev.com/1442753006 and crrev.com/1447493002) than a targeted,
M47-specific fix being proposed by the current CL.
Tests done against a private build that included the CL:
Manual test verifying that the regression is fixed:
1. Building chrome from M47 branch before / after this CL
2. Testing save-page-as-complete-html against
http://anforowicz.github.io/nested-frames/index.htm
3. Verifying that
- Before the CL:
- The "second level of nesting" frame is gone.
- The image in "first level of nesting" frame is gone
- After the CL:
- The "second level of nesting" frame is present.
- The image in "first level of nesting" frame is present
Automated regression tests:
- webkit_unit_tests (all tests passed)
- content_browsertests
- 1 failing test:
RenderViewImplTest.GetCompositionCharacterBoundsTest
- I've verified that this test also fails without this CL - i.e. when
building and running tests directly from the release branch:
$ git checkout tags/47.0.2526.58
$ ninja ... content_browsertests
$ out/gn/content_browsertests \
--gtest_filter=*RenderViewImplTest.GetCompositionCharacterBoundsTest*
- browser_tests
- 4 failing and 1 timing out tests during initial run:
AppListServiceImplBrowserTest.DeletingProfileUpdatesViewDelegate
PreservedWindowPlacement.Test
ProfileManagerBrowserTest.EphemeralProfile
SearchProviderTest.TestIsSearchProviderInstalled
SyncFileSystemTest.AuthorizationTest
- The first 3 tests fail also without this CL.
- The remaining 2 tests succeed when rerun (with --gtest_repeat=10).
[1] See in crrev.com/1320453004/patch/180001/190008 how
WebPageSerializer::serialize is called.
[2] https://chromium.googlesource.com/chromium/src/+/11d41626fbe8e88fb507371df3beda99fce268a1/third_party/WebKit/Source/web/WebPageSerializerImpl.cpp#504
BUG=554666
[email protected]
Review URL: https://codereview.chromium.org/1443103002 .
Cr-Commit-Position: refs/branch-heads/2526@{#430}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
DevTools: Fix timeline recording dialog layout when window is too narrow.
BUG=537083
Review URL: https://codereview.chromium.org/1406343010
Cr-Commit-Position: refs/heads/master@{#358000}
(cherry picked from commit 3c4aa4df2d541c1c9571c18c1db3f266b8f653f6)
Review URL: https://codereview.chromium.org/1445243002 .
Cr-Commit-Position: refs/branch-heads/2526@{#429}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
[Merge M47] Merge 1409063007.
TBR=chrisha
BUG=555691
Review URL: https://codereview.chromium.org/1446373002 .
Cr-Commit-Position: refs/branch-heads/2526@{#428}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Fix VisualElementsManifest after https://codereview.chromium.org/1441463002
Sadness. :(
[email protected], [email protected]
BUG=554439
Review URL: https://codereview.chromium.org/1443003005
Cr-Commit-Position: refs/heads/master@{#359720}
(cherry picked from commit 9f85139a2abb13b0e65c388e2ed63bd70a939274)
Review URL: https://codereview.chromium.org/1449873004 .
Cr-Commit-Position: refs/branch-heads/2526@{#427}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Fix small tile icon disappearing on Win10 10586
My best guess is that TH2 breaks the Metro path for VisualManifest for
small icons (which is what we were using). Switching to the other
(newer?) format seems to work.
I'm not sure if this means that the Metro tile on maybe plain Win8 will
be broken though. Any thoughts?
Also, updated to new "flat" icons for the tiles (they're already in the
icon resources, but we missed the tiles in the previous update I think).
[email protected]
BUG=554439, 517654
Review URL: https://codereview.chromium.org/1441463002
Cr-Commit-Position: refs/heads/master@{#359345}
(cherry picked from commit 63a8d3b86b0f45d7c99c85ae57f45ba208254680)
Review URL: https://codereview.chromium.org/1453443003 .
Cr-Commit-Position: refs/branch-heads/2526@{#426}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
QUIC - Check for empty active_sessions_ std::map before calling find.
Work around fix for Android top crasher to see if it fixes the memory
corruption issue (and release blocker bug).
BUG=498823
[email protected]
Review URL: https://codereview.chromium.org/1415933010
Cr-Commit-Position: refs/heads/master@{#358794}
(cherry picked from commit aac340f2a4b931f1a0912e9403aca89a3744c450)
Review URL: https://codereview.chromium.org/1446353002 .
Cr-Commit-Position: refs/branch-heads/2526@{#425}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Don't make assumptions about the concrete Value types in the prune state pref dict.
BUG=555538
[email protected]
Review URL: https://codereview.chromium.org/1443593003
Cr-Commit-Position: refs/heads/master@{#359570}
(cherry picked from commit 434ee92d18150367fcd9467bbee6471ac0ba5d2f)
[email protected]
Review URL: https://codereview.chromium.org/1447093002 .
Cr-Commit-Position: refs/branch-heads/2526@{#424}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Fix a toolbar drawing issue when switching in the tab switcher.
After merging the draw logic for the NTP scroll and url expansion
animations, the reset NTP animation logic did not get updated to
reset the merged value.
BUG=548088
Review URL: https://codereview.chromium.org/1433063004
Cr-Commit-Position: refs/heads/master@{#359598}
Review URL: https://codereview.chromium.org/1445173002 .
Cr-Commit-Position: refs/branch-heads/2526@{#423}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Look for Chrome's Start Menu shortcut in the Programs folder.
BUG=169669
[email protected]
Review URL: https://codereview.chromium.org/1438793002
Cr-Commit-Position: refs/heads/master@{#359322}
(cherry picked from commit 2be0cd08ba1d3074d1af5924b99503981a910d75)
[email protected]
Review URL: https://codereview.chromium.org/1451803002 .
Cr-Commit-Position: refs/branch-heads/2526@{#422}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
[ContextualSearch] Add close button to list of actions that shouldPreventHandlingCurrentSelectionModification
If the panel is dismissed due to the user clicking the close button,
a selection modification on the current selection should not cause the
panel to reappear.
BUG=555775
[email protected]
Review URL: https://codereview.chromium.org/1442353002
Cr-Commit-Position: refs/heads/master@{#359718}
Review URL: https://codereview.chromium.org/1447083002 .
Cr-Commit-Position: refs/branch-heads/2526@{#421}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Increase new content rendering timeout
Due to the Mac graphics bug 537296, when the rendering timeout fires
on Mac it causes graphic artifacts to appear instead of a white screen.
When it occasionally fires simply because the initial rendering of a
page is taking too long, this causes a brief display of the wrong
content before the correct compositor frame arrives.
This CL extends the timeout from 2 seconds to 4, which we hope will prevent
the effects of bug 537296 from manifesting to users, or at least significantly reduce its prevalence, while not
compromising the purpose of the timeout. The display bug will still need to be fixed independently to properly deal with the problem.
BUG=540653
[email protected]
Review URL: https://codereview.chromium.org/1416673002
Cr-Commit-Position: refs/heads/master@{#354798}
(cherry picked from commit 00bb4a294d0c4f567dfa60b3222b00a428e63907)
Review URL: https://codereview.chromium.org/1445103002 .
Cr-Commit-Position: refs/branch-heads/2526@{#420}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Forget about pending prompts if prompt seed has changed.
BUG=555756
Review URL: https://codereview.chromium.org/1447763002
Cr-Commit-Position: refs/heads/master@{#359697}
(cherry picked from commit d6f9f5cbb0deda31a5464bc38768b69edf946abd)
Review URL: https://codereview.chromium.org/1444363003 .
Cr-Commit-Position: refs/branch-heads/2526@{#419}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Incrementing VERSION to 47.0.2526.66
Cr-Commit-Position: refs/branch-heads/2526@{#418}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Incrementing VERSION to 47.0.2526.65
Cr-Commit-Position: refs/branch-heads/2526@{#417}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Correct UseCounter::FormNameAccessForImageElement.
It seems the counter didn't cover form.imageName case.
BUG=555387
[email protected], [email protected]
Review URL: https://codereview.chromium.org/1444533002 .
Cr-Commit-Position: refs/heads/master@{#359517}
(cherry picked from commit 075928d082925a6fa76e8c1c3f49efa2b561ebf3)
Review URL: https://codereview.chromium.org/1442853008 .
Cr-Commit-Position: refs/branch-heads/2526@{#416}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Make --disable-gesture-requirement-for-media-playback available on all platforms
On non-Android systems, use the switch to allow media playback even
if the tab is not the foreground tab. With the recent power-saving
changes, media playback can be disabled for background tabs.
This will be used in the MSE and EME browser_tests so that the test
doesn't fail if the process is not in the foreground.
BUG=541361,544723
TEST=MSE and EME browser_tests pass
Review URL: https://codereview.chromium.org/1414533008
Cr-Commit-Position: refs/heads/master@{#359359}
(cherry picked from commit b125a7be15ab35b07f11bf252da1d52bf1a32e06)
Review URL: https://codereview.chromium.org/1447753003 .
Cr-Commit-Position: refs/branch-heads/2526@{#415}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Incrementing VERSION to 47.0.2526.64
Cr-Commit-Position: refs/branch-heads/2526@{#414}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Prevent guest views from issuing a search for empty text.
Do the same for Android webview.
Set up roadblocks along the way to prevent this from happening again.
BUG=535086
Review URL: https://codereview.chromium.org/1365563003
Cr-Commit-Position: refs/heads/master@{#359419}
(cherry picked from commit 6057a6b26a758d3542b9d74579e4e517b49244a9)
Review URL: https://codereview.chromium.org/1434313005 .
Cr-Commit-Position: refs/branch-heads/2526@{#413}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Change iOS JavaScript prompt methods to match JavaScript API
Currently, the JavaScript methods for handling the prompt dialog
refer to placeholder text, while standardized web API refers to default
text. This CL adjusts the method calls to match that specification.
BUG=549198
Review URL: https://codereview.chromium.org/1420303009
Cr-Commit-Position: refs/heads/master@{#357877}
(cherry picked from commit ec612ad6d7e96ee03102bed3ba9534efe6879370)
Review URL: https://codereview.chromium.org/1447713002 .
Cr-Commit-Position: refs/branch-heads/2526@{#412}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Fix crash when changing audio using keyboard controls.
This happened when the shelf was set to auto-hide and the audio is changed using
keyboard controls while inside the detail view of a system tray menu item.
BUG=545166
Review URL: https://codereview.chromium.org/1430273005
Cr-Commit-Position: refs/heads/master@{#359148}
(cherry picked from commit bcb8ba34dcc3cfa4872b9507b58b9418da303985)
Review URL: https://codereview.chromium.org/1436373003 .
Cr-Commit-Position: refs/branch-heads/2526@{#411}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Revert of [Android] Enhanced bookmark default mobile folder experiment. (patchset #1 id:1 of https://codereview.chromium.org/1425293009/ )
Reason for revert:
This CL had a bug that when experiment is turned on, it always forwards all bookmarks to mobile folder.
Original issue's description:
> [Android] Enhanced bookmark default mobile folder experiment.
>
> BUG=552508
>
> Committed: https://crrev.com/964c0baff2687c52a43935fafca4ee07790b047e
> Cr-Commit-Position: refs/heads/master@{#358441}
[email protected]
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=552508
Review URL: https://codereview.chromium.org/1445553003
Cr-Commit-Position: refs/heads/master@{#359599}
(cherry picked from commit 1a111a94db99f39773af78c4c3ad2b60ea21eeec)
Review URL: https://codereview.chromium.org/1443773002 .
Cr-Commit-Position: refs/branch-heads/2526@{#410}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Consolidate pending state in WKWebView, and include MIME type
Since not all loads (e.g., data URLs) have HTTP headers, and sometimes
HTTP header MIME type isn't as accurate as what WKWebView reports,
save the reported MIME type from the WKNavigationResponse and override
the header-determined value.
Rather than create yet another pending item to manage, consolidate all
pending items into a single state object that's driven from the
relevant WKWebView delegate callbacks.
TBR=eugenebut
BUG=553581
Review URL: https://codereview.chromium.org/1439393002
Cr-Commit-Position: refs/heads/master@{#359557}
(cherry picked from commit fbe3a1de6dcbc5103dc57a7f15a5682af119fa09)
Review URL: https://codereview.chromium.org/1442973003 .
Cr-Commit-Position: refs/branch-heads/2526@{#409}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
[ios] Update net::SSLInfo before presenting WKWebView SSL interstitial.
Update |cert_status| and |unverified_cert| fields.
BUG=554219
Review URL: https://codereview.chromium.org/1433173002
Cr-Commit-Position: refs/heads/master@{#359159}
(cherry picked from commit e48f3e59f5573a78bb81dfffcf3bd67bd667d8bd)
Review URL: https://codereview.chromium.org/1438043009 .
Cr-Commit-Position: refs/branch-heads/2526@{#408}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
[WKWebView] report CertVerifier and SecTrust verification mismatch.
SecTrust API is used for making load/no-load decision and CertVerifier
is used for getting the reason of verification failure. It is expected
that mismatch will happen for those 2 approaches (e.g. SecTrust API
considers cert as good, but CertVerifier considers same cert as bad).
This metric helps to understand how common mismatches are.
BUG=535699
Review URL: https://codereview.chromium.org/1430953003
Cr-Commit-Position: refs/heads/master@{#358241}
(cherry picked from commit 8aee55d61498f507e4f3331b92092a5a18e371c2)
Review URL: https://codereview.chromium.org/1438353003 .
Cr-Commit-Position: refs/branch-heads/2526@{#407}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
[ios] UMA metric to report cache hit/miss for WKWebView cert verification.
WKWebView Web Controller has a cache of pending cert verification
results to avoid extra verifications when presenting SSL interstitial.
This metric helps to understand whether or not cache miss is possible.
BUG=541736
Review URL: https://codereview.chromium.org/1414793014
Cr-Commit-Position: refs/heads/master@{#358240}
(cherry picked from commit 018d0db613993f7ec1b08eb0c7543e0111e242ed)
Review URL: https://codereview.chromium.org/1441403002 .
Cr-Commit-Position: refs/branch-heads/2526@{#406}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
[ios] Signal load cancelled after presenting SSL interstitial.
Without this change web/ never finishes the load after presenting an SSL
interstitial. Calling |loadCancelled| fixes the problem and it's the
same approach as done in UIWebView.
BUG=551585
Review URL: https://codereview.chromium.org/1434453009
Cr-Commit-Position: refs/heads/master@{#358111}
(cherry picked from commit 4cdef8fbd9a65b15ba20d62186ce9cea8a677138)
Review URL: https://codereview.chromium.org/1443083002 .
Cr-Commit-Position: refs/branch-heads/2526@{#405}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
[ios] Removed DCHECK which prevents WKProcessPool manual creation.
That DCHECK was originally added to:
1.) Prevent issues with WKWebView cookie clearing on iOS8 (not supported
by WKWebView anymore).
2.) Ensure correct Modal Data Partitioning (postponed work).
BUG=537244
Review URL: https://codereview.chromium.org/1427003003
Cr-Commit-Position: refs/heads/master@{#357123}
(cherry picked from commit 2de015203b33dfb0c040b0eaa4ce4c8fb52ade8a)
Review URL: https://codereview.chromium.org/1441383002 .
Cr-Commit-Position: refs/branch-heads/2526@{#404}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Use scoped_nsobject for fromEntry in CRWWebController goDelta
Fixes back/forward navigation from history by using scoped_nsobject
to retain fromEntry in -[CRWWebController goDelta:].
BUG=545479
Review URL: https://codereview.chromium.org/1421293004
Cr-Commit-Position: refs/heads/master@{#356677}
(cherry picked from commit e37d46f479c9bc9ae7ee3a811b1a2b0872f42b4e)
Review URL: https://codereview.chromium.org/1439313004 .
Cr-Commit-Position: refs/branch-heads/2526@{#403}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Always call didReceiveAuthenticationChallenge: completion handler.
iOS throws an exception (which leads to a crash) if didReceiveAuthenticationChallenge:
completion handler is deallocated but never called. Crash was happening
because CertVerifierBlockAdapter did not call its completion handler
if CertVerifierAdapter was destroyed during cert verification (may
happen when Tab is closed during the load).
Changed CertVerifierBlockAdapter to always call its Verify completion
handler by making net::CertVerifier::Request non-cancelable, so each
verification request will complete.
This change does not extend a lifetime of WKWebView (retaining its completion handler
does not retain WKWebView itself).
BUG=541484
Review URL: https://codereview.chromium.org/1392143003
Cr-Commit-Position: refs/heads/master@{#357014}
(cherry picked from commit bb8be86f212df820a44993f270414d459da3964c)
Review URL: https://codereview.chromium.org/1442013003 .
Cr-Commit-Position: refs/branch-heads/2526@{#402}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
WKWebView: Implemented recoverable SSL interstitials.
Load decision is made inside didReceiveAuthenticationChallenge: and
for recoverable errors cached user decision is read from CertPolicyCache.
That method is called for good and bad certs as long as request is not
served from caches. This method allows accepting bad certs.
SSL Interstitial is presented inside didFailProvisionalNavigation: which
is called when top level frame has bad ssl cert and default behavior
was not overridden inside didReceiveAuthenticationChallenge.
CertStatus is evaluated inside didReceiveAuthenticationChallenge and
its status is cached so it can be reused inside
didFailProvisionalNavigation. It is not possible to re-evaluate cert
inside didFailProvisionalNavigation because that callback does not
provide complete cert chain.
BUG=462427
Review URL: https://codereview.chromium.org/1357773002
Cr-Commit-Position: refs/heads/master@{#357018}
(cherry picked from commit 4e0758a248f23e4cc60465431a013a532ea96c89)
Review URL: https://codereview.chromium.org/1443053002 .
Cr-Commit-Position: refs/branch-heads/2526@{#401}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
WKWebView(iOS9): correctly update SSL status for current navigation item
SSL status affects the color of SSL padlock and OIB content. Previously
the code was written with the assumption that WKWebView can not load a
page with invalid SSL cert (which was always true on iOS 8). With iOS 9
it is possible to load pages with invalid cert. This CL adds support for
correct SSL status calculation.
This is precursory CL for implementing recoverable SSL warnings.
BUG=462427, 528668
Design Doc:
https://docs.google.com/document/d/1o8wzJkxzG1fvhvW9Gqf-RdGjhm0btCIehDtbxDfbLcw/edit#
Review URL: https://codereview.chromium.org/1322193003
Cr-Commit-Position: refs/heads/master@{#354575}
(cherry picked from commit 8ac2913b9c37a0a310ed152dc6be9f60e72d1f2b)
Review URL: https://codereview.chromium.org/1442073002 .
Cr-Commit-Position: refs/branch-heads/2526@{#400}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
WKWebView: Error pages for SSL errors w/o cert.
For loads which failed with SSL error, but don't have cert show error
page. For loads failed with SSL error with cert keep showing SSL
interstitial.
BUG=531765
TEST=
1.) https://dh480.badssl.com/ fails with SSL error
2.) https://ssl-cert.org/ shows interstitial
Review URL: https://codereview.chromium.org/1382653003
Cr-Commit-Position: refs/heads/master@{#352532}
(cherry picked from commit 27d10dd23e8bef350f7c2967a2241e5fc6943eef)
Review URL: https://codereview.chromium.org/1440283003 .
Cr-Commit-Position: refs/branch-heads/2526@{#399}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
WKWebView: adopted CRWWKScriptMessageRouter in Web Controller.
WKWebView does not inject scripts for child windows if default
userContentController is overriden. Using CRWWKScriptMessageRouter
allows to keep default userContentController but still routes scripts
messages correctly.
This is essentially a revert of:
https://chromereviews.googleplex.com/175077013/
BUG=539960
Review URL: https://codereview.chromium.org/1393803006
Cr-Commit-Position: refs/heads/master@{#354398}
(cherry picked from commit 26c9704d15300deb88144bab28e5bea5b2b8b7b2)
Review URL: https://codereview.chromium.org/1441793003 .
Cr-Commit-Position: refs/branch-heads/2526@{#398}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Merge to M47: Files, Gallery: add scrollbar to share dialog.
BUG=544041
TEST=manually tested as described in the issue.
Review URL: https://codereview.chromium.org/1433133002
Cr-Commit-Position: refs/heads/master@{#359063}
(cherry picked from commit 4ef652b6165fe9e51fd75fa73ee3b25c1d048a1f)
[email protected]
Review URL: https://codereview.chromium.org/1439963003 .
Cr-Commit-Position: refs/branch-heads/2526@{#397}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Merge to M47: Gallery: do not hide tools when user is renaming an image.
The original CL for this is crrev.com/1435783002. But we made
significant amount of changes to DimmableUIController in M48, we cannot
simply merge the CL.
This CL is written for fixing the issue on M47 based on
crrev.com/1435783002.
BUG=553944
TEST=manually tested as described in issue.
NOTRY=true
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/1439553002
Cr-Commit-Position: refs/branch-heads/2526@{#396}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Merge to M47: Files: set default task with mime types.
selection.mimeTypes can be empty in Downloads since
FileSystemMetadataProvider becomes not to support contentMimeType.
We collect mime types before setting default task.
BUG=554760
TEST=manually tested
Review URL: https://codereview.chromium.org/1439923002
Cr-Commit-Position: refs/heads/master@{#359259}
(cherry picked from commit b526cff385dff4f5f198e13daa9ebfc7375b8813)
[email protected]
Review URL: https://codereview.chromium.org/1443553002 .
Cr-Commit-Position: refs/branch-heads/2526@{#395}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Incrementing VERSION to 47.0.2526.63
Cr-Commit-Position: refs/branch-heads/2526@{#394}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Merge 'enable MB for the 'precise64' bot ..' change back to 2526.
This merges the MB config change back so that the new
'official.desktop' master will still build 'precise64' w/ GYP
on the 2526 (M46) branch while building w/ GN on trunk.
[email protected]
BUG=554999
Review URL: https://codereview.chromium.org/1441073003 .
Cr-Commit-Position: refs/branch-heads/2526@{#393}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Fix Omnibox update problem on El Capitan.
Force a redraw at the end of the Omnibox popup's animation to ensure
that its contents are redrawn after an update on El Capitan.
BUG=551007
Review URL: https://codereview.chromium.org/1435823003
Cr-Commit-Position: refs/heads/master@{#359173}
(cherry picked from commit d23c3995cd1439bc28a1254a9e8ff850c833fbf2)
Review URL: https://codereview.chromium.org/1438983004 .
Cr-Commit-Position: refs/branch-heads/2526@{#392}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
[Contextual Search] Fix the close button touch target
Everything to the left (or right in rtl) of the close button
should register as a touch on the button rather than promote
to a new tab.
BUG=554389
[email protected]
Committed: https://crrev.com/29afa31e4685409da9797eaa5c3f11862c742961
Cr-Commit-Position: refs/heads/master@{#359408}
Review URL: https://codereview.chromium.org/1441193002 .
Cr-Commit-Position: refs/branch-heads/2526@{#391}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Schedule popup animation with setNeedsBeginFrame instead of setNeedsCompositingUpdate
setNeedsCompositingUpdate will not schedule another BeginFrame to be
sent if we are in the middle of processing an existing one. This can
cause the animation update to never happen.
BUG=544918
Review URL: https://codereview.chromium.org/1422463006
Cr-Commit-Position: refs/heads/master@{#358314}
(cherry picked from commit 85cb545403b1e7c174f8bf3e1efda39f3049704a)
Review URL: https://codereview.chromium.org/1435333004 .
Cr-Commit-Position: refs/branch-heads/2526@{#390}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Don't require screen updates for WKWebView snapshotting
Calling drawViewHierarchyInRect:afterScreenUpdates: with YES
disturbs the global animation state, causing videos to play back
out of sync with audio. Use NO instead, which may miss recent
updates, but appears to work in practice on iOS 9.
BUG=546773
TEST=In WKWebView mode, videos on iPad should not play with sound out of
sync with video. Features based on snapshots (e.g., phone tab switcher)
should still display snapshots correctly.
Review URL: https://codereview.chromium.org/1410293010
Cr-Commit-Position: refs/heads/master@{#359356}
(cherry picked from commit ffef597947e7fa4ca0be41af547c89e3b394387b)
Review URL: https://codereview.chromium.org/1440033002 .
Cr-Commit-Position: refs/branch-heads/2526@{#389}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Merge to M47: Gallery: focus to thumbnail view after it opens.
BUG=552330
TEST=browser_tests:GalleryBrowserTest*.OpenMultipleImages*
Review URL: https://codereview.chromium.org/1433653002
Cr-Commit-Position: refs/heads/master@{#358761}
(cherry picked from commit 9127f6ea5e34e83a30fe6e9068d765b235166c3e)
[email protected], [email protected]
Review URL: https://codereview.chromium.org/1440893003 .
Cr-Commit-Position: refs/branch-heads/2526@{#388}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
android: Handle getViewSurface() failure gracefully.
This might occur during browser shutdown. Also log
some more specific errors.
BUG=529233
Review URL: https://codereview.chromium.org/1436533003
Cr-Commit-Position: refs/heads/master@{#359018}
(cherry picked from commit 705fedd2eac735f553b8c8fafbf91c25080efce5)
Review URL: https://codereview.chromium.org/1442503002 .
Cr-Commit-Position: refs/branch-heads/2526@{#387}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Incrementing VERSION to 47.0.2526.62
Cr-Commit-Position: refs/branch-heads/2526@{#386}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
cc: Don't remove tiles when invalidation doesn't intersect the tile.
This patch ensures that when we're on the edge of a tiling, and thus
don't have borders on tiles, we don't remove tiles if the invalidation
doesn't actually intersect the invalidation.
TBR=danakj
BUG=539876
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1411423011
Cr-Commit-Position: refs/heads/master@{#356923}
(cherry picked from commit d87fa44b9cd43b363ab1d2aabbe52569e9f2afc3)
Review URL: https://codereview.chromium.org/1440873002 .
Cr-Commit-Position: refs/branch-heads/2526@{#385}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Merged: Add command line flag to disable MediaCodecPlayer
During finch trial that turns MediaCodecPlayer on we might want
to tun it off for the device in hand. This CL adds the command
line flag
--disable-media-thread-for-media-playback
that forces the current player, i.e. MediaSourcePlayer.
BUG=407577
> Review URL: https://codereview.chromium.org/1421793005
> Cr-Commit-Position: refs/heads/master@{#355961}
TBR=timav
Review URL: https://codereview.chromium.org/1438033003 .
Cr-Commit-Position: refs/branch-heads/2526@{#384}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Merge to 2526: "[DevTools] Fix crash in Page.reload when there is no visible entry."
> [DevTools] Fix crash in Page.reload when there is no visible entry.
>
> BUG=550789
>
> Review URL: https://codereview.chromium.org/1419093004
>
> Cr-Commit-Position: refs/heads/master@{#358387}
(cherry picked from commit ff2c226ca3987bd30241845a4292da693214290d)
[email protected]
Review URL: https://codereview.chromium.org/1434983003 .
Cr-Commit-Position: refs/branch-heads/2526@{#383}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Merge to 2526: "[devtools_http_handler] Add MimeType for svg"
> [devtools_http_handler] Add MimeType for svg
>
> Some time ago devtools console started using .svg images. Unfortunately,
> this causes asserts in GetMimeType to fail. Fixing that.
>
> BUG=553636
>
> Review URL: https://codereview.chromium.org/1431173003
>
> Cr-Commit-Position: refs/heads/master@{#358697}
(cherry picked from commit 6dd0789c30b90b711359c7b21d699e9a2fc9ff0c)
[email protected]
Review URL: https://codereview.chromium.org/1439753002 .
Cr-Commit-Position: refs/branch-heads/2526@{#382}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
[Contextual Search] Fix auto-promotion regression.
BUG=553712
Review URL: https://codereview.chromium.org/1407133020
Cr-Commit-Position: refs/heads/master@{#358894}
(cherry picked from commit 344de1f3a3d1cc09a6b2205f84461211416fecdf)
Review URL: https://codereview.chromium.org/1438813002 .
Cr-Commit-Position: refs/branch-heads/2526@{#381}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Incrementing VERSION to 47.0.2526.61
Cr-Commit-Position: refs/branch-heads/2526@{#380}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Revert "[Contextual Search] Fix auto-promotion regression."
Reverting per request of kerz@
This reverts commit 51015e1ebfbf9c1883bb56e7d99716a69dba72a5.
Cr-Commit-Position: refs/branch-heads/2526@{#379}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Incrementing VERSION to 47.0.2526.60
Cr-Commit-Position: refs/branch-heads/2526@{#378}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Don't upload crash reports for cellular connection.
This only applies to clients who are in experimental group for enabling UMA log uploads on cellular connection by default.
This is a precaution for not overwhelming users data plan.
BUG=552066
Review URL: https://codereview.chromium.org/1423483007
Cr-Commit-Position: refs/heads/master@{#358654}
(cherry picked from commit 5530fb8260611c02b6b231aba5add3fd25e593b7)
Review URL: https://codereview.chromium.org/1433153004 .
Cr-Commit-Position: refs/branch-heads/2526@{#377}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Fix dangling pointer crash in scheduler::TaskQueueManager
Sometimes when unregistering TaskQueue from TaskQueueManager,
TaskQueue was removed from updatable_queue_set_ but not from
newly_updatable_, resulting in a dangling pointer. Fixed by flushing
newly_updatable_ into updatable_queue_set_ when appropriate.
BUG=542506
[email protected]
Review URL: https://codereview.chromium.org/1400343003
Cr-Commit-Position: refs/heads/master@{#354025}
(cherry picked from commit 53c51725895c756d1a6a192883c92dc4ed5b5b93)
Review URL: https://codereview.chromium.org/1439643003 .
Cr-Commit-Position: refs/branch-heads/2526@{#376}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Merge "Fix crash about mask layers"
The return value of CompositedLayerMapping::updateChildClippingMaskLayer()
only indicates if m_childClippingMaskLayer is changed. We need to check
other conditions to update the references to it.
BUG=553045
TEST=CompositedLayerMappingTest.ClippingMaskLayer
> Review URL: https://codereview.chromium.org/1427843009
> Cr-Commit-Position: refs/heads/master@{#358738}
[email protected]
Review URL: https://codereview.chromium.org/1434873002 .
Cr-Commit-Position: refs/branch-heads/2526@{#375}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Incrementing VERSION to 47.0.2526.59
Cr-Commit-Position: refs/branch-heads/2526@{#374}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
[Contextual Search] Fix auto-promotion regression.
BUG=553712
Review URL: https://codereview.chromium.org/1407133020
Cr-Commit-Position: refs/heads/master@{#358894}
(cherry picked from commit 344de1f3a3d1cc09a6b2205f84461211416fecdf)
Review URL: https://codereview.chromium.org/1437693002 .
Cr-Commit-Position: refs/branch-heads/2526@{#373}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Revert of Don't upload crash reports for cellular connection. (patchset #1 id:1 of https://codereview.chromium.org/1431313003/ )
Reason for revert:
I'm reverting this change because it broke the release branch. The branch is not compiling due to the missing declaration for UPLOAD_SUCCESS and UPLOAD_FAILURE constants.
Here's the compilation error message:
../chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadCallable.java:112: error: cannot find symbol
return success ? UPLOAD_SUCCESS : UPLOAD_FAILURE;
^
symbol: variable UPLOAD_SUCCESS
location: class MinidumpUploadCallable
../chrome/android/java/src/org/chromium/chrome/browser/crash/MinidumpUploadCallable.java:112: error: cannot find symbol
return success ? UPLOAD_SUCCESS : UPLOAD_FAILURE;
^
symbol: variable UPLOAD_FAILURE
location: class MinidumpUploadCallable
2 errors
Original issue's description:
> Don't upload crash reports for cellular connection.
>
> This only applies to clients who are in experimental group for enabling UMA log uploads on cellular connection by default.
>
> This is a precaution for not overwhelming users data plan.
>
> BUG=552066
>
> Review URL: https://codereview.chromium.org/1423483007
>
> Cr-Commit-Position: refs/heads/master@{#358654}
> (cherry picked from commit 5530fb8260611c02b6b231aba5add3fd25e593b7)
>
> Committed: https://chromium.googlesource.com/chromium/src/+/5fbef022ad51dee7ff27b476f915a356d6a0ca69
[email protected]
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=552066
Review URL: https://codereview.chromium.org/1419113004
Cr-Commit-Position: refs/branch-heads/2526@{#372}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Merge M47: Reset scrolling of keyboard accessory when changing fields.
Autofill keyboard accessory should re-scroll to the left (right in rtl)
when user switches between fields.
BUG=546120
[email protected]
NOTRY=true
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/1402413003
Cr-Commit-Position: refs/heads/master@{#358934}
(cherry picked from commit bf3dd10fcd5fecd9c416db2f35893b0b23ac02bf)
Review URL: https://codereview.chromium.org/1419573017
Cr-Commit-Position: refs/branch-heads/2526@{#371}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Android NTP now defaults to icon mode.
The experiment is over. Icon mode is the new default. Thumbnail mode is
no longer used, but I'm keeping the code around for a bit longer until
we're 100% certain that it can be nuked.
BUG=542824
Review URL: https://codereview.chromium.org/1406973007
Cr-Commit-Position: refs/heads/master@{#357256}
(cherry picked from commit e4f20b914457a71e7d1d1a12164e3e40105fc5ba)
Review URL: https://codereview.chromium.org/1421493007 .
Cr-Commit-Position: refs/branch-heads/2526@{#370}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
[Merge M47] Fork: Prevent check during data url reload
Loading a data url with base/virtual url causes virtual url to override
the original data url in the NavigationEntryImpl. A reload of this
navigation will then cause a crash in RenderFrameImpl::LoadDataURL due
to not able to parse as data url. See bug for more details.
This is a small simple fix to workaround crash but not really fix the
root problem not able to refresh these loads.
BUG=522567
[email protected]
Review URL: https://codereview.chromium.org/1304883003 .
Cr-Commit-Position: refs/branch-heads/2454@{#423}
Cr-Branched-From: 12bfc3360892ec53cd00fc239a47e5298beb063b-refs/heads/master@{#338390}
(cherry picked from commit 099a09e06cf561340805af62a3b085a01a9a9a40)
Review URL: https://codereview.chromium.org/1433053002 .
Cr-Commit-Position: refs/branch-heads/2526@{#369}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
[Merge M47] gpu: Use virtualized context with MailboxManagerSync
MailboxManagerSync synchronization correctness depends on having only a
single underlying context, since EGLFence only guarantees
synchronization in context the fence is created.
Eg this sequence is broken:
Context 1: Modify Texture A.
Context 2: Insert sync point unrelated to Texture A. This causes
PushTextureUpdates for Texture A, modification of Texture A from Context
1 is not guaranteed to have completed at this point.
Context 1: Insert sync point. TextureUpdate for Texture A is skipped due
to version check.
BUG=510243
Review URL: https://codereview.chromium.org/1430303002
Cr-Commit-Position: refs/heads/master@{#358678}
(cherry picked from commit f0f36b3182af0fee8595253a2b94e19a48686f2b)
TBR=sievers
Review URL: https://codereview.chromium.org/1420613013 .
Cr-Commit-Position: refs/branch-heads/2526@{#368}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Don't upload crash reports for cellular connection.
This only applies to clients who are in experimental group for enabling UMA log uploads on cellular connection by default.
This is a precaution for not overwhelming users data plan.
BUG=552066
Review URL: https://codereview.chromium.org/1423483007
Cr-Commit-Position: refs/heads/master@{#358654}
(cherry picked from commit 5530fb8260611c02b6b231aba5add3fd25e593b7)
Review URL: https://codereview.chromium.org/1431313003 .
Cr-Commit-Position: refs/branch-heads/2526@{#367}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Merge "Revert "Always let the direct containing block paint floats" and follow-up"
Reverts https://crrev.com/5907552443cd949ad0809d6ae2aa8b14b0031ca6
and https://crrev.com/82cf47eaee47c1e5fe46227444ae3ffc0536a4ec
The CLs caused incorrect painting and hit testing order of overlapping
floating objects.
BUG=507590,547167
[email protected]
> Review URL: https://codereview.chromium.org/1427993003
> Cr-Commit-Position: refs/heads/master@{#357389}
Review URL: https://codereview.chromium.org/1423483010 .
Cr-Commit-Position: refs/branch-heads/2526@{#366}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
[Merge M47] Fix detection of partly-hidden password forms
Currently, Chrome declares a form for visible iff its <form> element has a non-empty layout size. But in fact, the layout of the form's control elements is more important. As the added tests in this CL illustrate, the form itself can have an empty layout size, while its control elements don't.
This CL changes Chrome behaviour to check the visibility of the control elements rather than the form itself.
BUG=549149
Review URL: https://codereview.chromium.org/1426233002
Cr-Commit-Position: refs/heads/master@{#358524}
(cherry picked from commit 062730104a0c7e6b5702cda2e1af8277feda50af)
Review URL: https://codereview.chromium.org/1429463005 .
Cr-Commit-Position: refs/branch-heads/2526@{#365}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
[Merge M47] [Autofill] Use form_util::IsFormVisible to determine if a form is still visible
This improves on our visibility detection after a same-page navigation/AJAX request and shares code with password manager.
Also fixed some tests. It turns out the full action needs to be specified otherwise the code paths are not well tested because of the test harness (navigating to data: URIs doesn't play well with actions).
BUG=539903
TEST=FormAutocompleteTest
Review URL: https://codereview.chromium.org/1410193003
Cr-Commit-Position: refs/heads/master@{#355368}
(cherry picked from commit 38a4c8ee69eb14fc7c8f09b6113967b8b08c7e3a)
Review URL: https://codereview.chromium.org/1407313005 .
Cr-Commit-Position: refs/branch-heads/2526@{#364}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
[Merge M47] [Autofill] Move all methods in form_autofill_util to the form_util namespace
BUG=539903
Review URL: https://codereview.chromium.org/1394613003
Cr-Commit-Position: refs/heads/master@{#353112}
(cherry picked from commit 9172c62a3517edcf4103a9dbfc4f4c6f50b4a501)
Review URL: https://codereview.chromium.org/1430413002 .
Cr-Commit-Position: refs/branch-heads/2526@{#363}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
[Merge to M47] [Autofill] Refactor to extract common util functions
Functionally neutral. Extracts IsFormVisible to form_autofill_util in the goal using it for autofill. In the process, a lot of functions are brought to form_autofill_util.cc
BUG=539903
TEST=existing
Review URL: https://codereview.chromium.org/1381713003
Cr-Commit-Position: refs/heads/master@{#352896}
(cherry picked from commit add0680f31bd4711a8fe3546a887d767a6cba023)
Review URL: https://codereview.chromium.org/1434693005 .
Cr-Commit-Position: refs/branch-heads/2526@{#362}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
Only trigger script execution on child insertion, not removal.
The HTML spec says inserting a child into a SCRIPT element may cause
it to execute [1]:
"The script element is in a Document and a node or document
fragment is inserted into the script element, after any script
elements inserted at that time."
Blink used to tickle this step for *any* child changes, which
unfortunately leads to mayhem by executing script in the middle of
reparenting, rescoping nodes when moving or adopting them.
[1] https://html.spec.whatwg.org/multipage/scripting.html#the-script-element:prepare-a-script-2
BUG=539510
Review URL: https://codereview.chromium.org/1414503006
Cr-Commit-Position: refs/heads/master@{#355735}
(cherry picked from commit 604e798ec6ee30f44d57a5c4a44ce3dab3a871ed)
Review URL: https://codereview.chromium.org/1434723003 .
Cr-Commit-Position: refs/branch-heads/2526@{#361}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
gpu: Blacklist partial swap and CALayer overlays on 2009 iMacs
This should be enough to make the flickering observed on these machines
go away, without resorting to disabling all GPU acceleration. The flag
to disable CALayer overlays will probably be useful in the future as we
move to more aggressive promotion of content to CALayers.
BUG=543324
Review URL: https://codereview.chromium.org/1417713007
Cr-Commit-Position: refs/heads/master@{#358759}
(cherry picked from commit a7b2b11c35b3c16a20a0528180168fa6ccba2ff5)
Review URL: https://codereview.chromium.org/1437583002 .
Cr-Commit-Position: refs/branch-heads/2526@{#360}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
DevTools: trying to get object or embed in devtools throws error
BUG=543932
Review URL: https://codereview.chromium.org/1424793009
Cr-Commit-Position: refs/heads/master@{#357409}
(cherry picked from commit e7b3b52de3e4bee448aa67f316501991294379b4)
Review URL: https://codereview.chromium.org/1425723005 .
Cr-Commit-Position: refs/branch-heads/2526@{#359}
Cr-Branched-From: cb947c0153db0ec02a8abbcb3ca086d88bf6006f-refs/heads/master@{#352221}
