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

Branch merges

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

200c8c1... by Chris Coulson on 2016-05-20

Require the embedder to provide a clipboard implementation

7da9056... by Chris Coulson on 2016-05-17

Refactor how we support external popup menus in Oxide

Support for external popups in Oxide is one of our biggest changes to Chromium, and probably the largest source of merge conflicts. This drops most of that, and instead delegates external popups to the embedder.

b71d8c0... by Chris Coulson on 2016-05-13

In EventHandler::scrollBox(), don't use scroll customization if it's disabled

This caused a bug in Oxide where main-thread scrolls with a mouse wheel caused the browser's headerbar to move, because the viewport has a scroll callback that moves it (LP: #1560432)

1e4d61b... by Chris Coulson on 2016-05-12

The top-level CMakeLists.txt needs to call enable_testing

48e4c73... by Chris Coulson on 2016-05-10

Merge upstream 3a85b1c8884d4a28f86a69df86183b51018b8245 in to master

3a85b1c... by stanisc <email address hidden> on 2016-05-10

Mark inspector/components/throttler.html as flaky on Win7 Debug

This test has been failing intermittently on Win7 Dbg builder.

<email address hidden>
BUG=610464

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

f8907f4... by jyquinn <email address hidden> on 2016-05-10

Disable CertVerifyProcTest TestKnownRoot and PublicKeyHashes

Comment in TestKnownRoot indicates that it and PublicKeyHashes will
fail on May 9, 2016, and they did. Disabling for now.

BUG=610546
<email address hidden>
NOTRY=true
NOPRESUBMIT=true

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

4036d8c... by paulmiller <email address hidden> on 2016-05-10

Revert of Mark the Certly.io log as disqualified, as of April 15 2016 (patchset #6 id:90001 of https://codereview.chromium.org/1941273002/ )

Reason for revert:
This seems to be the most likely cause of this CertVerifyProcTest failure:
https://build.chromium.org/p/chromium.linux/builders/Android%20Tests%20(dbg)/builds/34273

Original issue's description:
> Mark the Certly.io log as disqualified, as of April 15 2016
>
> BUG=none
>
> Committed: https://crrev.com/4db616c441f693e7eca3c7f5f7452fdfd4b84eb2
> Cr-Commit-Position: refs/heads/master@{#392444}

<email address hidden>,<email address hidden>,<email address hidden>
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=none

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

0608085... by megjablon <email address hidden> on 2016-05-10

Reset the Lo-Fi main frame state when there is a new main frame request and
remove the Lo-Fi field trial.

BUG=607693

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

a5245f4... by luoe <email address hidden> on 2016-05-10

DevTools: fix incorrect device orientation bug

BUG=609665

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