~oxide-developers/oxide/+git/chromium:oxide/dev/cr3018

Last commit made on 2017-02-24
Get this branch:
git clone -b oxide/dev/cr3018 https://git.launchpad.net/~oxide-developers/oxide/+git/chromium
Members of Oxide Developers can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
oxide/dev/cr3018
Repository:
lp:~oxide-developers/oxide/+git/chromium

Recent commits

c8a5e9b... by "Pawel Hajdan, Jr" <email address hidden>

Fix GN bootstrap

BUG=none
<email address hidden>

Review-Url: https://codereview.chromium.org/2701613008 .
Cr-Commit-Position: refs/heads/master@{#451714}

8f2b590... by Chris Coulson

Sync ParamTraits for content::WebPreferences (LP: #1665978)

b6eff04... by Chris Coulson

Merge upstream 58.0.3018.3 in to oxide/dev/cr3018

50a02c3... by chrome-cron <email address hidden>

Publish DEPS for Chromium 58.0.3018.3

9f90720... by chrome-cron <email address hidden>

Incrementing VERSION to 58.0.3018.3

Cr-Commit-Position: refs/branch-heads/3018@{#5}
Cr-Branched-From: 5e7216844858ad1d08a70ac7aeef88547db2be7f-refs/heads/master@{#451537}

cd0fb2c... by dimu <email address hidden>

Revert of Correctly compute parent of AXMenuListOption (patchset #8 id:160001 of https://codereview.chromium.org/2670023002/ )

Reason for revert:
Causing crashes

BUG=687835,694349
NOTRY=true
NOPRESUBMIT=true

Original issue's description:
> Correctly compute parent of AXMenuListOption
>
> BUG=687835
>
> Review-Url: https://codereview.chromium.org/2670023002
> Cr-Commit-Position: refs/heads/master@{#451530}
> Committed: https://chromium.googlesource.com/chromium/src/+/dbc08d987df8d944144250b50c6cffc044d517c1

<email address hidden>,<email address hidden>
BUG=687835

Review-Url: https://codereview.chromium.org/2713453002
Cr-Commit-Position: refs/heads/master@{#451865}
(cherry picked from commit 8dd7ebcfe2458163d1faa4d0de517affec380d90)

Review-Url: https://codereview.chromium.org/2713573002 .
Cr-Commit-Position: refs/branch-heads/3018@{#4}
Cr-Branched-From: 5e7216844858ad1d08a70ac7aeef88547db2be7f-refs/heads/master@{#451537}

1e5ed6b... by Christopher Cameron <email address hidden>

color: Fix accidental partial color conversion

For color spaces that can't be represented by an matrix plus analytic
transfer function, we need to ensure that we don't accidentally enable
color conversion when the destination is undefined.

Tests may be disruptive and are in a separate patch.

BUG=694191
<email address hidden>

Review-Url: https://codereview.chromium.org/2712533002 .
Cr-Commit-Position: refs/heads/master@{#451858}
(cherry picked from commit 1d14a77942910d9f60af73c674809b1f82de3847)

Review-Url: https://codereview.chromium.org/2705223003 .
Cr-Commit-Position: refs/branch-heads/3018@{#3}
Cr-Branched-From: 5e7216844858ad1d08a70ac7aeef88547db2be7f-refs/heads/master@{#451537}

23b3c49... by Chris Coulson

Merge upstream 5e7216844858ad1d08a70ac7aeef88547db2be7f in to master

9684a56... by chrome-cron <email address hidden>

Incrementing VERSION to 58.0.3018.2

Cr-Commit-Position: refs/branch-heads/3018@{#2}
Cr-Branched-From: 5e7216844858ad1d08a70ac7aeef88547db2be7f-refs/heads/master@{#451537}

23b8e87... by chrome-cron <email address hidden>

Incrementing VERSION to 58.0.3018.1

Cr-Commit-Position: refs/branch-heads/3018@{#1}
Cr-Branched-From: 5e7216844858ad1d08a70ac7aeef88547db2be7f-refs/heads/master@{#451537}