Skip to content

GitLab

Switch branch/tag
  1. 12 Feb, 2015 1 commit
  3. 28 Jan, 2015 1 commit
  5. 23 Jan, 2015 1 commit
    • boliu's avatar
      Cherry-pick: gpu: Allow virtual context for in-process gpu thread · 86ae9e78
      boliu authored 
      Clean cherry-pick of chromium
crrev.com/d6552661356cafdc55df5e5d6abf378c9065c04c

Note crbug.com/450396 not an issue in m39.

BUG: 18926944

Original description:

Virtual context is turned on according to FeatureInfo::Workarounds.

Note that this doesn't work on Android WebView until crbug.com/450396
is fixed.

Change-Id: Ib6c997f3929293023288188c4766c1a4b032c407
      86ae9e78
  7. 12 Jan, 2015 1 commit
    • Torne (Richard Coles)'s avatar
      Update V8 deps for PRODUCT_PREBUILT_WEBVIEWCHROMIUM. · 5b55ba83
      Torne (Richard Coles) authored 
      When using a prebuilt chromium, the build was failing as the set of V8
makefiles being included is no longer correct with the M39 version of
Chromium. Remove generate_trig_table which no longer exists, and add
v8_libplatform which is a new dependency required to build the host
mksnapshot binary.

Bug: 18675666
Change-Id: Ic00eea284a5b40af41883e000e092ee16d6bfcc7
      5b55ba83
  9. 18 Dec, 2014 1 commit
    • boliu's avatar
      Cherry-pick: Fix canvas to webgl sharing in android webview · 1616e00f
      boliu authored 
      Clean cherry-pick of chromium
crrev.com/7476088d404e3b04f2cf805f3e0622283606ea77

BUG: 18685397

Original description:

A small and safe workaround to get some failing webgl conformance tests
passing in android webview.

Change-Id: I56d718f1bd124a9d9aad72c92e0ce57e554c9b57
      1616e00f
  11. 17 Dec, 2014 1 commit
  13. 15 Dec, 2014 4 commits
    • hush's avatar
      Cherry-pick: Don't schedule more invokeFunctors than necessary. · 141411bc
      hush authored 
      Cherry-pick with conflicts of
crrev.com/81c62e2d9601d38c44f71857dfabc31e2726cd70

BUG: 18706908

Original description:

The problematic sequence of events is as follows:
1. ShouldRequestOnNonUiThread, which posts a closure
(request_draw_gl_closure_) to UI thread
2. That closure gets run on UI thread, and it schedules the invokeFunctor
with Android framework
3. Before the corresponding invokeFunctor actually happens on RT (which
is DrawGL process mode),  ShouldRequestOnUiTdread is called on the UI
thread. At this point, pending_non_ui_ is not null, we cancel the
callback, which does nothing, because WebView has already scheduled an
invokeFunctor with the Android framework in Step 2. Then we schedule
another invokeFunctor immediately on the UI thread. So there are 2
invokeFunctors queued in Android framework in this case.

This CL tries keep track of whether or not we've
queued an invokeFunctor in Android framework already.

Change-Id: I0a084d92ea74412c3938645d63170604e6352318
      141411bc
    • Hui Shu's avatar
      Remember user's decisions on SSL errors. · 83109aa2
      Hui Shu authored 
      Cherry pick from https://codereview.chromium.org/794023002

Original description:
After CL: https://codereview.chromium.org/369703002, Android
WebView just has a NULL SSLHostStateDelegate. So it does not remember
any user decisions on SSL errors. This is a regression of behavior from
L (m37).

History:
JB behavior: Larger error codes are assumed to have higher severity. And
if the user has allowed an SSL error with a high severity, the user
won't be prompted for a lower severity SSL error.

K and L behavior: A specific SSL error will be allowed only if the error
bit field is a subset of previously allowed error codes.

trunk behavior for webview (without this patch): We don't remember
user's decision at all.

This CL:
Maintain the same behavior with K and L.

Conflicts:
  android_webview/browser/aw_browser_context.h
  android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
  android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java

BUG: 18665047
Change-Id: I0ecbc0b78e9323ef911cd61679fec5e4a6146489
      83109aa2
    • Selim Gurun's avatar
      Merge "do not send traffic to localhost through proxy for android" into m39 · 366f592b
      Selim Gurun authored
      366f592b
    • Selim Gurun's avatar
      do not send traffic to localhost through proxy for android · 2705cc61
      Selim Gurun authored 
      Bug: 18736075

Cherry-pick https://codereview.chromium.org/796003002/.
Clean cherry-pick.

The proxy config service for android does not allow
one to configure an exception for localhost be made.
The implementation for Linux did allow this in:
   proxy_config_service_linux.cc
it just seems it was overlooked for android.

Instead of adding in the ability to configure
localhost as an exclusion, it makes more sense
to just force the exception; it seems silly to
send traffic for localhost through a proxy.

This patch addresses the following bug in android:
   https://code.google.com/p/android/issues/detail?id=37031

Change-Id: I3b654d45e9f534961cae9147374023ef597aa927
      2705cc61
  15. 12 Dec, 2014 1 commit
  17. 09 Dec, 2014 3 commits
    • Mikhail Naganov's avatar
      Cherry-pick: [Android] Java Bridge: handle requests from Java Script on the background thread · c64ad5c2
      Mikhail Naganov authored 
      Same as the upsteam patch, with purely syntactic adaptations of "override"
keywords usage to the legacy style used in M39.

Bug: 18520475

Original description:

commit a4b0d4cc0b9780aecd3e23a94293b2e3002baf7e
Author: mnaganov <mnaganov@chromium.org>
Date: Tue Dec 09 13:30:08 2014

[Android] Java Bridge: handle requests from Java Script on the background thread

This allows the page code that calls into injected objects methods to run even
if the browser UI thread is blocked (in WebView, the browser UI thread is the main
app thread, and sometimes people use synchronization primitives there that wait
on some action performed by the injected object, see the bug for an example).

In this CL, we make the minimal required amount of changes in order to simplify
cherry-picking into older branches. A cleanup CL (or CLs) will follow.

High-level description of changes:

 1. We intercept messages from renderers on the IO thread using BrowserMessageFilter
    and handle Java Bridge messages entirely on the background thread. This implies
    the following changes:

 2. GinJavaBridgeDispatcherHost has become RefCountedThreadSafe
    (via BrowserMessageFilter)

 3. We have to use route IDs of RenderFrameHosts instead of pointers to them, as
    we can't access RFHs from IO or background threads.

 4. Objects registry is now accessed from UI and background threads, and we have to use
    locking. We can't anymore restrict access to the registry to a single thread.
    This also means we can't anymore implement the registry using IDMap, as it is
    explicitly non-thread-safe.

 5. A lot of code was removed, as we now serve synchronous requests from renderers
    without inter-thread hopping!

 6. Of course, a new regression test has been added that now passes.

BUG=438255

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

Change-Id: I9e517024878f0b95a32f95524de4f8017ba8dc21
Cr-Commit-Position: refs/heads/master@{#307460}
      c64ad5c2
    • Mikhail Naganov's avatar
      Update the code dealing with scoped_ptrs and scoped_refptrs in JavaBridge · 64a92734
      Mikhail Naganov authored 
      Required for the main patch fixing b/18520475.

These changes are purely in the syntax -- retrieve the underlying raw pointer
directly, instead of relying on overridden operators. This is to match
the current code in M40 and trunk.

Bug: 18520475
      64a92734
    • Mikhail Naganov's avatar
      Cherry-pick: [Android] Fix a subtle issue in Java Bridge regarding interfaces removal · 83eff509
      Mikhail Naganov authored 
      Required for the main patch fixing b/18520475.

Bug: 18520475

Original description:

commit 4d4182c4af0a11a1ad5acae88f9abe2b76853fe1
Author: mnaganov <mnaganov@chromium.org>
Date: Mon Dec 01 11:59:14 2014

[Android] Fix a subtle issue in Java Bridge regarding interfaces removal

Update JavaBridgeBasicsTest.testRemovalNotReflectedUntilReload to actually
call Java GC after removing the interface, and verify that the Java object
is still callable from the page side. Fix the code to make the test pass.

BUG=437761

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

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

Change-Id: If12d53e3aad721e5822d8e12c85f1240e1aac5e6
      83eff509
  19. 08 Dec, 2014 2 commits
  21. 05 Dec, 2014 1 commit
  23. 04 Dec, 2014 2 commits
  25. 03 Dec, 2014 3 commits
  27. 01 Dec, 2014 2 commits
  29. 25 Nov, 2014 2 commits
  31. 22 Nov, 2014 2 commits
  33. 21 Nov, 2014 7 commits
  35. 18 Nov, 2014 2 commits
    • boliu's avatar
      Cherry-pick: Workaround NVidia eglWaitSyncKHR bug · 8b70b825
      boliu authored 
      Clean cherry-pick of chromium
crrev.com/ba561e7fb76fef1a6dfff772b08bd6dde5c94bc9

BUG: 17690996

Original description:

Workaround is to fallback to client wait.

Change-Id: I8d6b41f5bc94307faecffe1401b660a3a722e24d
      8b70b825
    • boliu's avatar
      Cherry-pick: gpu: Use egl client wait if server wait not available · 8fd87632
      boliu authored 
      Clean cherry-pick of chromium
crrev.com/bf634aa33aa21ce25ef680bca6305b9ad64acfbc

BUG: 17690996

Original description:

Check for EGL_KHR_wait_sync extension before calling eglWaitSyncKHR. If
extension not present, fallback to EGL_KHR_fence_sync and
eglClientWaitSyncKHR.

Change-Id: Ia3dad04d468ffebb88b549adb06a310f933d9b5b
      8fd87632
  37. 17 Nov, 2014 1 commit
  39. 15 Nov, 2014 1 commit
    • Selim Gurun's avatar
      Disable channel id · 3c9a4a7b
      Selim Gurun authored 
      Bug: 18297802

Cherry-pick disable channel id

Android webview does not use channel id since there is no API
to share channel ids and this would break some apps that use
different network stacks. This change is to explicitly
disable it.

BUG=433427
internal bug b/18297802

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

Change-Id: Iefd0f61c922227d562667f4a53f0bb35b03b444a
Cr-Commit-Position: refs/heads/master@{#304316}
      3c9a4a7b
  41. 14 Nov, 2014 1 commit