Skip to content
This repository was archived by the owner on Apr 3, 2020. It is now read-only.

[Temp] Make |enable_webvr==0| work. #358

Merged
merged 1 commit into from
Jun 8, 2016
Merged

[Temp] Make |enable_webvr==0| work. #358

merged 1 commit into from
Jun 8, 2016

Conversation

rakuco
Copy link
Contributor

@rakuco rakuco commented Jun 8, 2016

IMPORTANT
We actually intend to fix this properly. We are cherry-picking this
commit from the crosswalk-18 branch first in order to have a stable
baseline with no WebVR support propagating from Crosswalk 21 to 20 to
19. After that, we can start working on fixing this in 21 and 20 and, if
there is enough time, 19 too.

From the original commit message:

Move CardboardVRDevice.java to a different directory so that it is not
built by the content_java target even if enable_webvr==0.

This is a prerequisite for getting the code to build with
enable_webvr=0.

Related BUG=XWALK-6746

(cherry picked from commit e593418)

**IMPORTANT**
We actually intend to fix this properly. We are cherry-picking this
commit from the crosswalk-18 branch first in order to have a stable
baseline with no WebVR support propagating from Crosswalk 21 to 20 to
19. After that, we can start working on fixing this in 21 and 20 and, if
there is enough time, 19 too.

*From the original commit message:*

Move `CardboardVRDevice.java` to a different directory so that it is not
built by the `content_java` target even if `enable_webvr==0`.

This is a prerequisite for getting the code to build with
`enable_webvr=0`.

BUG=XWALK-6746

(cherry picked from commit e593418)
@crosswalk-trybot
Copy link

crosswalk-trybot commented Jun 8, 2016

Testing patch series with rakuco/chromium-crosswalk@de4e94e as its head.

Bot Status
Content Shell Android-x86 [SUCCESS 💚](https://build.crosswalk-project.org/try/builders/Content Shell Android-x86/builds/297)
Content Shell Linux [SUCCESS 💚](https://build.crosswalk-project.org/try/builders/Content Shell Linux/builds/295)

@rakuco
Copy link
Contributor Author

rakuco commented Jun 8, 2016

@baleboy @darktears

@kenchris
Copy link
Contributor

kenchris commented Jun 8, 2016

rs=me

@rakuco rakuco merged commit f458695 into crosswalk-project:master Jun 8, 2016
@rakuco rakuco deleted the make-disabling-webvr-work branch June 8, 2016 12:35
fujunwei pushed a commit to fujunwei/chromium-crosswalk that referenced this pull request Jun 28, 2016
Blink and the RenderFrame implementations are currently not prepared to deal
with frame detachments in their callbacks. Consequently, extension code
(content scripts, chrome.app.window.create) that run arbitrary code in the
"document element created" and "document loaded" notifications may result in
unexpected invalidation of memory, resulting in a UAF.

This patch fixes the bug by moving all code that runs untrusted code from
observers to dedicated callbacks, which are only run at a safe point.
All document parsers in Blink have been modified to make sure that they still
work even when the document creation is interrupted by frame removal.

An extensive set of tests for all different kinds of documents, frame removal
methods (e.g. synchronously / in mutation events / ...) and injection points
(document start/end) have been added to avoid regressions.

BUG=582008

Review URL: https://codereview.chromium.org/1642283002

Cr-Commit-Position: refs/heads/master@{#382162}
(cherry picked from commit 43ea064)

Review URL: https://codereview.chromium.org/1825873002 .

Cr-Commit-Position: refs/branch-heads/2661@{crosswalk-project#358}
Cr-Branched-From: ef6f6ae-refs/heads/master@{#378081}
huningxin pushed a commit to huningxin/chromium-croswalk that referenced this pull request Oct 9, 2016
This restricts the bubble to showing 5 times, and only showing when users
trigger backspace twice within three seconds (which likely indicates "hey, why
isn't the browser going back").

The bubble is also immediately hidden (by fading out) if the user successfully
navigates back or forward (by any means) while it's showing.

BUG=610039,615760
TEST=New "press alt-left to go back" UI should not appear when pressing backspace (to attempt to go back) unless backspace is pressed twice within three seconds.  After the UI is shown 5 times, it should not appear again.
TBR=phajdan.jr

Review-Url: https://codereview.chromium.org/2041293002
Cr-Commit-Position: refs/heads/master@{#399114}
(cherry picked from commit 36aa729)

Review URL: https://codereview.chromium.org/2065283002 .

Cr-Commit-Position: refs/branch-heads/2743@{crosswalk-project#358}
Cr-Branched-From: 2b3ae3b-refs/heads/master@{#394939}
imreotto pushed a commit to tenta-browser/chromium-crosswalk that referenced this pull request Nov 2, 2017
While animating from fullscreen, animate over 250ms, else animate over
200ms.

[email protected]

(cherry picked from commit 16321bb)

Bug: 763078
Change-Id: I860d3dbe147f7dac9cde111656f4e4a852758f29
Reviewed-on: https://chromium-review.googlesource.com/658482
Commit-Queue: Alex Newcomer <[email protected]>
Reviewed-by: Xiyuan Xia <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#500963}
Reviewed-on: https://chromium-review.googlesource.com/675983
Reviewed-by: Alex Newcomer <[email protected]>
Cr-Commit-Position: refs/branch-heads/3202@{crosswalk-project#358}
Cr-Branched-From: fa6a5d8-refs/heads/master@{#499098}
NaNgets pushed a commit to NaNgets/chromium-crosswalk that referenced this pull request Feb 17, 2018
…et_root

[email protected]

(cherry picked from commit 8c7ac7a)

(cherry picked from commit 31d4c5fac2404819011fc93aab1606f42745897d)

Bug: 807314
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: I635c0d6303894f9aa49197edcbfe6de8990a68b6
Reviewed-on: https://chromium-review.googlesource.com/894699
Reviewed-by: Chris Harrelson <[email protected]>
Commit-Queue: Xianzhu Wang <[email protected]>
Cr-Original-Original-Commit-Position: refs/heads/master@{#533434}
Reviewed-on: https://chromium-review.googlesource.com/905992
Reviewed-by: Xianzhu Wang <[email protected]>
Cr-Original-Commit-Position: refs/branch-heads/3325@{crosswalk-project#358}
Cr-Original-Branched-From: bc084a8-refs/heads/master@{#530369}
Reviewed-on: https://chromium-review.googlesource.com/907187
Cr-Commit-Position: refs/branch-heads/3282@{#657}
Cr-Branched-From: 5fdc0fa-refs/heads/master@{#520840}
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants