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

[DO NOT MERGE] Fix that code checkout via .DEPS.git will fail for crosswalk #171

Closed
wants to merge 1 commit into from
Closed

[DO NOT MERGE] Fix that code checkout via .DEPS.git will fail for crosswalk #171

wants to merge 1 commit into from

Conversation

wang16
Copy link

@wang16 wang16 commented Jun 18, 2014

Including two changes:

  1. Remove "src" entry in .DEPS.git.
  2. Add "ozone" to skip_child_include list. Because ozone also
    specify "src" in its custom_deps.

BUG=https://crosswalk-project.org/jira/browse/XWALK-1894

Fix that code checkout via .DEPS.git will fail for crosswalk
869424b 
Including two changes:
1. Remove "src" entry in .DEPS.git.
2. Add "ozone" to skip_child_include list. Because ozone also
   specify "src" in its custom_deps.

BUG=https://crosswalk-project.org/jira/browse/XWALK-1894
@crosswalk-trybot
Copy link

Testing patch series with 869424b as its head.

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

@wang16
Copy link
Author

wang16 commented Jun 18, 2014

@rakuco @halton, please help review, I'm still running gclient sync locally, will update the result here after finished.

@halton
Copy link

halton commented Jun 18, 2014

After short sync with @wang16, he will try to not touch .DEPS.git here and do in crosswalk files instead(add skip_child_includes for ozone). If that works, we'll go with that solution, which is better for rebasing.

@wang16
Copy link
Author

wang16 commented Jun 18, 2014

Verified two things:

  1. add skip_child_includes in .gclient-xwalk is not working.
  2. If not remove src entry in .DEPS.git, will meet issue Dependency src specified more than once:

So both changes are necessary.

@wang16
Copy link
Author

wang16 commented Jun 18, 2014

@rakuco , will the BUG= phrase in chromium-crosswalk's commit trigger the jira issue to be resolved? If yes, i will update the commit log.

@halton
Copy link

halton commented Jun 18, 2014

Based on the result, I'd give my lgtm.

@halton halton mentioned this pull request Jun 18, 2014
Closed
@wang16 wang16 changed the title Fix that code checkout via .DEPS.git will fail for crosswalk [DO NOT MERGE] Fix that code checkout via .DEPS.git will fail for crosswalk Jun 18, 2014
@wang16
Copy link
Author

wang16 commented Jun 18, 2014

Still need some investigation about skip_child_includes

@rakuco
Copy link

rakuco commented Jun 18, 2014

I've posted an alternate course of action in XWALK-1894 that makes this patch unnecessary.

@rakuco
Copy link

rakuco commented Jun 18, 2014

@rakuco , will the BUG= phrase in chromium-crosswalk's commit trigger the jira issue to be resolved? If yes, i will update the commit log.

Yes. The commit itself doesn't matter, what the commit trigger parses is the pull request message itself.

@wang16
Copy link
Author

wang16 commented Jun 19, 2014

Close this as will have other solution.

@wang16 wang16 closed this Jun 19, 2014
darktears pushed a commit that referenced this pull request Sep 17, 2014
Change VideoTrackAdapter to not drop frames if the source frame rate …
9ec3990 
…is known. Also change remote video and pepper plugin MediaStreamVideoSource implementations to not set a guessed frame rate.

BUG= 394315

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

Cr-Commit-Position: refs/heads/master@{#292800}
(cherry picked from commit b18d81f)

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

Cr-Commit-Position: refs/branch-heads/2125@{#171}
Cr-Branched-From: b68026d-refs/heads/master@{#290040}
darktears pushed a commit that referenced this pull request Nov 17, 2014
@jmuk
Do not check if the number of display is exactly 2.
bea15bb 
When a display removal and a display add happens at the same time,
the number of display is actually 3 during the display removal event.
Therefore the check is too strict.

BUG=414394
R=oshima@chromium.org
TBR=oshima@chromium.org
TEST=the new test case covers

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

Cr-Commit-Position: refs/heads/master@{#299553}
(cherry picked from commit 9afa39c)

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

Cr-Commit-Position: refs/branch-heads/2171@{#171}
Cr-Branched-From: 267aeeb-refs/heads/master@{#297060}
rakuco pushed a commit that referenced this pull request Feb 27, 2015
VP8Decoder: Drop references to reference frames earlier.
1e87387 
Drop references to reference frames before requesting new surfaces to
ensure we don't hold onto them while the Accelerator is changing resolution,
risking reusing a stale buffer.

BUG=chrome-os-partner:35539
TEST=Hangouts, vdatest

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

Cr-Commit-Position: refs/heads/master@{#313679}
(cherry picked from commit 0f47fc9)

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

Cr-Commit-Position: refs/branch-heads/2272@{#171}
Cr-Branched-From: 827a380-refs/heads/master@{#310958}
rakuco pushed a commit that referenced this pull request Mar 12, 2015
Mac: Fix crashes related to LocationBarViewMac::GetPageInfoBubblePoint
121a258 
There are 2 different crash stacks, both ends up with a null LocationBarViewMac.
The first one involves showing a permission bubble while in immersive
fullscreen. Fix it by telling PermissionBubbleCocoa when the parent window
should change.
The second one involves animating an infobar while dragging a tab. I was not
able to reproduce this one, but I think it can be fixed by removing the need
for InfoBarContainerController to find the LocationBarMac through the window
controller. It is not a good idea anyway for InfobarContainerController to
have a direct dependency on BrowserWindowController.

BUG=461541
TBR=rsesek@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#319368}
(cherry picked from commit bfd680f)

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

Cr-Commit-Position: refs/branch-heads/2311@{#171}
Cr-Branched-From: 09b7de5-refs/heads/master@{#317474}
rakuco pushed a commit that referenced this pull request Apr 28, 2015
@jason-simmons
Add a flag to app_shell that allows roaming on cellular networks
655a170 
BUG=chrome-os-partner:37102
NOPRESUBMIT=true
NOTRY=true

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

Cr-Commit-Position: refs/heads/master@{#325525}
(cherry picked from commit 97ecc6e)

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

Cr-Commit-Position: refs/branch-heads/2357@{#171}
Cr-Branched-From: 59d4494-refs/heads/master@{#323860}
mrunalk pushed a commit that referenced this pull request Sep 22, 2015
@davidben
Update ERR_SSL_WEAK_EPHEMERAL_DH_KEY Learn More URL.
e1de7a5 
BUG=527949
TEST=Visit https://dh512.badssl.com/
     Details
     Learn more
     Browser should be taken to a page on support.google.com.

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

Cr-Commit-Position: refs/heads/master@{#347217}
(cherry picked from commit bc3952a)

TBR=felt@chromium.org,thestig@chromium.org

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

Cr-Commit-Position: refs/branch-heads/2490@{#171}
Cr-Branched-From: 7790a35-refs/heads/master@{#344925}
mrunalk pushed a commit that referenced this pull request Dec 18, 2015
Incrementing VERSION to 48.0.2564.21
4ebe853 
Cr-Commit-Position: refs/branch-heads/2564@{#171}
Cr-Branched-From: 1283eca-refs/heads/master@{#359700}
rakuco pushed a commit that referenced this pull request Mar 3, 2016
@japacible
[Media Router] Handle route creation where resolved route is not for …
c2f678f 
…display.

This change handles route creation where the initially resolved route is not marked for display. This keeps track of the route id and checks if the route is updated to be ready for display.

In the case where the route is never ready for display, route creation times out and fails. The MRP will send an issue to the Media Router if this happens.

Updated reporting for relevant UMA metric.

BUG=579138

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

Cr-Commit-Position: refs/heads/master@{#371385}
(cherry picked from commit 3647a2e)

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

Cr-Commit-Position: refs/branch-heads/2623@{#171}
Cr-Branched-From: 92d7753-refs/heads/master@{#369907}
huningxin pushed a commit to huningxin/chromium-croswalk that referenced this pull request May 17, 2016
@msramek
Improve the accessibility of ClearBrowsingDataPreferences
41af1dd 
This CL fixes accessibility issues of preferences
in ClearBrowsingDataPreferences.

1. Checkboxes were losing focus after (un)checking.
2. The time period dropdown value was being re-announced whenever screen
   was scrolled away and back to it.
3. Checkboxes did not announce when the summary (the result of
   BrowsingDataCounter) was updated.

1. and 2. are caused by the View of the Preference being recreated.
We now cache it in both ClearBrowsingDataCheckBoxPreference
and SpinnerPreference. Note that this was also the cause of
crbug.com/588687.

In addition, in SpinnerPreference, the problem was also caused by
adapter being constantly resupplied, even though it hasn't changed.
We now only call setAdapter() if a different adapter has actually been
passed to SpinnerPreference in the meantime. This is done for
generality; currently, we only supply adapter to SpinnerPreference once.

Problem 3. was solved by explicitly calling
announceForAccessibility(result). Here, we want to provide the user with
direct feedback - when a checkbox is checked, a subsequent counter
result should be announced. However, when the dialog is just being
initialized, or the time period changed, BrowsingDataCounters related to
all checkboxes are reset, which would cause unnecessary noise.
Therefore, we only announce the result if the recalculation was caused
by changing the checkbox state.

BUG=590755,588687

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

Cr-Commit-Position: refs/heads/master@{#379802}
(cherry picked from commit fd1c745)

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

Cr-Commit-Position: refs/branch-heads/2661@{crosswalk-project#171}
Cr-Branched-From: ef6f6ae-refs/heads/master@{#378081}
huningxin pushed a commit to huningxin/chromium-croswalk that referenced this pull request Oct 9, 2016
Revert "When a headset or other application changes the active node's"
e8af869 
This reverts commit 7a0ee45.

BUG=614885
TBR=hychao@chromium.org

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

Cr-Commit-Position: refs/branch-heads/2743@{crosswalk-project#171}
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
[Android O Notifications] Strip scheme from site channel names
1a436a9 
- Since notification permission can now only be granted to https sites,
the scheme is redundant.

TBR=awdf@chromium.org

(cherry picked from commit d01cae4)

Bug: 762900
Change-Id: I47c15c9ac71af7decab90d6ba781126a47f55b33
Reviewed-on: https://chromium-review.googlesource.com/655080
Commit-Queue: Anita Woodruff <awdf@chromium.org>
Reviewed-by: Peter Beverloo <peter@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#500321}
Reviewed-on: https://chromium-review.googlesource.com/663897
Reviewed-by: Anita Woodruff <awdf@chromium.org>
Cr-Commit-Position: refs/branch-heads/3202@{crosswalk-project#171}
Cr-Branched-From: fa6a5d8-refs/heads/master@{#499098}
imreotto pushed a commit to tenta-browser/chromium-crosswalk that referenced this pull request Nov 2, 2017
Revert "[Android O Notifications] Strip scheme from site channel names"
66bef2e 
This reverts commit 1a436a9.

Reason for revert: Reason for revert: official builds failing to compile, crbug.com/764600

Original change's description:
> [Android O Notifications] Strip scheme from site channel names
> 
> - Since notification permission can now only be granted to https sites,
> the scheme is redundant.
> 
> TBR=awdf@chromium.org
> 
> (cherry picked from commit d01cae4)
> 
> Bug: 762900
> Change-Id: I47c15c9ac71af7decab90d6ba781126a47f55b33
> Reviewed-on: https://chromium-review.googlesource.com/655080
> Commit-Queue: Anita Woodruff <awdf@chromium.org>
> Reviewed-by: Peter Beverloo <peter@chromium.org>
> Cr-Original-Commit-Position: refs/heads/master@{#500321}
> Reviewed-on: https://chromium-review.googlesource.com/663897
> Reviewed-by: Anita Woodruff <awdf@chromium.org>
> Cr-Commit-Position: refs/branch-heads/3202@{crosswalk-project#171}
> Cr-Branched-From: fa6a5d8-refs/heads/master@{#499098}

TBR=peter@chromium.org,awdf@chromium.org

Change-Id: Id299988ce15490e5a91a2dbc20da26e89c4cf515
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 762900
Reviewed-on: https://chromium-review.googlesource.com/665218
Reviewed-by: Theresa <twellington@chromium.org>
Cr-Commit-Position: refs/branch-heads/3202@{crosswalk-project#199}
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.
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@wang16 @crosswalk-trybot @halton @rakuco