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

Backport some TestWebServer commits from upstream. #198

Merged
merged 2 commits into from
Oct 17, 2014
Merged

Backport some TestWebServer commits from upstream. #198

merged 2 commits into from
Oct 17, 2014

Conversation

rakuco
Copy link

@rakuco rakuco commented Oct 17, 2014

The most important commit is 4adebb3 (the other one just adds the
infrastructure it requires), which I landed upstream to get
org.xwalk.runtime.client.test.CrossOriginXhrTest and
org.xwalk.runtime.client.embedded.test.CrossOriginXhrTest to work again
after we moved Crosswalk to M39.

Those tests need TestWebServer to be listening in a specific port
instead of using a random one available, which was the new behaviour.

Necessary for fixing XWALK-2755.

paulmiller and others added 2 commits October 17, 2014 23:21
[Backport] Start server thread in new TestWebServer.start() method ra…
0622b0f 
…ther than constructor

Original commit message:
  BUG=413790

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

  Cr-Commit-Position: refs/heads/master@{#297753}

Required for the follow-up commit, which is necessary for fixing some
CORS Crosswalk tests after moving to M39.

BUG=XWALK-2755
[Backport] Allow forcing TestWebServer to use a specific port number.
4adebb3 
Original commit message:

  Commit c4a3f88 ("TestWebServer needs to
  use a free port") has caused TestWebServer to use a random port number
  in each invocation.

  This does not play well with tests that assume the server will be
  running on a specific port (for example, an HTML asset trying to do XHR
  whose contents cannot be changed at runtime).

  start() and startSsl() can now be passed an optional port number; if it
  is being used, the server will fail to start like it did before the
  commit mentioned above.

  R=hush@chromium.org, yfriedman@chromium.org

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

  Cr-Commit-Position: refs/heads/master@{#300151}

This is required for org.xwalk.runtime.client.test.CrossOriginXhrTest
and org.xwalk.runtime.client.embedded.test.CrossOriginXhrTest to work
again in Crosswalk after moving to M39, as those tests require
TestWebServer to be running on a specific port.

BUG=XWALK-2755
@crosswalk-trybot
Copy link

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

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

@darktears
Copy link
Contributor

Good to go

rakuco pushed a commit that referenced this pull request Oct 17, 2014
Merge pull request #198 from rakuco/backport-testwebserver-commits
88fc58a 
Backport some TestWebServer commits from upstream.
@rakuco rakuco merged commit 88fc58a into crosswalk-project:master Oct 17, 2014
@rakuco rakuco deleted the backport-testwebserver-commits branch October 17, 2014 21:24
darktears pushed a commit that referenced this pull request Nov 17, 2014
@erikchen
mac: Fix bug where exiting tab fullscreen would cause Chrome menubar …
7fed17e 
…to disappear.

Merge into branch 2171.

Prior to my major fullscreen refactor, Presentation Mode and Canonical
Fullscreen had significant implementation differences. As a result,
fullscreen_controller treated the two modes very differently. If a user tried
to enter tab fullscreen after entering browser fullscreen (Presentation Mode),
enterImmersiveFullscreen: would not be invoked. If a user tried to do the same
after Canonical Fullscreen, enterImmersiveFullscreen: would be invoked.

After my major fullscreen refactor, Presentation Mode and Canonical Fullscreen
are almost identical. However, I failed to update the logic in
fullscreen_controller, which still treated the two modes differently.

This CL updates the logic in fullscreen_controller to treat both modes like
Presentation Mode. If a user tries to enter tab fullscreen after entering
browser fullscreen, enterImmersiveFullscreen: is not invoked.

Original Review URL: https://codereview.chromium.org/652983005
Original Cr-Commit-Position: refs/heads/master@{#299838}

Conflicts:
	chrome/browser/ui/cocoa/browser_window_cocoa.h
	chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc
	chrome/test/base/test_browser_window.h

TBR=rsesek@chromium.org
BUG=422191

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

Cr-Commit-Position: refs/branch-heads/2171@{#198}
Cr-Branched-From: 267aeeb-refs/heads/master@{#297060}
mrunalk pushed a commit that referenced this pull request Jan 27, 2015
@kenrussell
Add UMA histogram for D3D shader model.
68f77b5 
This metric will allow us to determine what percentage of our
Windows ANGLE users are using the D3D11 vs D3D9 back-end. It will
also give us a breakdown of what kind of support there is in the
wild for various GPU configs.

BUG=432267

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

Cr-Commit-Position: refs/heads/master@{#304107}
(cherry picked from commit 1b6258e)

R=amineer@google.com, asvitkine@chromium.org, kbr@chromium.org

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

Cr-Commit-Position: refs/branch-heads/2214@{#198}
Cr-Branched-From: 03655fd-refs/heads/master@{#303346}
rakuco pushed a commit that referenced this pull request Feb 27, 2015
@wfh-chromium
Merge: Allow SW registration only if it's secure AND it's HTTP or HTTPS
0cb39d7 
BUG=453982
TEST=tested manually
TEST=content_unittests:ServiceWorkerDispatcherHostTest.Register_FileSystem*

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

Cr-Commit-Position: refs/heads/master@{#314143}
(cherry picked from commit 22394d8)

Merge: Service Worker: Improve some exception messages (Chromium).

- Prefix the error messages to indicate the operation
that failed (particularly helps when the error occurs
in a promise chain)
- Add more details to the error messages.

Example improvements:

Before: "URL too long"
After: "Failed to register a ServiceWorker: The
provided scriptURL or scope is too long."

Before: "The scope must be under the directory of the
script URL."
After: "Failed to register a ServiceWorker:
The path of the provided scope ('http://localhost:9898/mysecretpath')
is not under the directory of the provided scriptURL
('http://localhost:9898/resources/empty-worker.js')."

ONLY FILES

content/common/service_worker/service_worker_types.cc
content/common/service_worker/service_worker_types.h

BUG=436928
Review URL: https://codereview.chromium.org/813673005

Cr-Commit-Position: refs/heads/master@{#311428}
(cherry picked from commit 737a4ba)

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

Cr-Commit-Position: refs/branch-heads/2272@{#198}
Cr-Branched-From: 827a380-refs/heads/master@{#310958}
rakuco pushed a commit that referenced this pull request Mar 12, 2015
@mvano
Handle cog click from "failed download" notification.
91ce411 
This will go to Chrome's notifications preferences screen.

TESTED=https://mvano.github.io/sandbox/downloads.htm
TESTED=NotificationUIManagerTest.*

BUG=464359
TBR=amineer@chromium.org,mvanouwerkerk@chromium.org

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

Cr-Commit-Position: refs/heads/master@{#319914}
(cherry picked from commit 359be78)

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

Cr-Commit-Position: refs/branch-heads/2311@{#198}
Cr-Branched-From: 09b7de5-refs/heads/master@{#317474}
rakuco pushed a commit that referenced this pull request Apr 30, 2015
@SergeyUlanov
Fix LibjingleTransport not to wait for channel to be writable.
49ecf0e 
Previously LibjingleTransport was waiting for channel to be become
writable before considering it to be connected. As result it was loosing
all data that's received before the channel is marked as writable.

BUG=477142

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

Cr-Commit-Position: refs/heads/master@{#325347}
(cherry picked from commit 42df610)

TBR=sergeyu@chromium.org

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

Cr-Commit-Position: refs/branch-heads/2357@{#198}
Cr-Branched-From: 59d4494-refs/heads/master@{#323860}
mrunalk pushed a commit that referenced this pull request Sep 22, 2015
@joelweinberger
Verify that cert status is valid before forgetting user exceptions
4b0be58 
Adds a check in SSLPolicy when user exceptions for bad certificates are
forgotten to make sure that the certificate information is valid. Simply
adds a check that the cert_id is not 0. Also adds unit tests to validate
this chain of events.

In SSLPolicy, if a user has made an exception for an invalid certificate
for a host by clicking on an interstitial, that exception is forgotten
if a good certificate is ever seen for the host. Unfortunately, when we
checked if the certificate has an error or not, we forgot to check *if
the certificate info is valid*, and thus we were getting certificate
information that that was not valid, and by default lists no certificate
errors. Thus, Chrome thought it found a certificate without an error,
when what it really found was invalid certificate information.

BUG=516808
TBR=creis@chromium.org,estark@chromium.org

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

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

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

Cr-Commit-Position: refs/branch-heads/2490@{#198}
Cr-Branched-From: 7790a35-refs/heads/master@{#344925}
mrunalk pushed a commit that referenced this pull request Dec 18, 2015
@efimki
[Cronet] Continue UrlRequest with NULL certificate if Client cert is …
4253165 
…requested.

TEST=CronetUrlRequestTest.testMockClientCertificateRequested
BUG=558420

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

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

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

Cr-Commit-Position: refs/branch-heads/2564@{#198}
Cr-Branched-From: 1283eca-refs/heads/master@{#359700}
rakuco pushed a commit that referenced this pull request Mar 3, 2016
Make sure Ppapi compositor layer resources are synchronized.
5b1b9e6 
BUG=514815, 581951

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

Cr-Commit-Position: refs/heads/master@{#372232}
(cherry picked from commit 549080a)

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

Cr-Commit-Position: refs/branch-heads/2623@{#198}
Cr-Branched-From: 92d7753-refs/heads/master@{#369907}
huningxin pushed a commit to huningxin/chromium-croswalk that referenced this pull request May 17, 2016
[Merge to 2661] Cache csi info before passing it to JS setters.
2ceb746 
JS setters invalidate the pointers frame, data_source and document_state.

BUG=590455

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

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

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

Cr-Commit-Position: refs/branch-heads/2661@{crosswalk-project#198}
Cr-Branched-From: ef6f6ae-refs/heads/master@{#378081}
huningxin pushed a commit to huningxin/chromium-croswalk that referenced this pull request Oct 9, 2016
[Merge M52] Disable video overlay for WebView
1ba104f 
Video overlay for embedded videos (aka hole punching)
is a hidden API in WebSettings that we plan to remove.
Disabling it to verify that nobody uses it.

BUG=616583
TBR=timav

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

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

Cr-Commit-Position: refs/branch-heads/2743@{crosswalk-project#198}
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
@tarunban
Fix null crash in NetInfo
5c61ddc 
Check if the host String is null before computing the hash of 
the String.

Bug: 761282
Change-Id: I76302c544e101bfabba56d77ce0ea40581057176
Reviewed-on: https://chromium-review.googlesource.com/662018
Commit-Queue: Tarun Bansal <tbansal@chromium.org>
Reviewed-by: Kentaro Hara <haraken@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#501160}(cherry picked from commit 038025e)
Reviewed-on: https://chromium-review.googlesource.com/665217
Reviewed-by: Tarun Bansal <tbansal@chromium.org>
Cr-Commit-Position: refs/branch-heads/3202@{crosswalk-project#198}
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.
3 participants
@rakuco @crosswalk-trybot @darktears