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

[ICS Support] Remove ffmpeg from DEPS #351

Closed
wants to merge 1 commit into from
Closed

[ICS Support] Remove ffmpeg from DEPS #351

wants to merge 1 commit into from

Conversation

sunlin-link
Copy link
Contributor

The original ffmpeg uses the system call "posix_memalign" that
doesn't exist on Android 4.0. To use modified ffmpeg code,remove
ffmpeg from chromium's DEPS and fetch forked repo through
crosswalk's DEPS.

The original ffmpeg uses the system call "posix_memalign" that
doesn't exist on Android 4.0. To use modified ffmpeg code,remove
ffmpeg from chromium's DEPS and fetch forked repo through
crosswalk's DEPS.
@sunlin-link
Copy link
Contributor Author

@rakuco Please help to merge

@rakuco
Copy link

rakuco commented May 4, 2016

I don't get why this is necessary. Changing DEPS.xwalk in Crosswalk just like we do for v8-crosswalk should be enough.

@sunlin-link
Copy link
Contributor Author

sunlin-link commented May 5, 2016

I was going to add corresponding dependency to DEPS.xwalk as well. But I'm not sure of the mechanism behind here. What if one repository exists in both of chromium's DEPS and crosswalk's DEPS, and the commits are different? Does it make any conflict?

@rakuco
Copy link

rakuco commented May 6, 2016

What if one repository exists in both of chromium's DEPS and crosswalk's DEPS, and the commits are different? Does it make any conflict?

No, otherwise v8-crosswalk would never have worked at all. The definitions in DEPS.xwalk always override the ones in chromium-crosswalk's DEPS.

@sunlin-link sunlin-link closed this May 8, 2016
huningxin pushed a commit to huningxin/chromium-croswalk that referenced this pull request May 17, 2016
This happened when a <select> HTML element was used in WebView, and the
activity containing the WebView had a pre-Holo theme (e.g.
android:Theme.Black).

BUG=596626

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

Cr-Commit-Position: refs/heads/master@{#382711}
(cherry picked from commit 58873c3)

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

Cr-Commit-Position: refs/branch-heads/2661@{crosswalk-project#351}
Cr-Branched-From: ef6f6ae-refs/heads/master@{#378081}
fujunwei pushed a commit to fujunwei/chromium-crosswalk that referenced this pull request May 27, 2016
Chrome uses dual-stack socket on windows which will cause the generation of IPv4-mapped IPv6 address as the default IPv6 address. This particular address is not in the enumerated list so the end behavior is that we generate a new candidate which is not available even when there is no ip permission check.

BUG=564821

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

Cr-Commit-Position: refs/heads/master@{#363359}
(cherry picked from commit 72d02d7)

NOTRY=true
NOPRESUBMIT=true

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

Cr-Commit-Position: refs/branch-heads/2564@{crosswalk-project#351}
Cr-Branched-From: 1283eca-refs/heads/master@{#359700}
huningxin pushed a commit to huningxin/chromium-croswalk that referenced this pull request Oct 9, 2016
Once the route-details element is stamped, getSinkForRoute_ is bound to
currentRoute_. This becomes null if the route is stopped which causes
getSinkForRoute_ to throw an innocuous but noisy error. This change adds
a check of the route before dereferencing it.

BUG=614144
NOTRY=true
NOPRESUBMIT=true

Review-Url: https://codereview.chromium.org/2053743002
Cr-Commit-Position: refs/heads/master@{#399281}
(cherry picked from commit 16bc9a2)

Review-Url: https://codereview.chromium.org/2065023002
Cr-Commit-Position: refs/branch-heads/2743@{crosswalk-project#351}
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
On iPhone X, the safe area is cutting the bottom and sides of the
device. The bottom toolbar needs to take it into account to be
correctly displayed on iPhone X.

Before: https://drive.google.com/file/d/0By4O1f2IQqQ_aE9PcnJoblpocTQ/view
After: https://drive.google.com/open?id=0B21N-0pPGAuJVG9YMkU2ZDdONVE

Bug: 765397
Change-Id: I20eea4ab32089cb5fb2850166b04c19425ba04de
Reviewed-on: https://chromium-review.googlesource.com/668578
Commit-Queue: Gauthier Ambard <[email protected]>
Reviewed-by: Sergio Collazos <[email protected]>
Cr-Original-Commit-Position: refs/heads/master@{#502582}(cherry picked from commit 9343187)
Reviewed-on: https://chromium-review.googlesource.com/674904
Reviewed-by: Gauthier Ambard <[email protected]>
Cr-Commit-Position: refs/branch-heads/3202@{crosswalk-project#351}
Cr-Branched-From: fa6a5d8-refs/heads/master@{#499098}
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.

2 participants