Chromium_org: Merge 4.4.3 Test
Squashed commit of the following:

commit 69db19fcd0d02befbc5d3bac2075be563f79b84f
Author: Bo Liu <boliu@chromium.org>
Date:   Tue Mar 25 17:12:32 2014 -0700

    Fork: Disable GLSL translator

    Android webview is single-process and does not have webgl enabled, so
    does not gain any security benefits from this.

    BUG: 13635247
    Change-Id: Ia3b67a4a90ef057f243fc5ed5e747a94df4d1300

commit e3f98c79a899b1bf5761628c193add756a2a5726
Author: Bo Liu <boliu@chromium.org>
Date:   Tue Mar 25 16:48:17 2014 -0700

    Cherry-pick: aw: Use minimum_accelerated_2d_canvas_size to turn canvas on/off

    Cherry-pick of https://codereview.chromium.org/211623005/

    Original description:

    Always set accelerated_2d_canvas_enabled and use
    minimum_accelerated_2d_canvas_size to turn canvas on and off. This is a
    slight abuse but avoids accelerated_2d_canvas_enabled setting also
    affecting compositing mode in blink

    BUG: 13635247
    Change-Id: Iba70bc922fe194c0396613023581cb3f731b5e5e

commit 00c9a7112203d1caeb42a65f1f841cc05ff51a11
Merge: 3124836 31d52e2
Author: The Android Automerger <android-build@google.com>
Date:   Tue Mar 25 17:06:55 2014 -0700

    merge in klp-mr2-release history after reset to klp-dev

commit 3124836952dc1f2dbcc4d665d4d1ecf29644eaa1
Author: Ben Murdoch <benm@google.com>
Date:   Tue Mar 25 18:17:03 2014 +0000

    Fix for potential crash displaying <select> dialog

    Reland fix for b/11653861 which was accidentally lost in an
    upstream refactoring.

    Bug: 13635997
    Change-Id: Ib3a74396a4c301c0db8da268cce05a0d846ca250

commit 516693c85b86cefe141e31750bf0b23abdbfad19
Author: Bo Liu <boliu@google.com>
Date:   Mon Mar 24 16:56:28 2014 -0700

    Cherry-pick: Do not clear root frame buffer for android webview

    Cherry-pick of unlanded https://codereview.chromium.org/210443004/

    Original description:

    Android webview does not own the surface that compositor is drawing
    into, and so should in general not it before draw.

    BUG: 13134274
    Change-Id: I90e8f39bd455f2494dbdcf48a40f15f837cf76fb

commit 31d52e29ddfd868db629105ec63d20d904ea79da
Merge: 3142a81 261a3cf
Author: The Android Automerger <android-build@google.com>
Date:   Mon Mar 24 06:00:41 2014 -0700

    merge in klp-mr2-release history after reset to klp-dev

commit 3142a81447381f3b25a108f3783d0e177f14ba54
Author: Torne (Richard Coles) <torne@google.com>
Date:   Fri Mar 21 16:32:03 2014 +0000

    Cherry-pick: Set thread names to be visible in debuggers

    Cherrypick of upstream trunk r250981

    > Like linux, on android we can get the thread names to show up in the
    > debugger by setting the process name for the LWP.
    >
    > This change sets the name of the calling thread using prctl.
    >
    > BUG=332881
    >
    > R=jam@chromium.org
    > R=torne@chromium.org
    >
    > Review URL: https://codereview.chromium.org/144943004

    Bug: 13577599
    Change-Id: I5f350bcb078f27ace005168d414bfc84d26b012b

commit 261a3cf178b06cddfaac1db5ece768e3a17835d9
Merge: f6f1cfe 230e813
Author: The Android Automerger <android-build@google.com>
Date:   Thu Mar 20 06:00:40 2014 -0700

    merge in klp-mr2-release history after reset to klp-dev

commit f6f1cfefca79cbef43cdc100e2288dd517f4aaea
Author: Ben Murdoch <benm@google.com>
Date:   Wed Mar 19 19:47:30 2014 +0000

    cc: Replace recorded region with direct map lookup

    Resolve conflicts of https://codereview.chromium.org/196343005/
    merging to release branch.

    Did not resolve conflicts in tests we don't build:
     cc/resources/tile_manager_perftest.cc
     cc/resources/tile_manager_unittest.cc

    Bug: 13302269

    Original description:
    cc: Replace recorded region with direct map lookup

    If the viewport is extremely large, then keeping track of the recorded
    region in PicturePile with an actual Region becomes extremely slow due
    to a large number of rects being inserted into it.

    The recorded region behaves as a cache to the picture map; it's a
    simpler way to know the state of all of the recordings contained within.

    In practice, the recorded region is only used for two things: a "should
    this pile bother to create tilings" optimization and a "can a tile be
    rastered in this content rect" check aka CanRaster.

    The optimization for "should create tilings" is replaced by a
    has_any_recordings_ boolean, which could have a false positive in theory
    (resizing to a smaller but non-empty size), but which shouldn't happen
    in practice. Even if it did, this would only be a performance penalty
    for creating no-op tilings that can't create tiles (due to CanRaster).

    The CanRaster check is replaced by a viewport hint, as most tiles that
    the tiling creates will be inside of the very large expanded viewport
    during recording, turning an expensive Region.Contains check to a
    Rect.Contains one. In the edge cases where tiles are being created
    outside of that expanded viewport, it will check the picture map
    directly. This should only happen when the user has scrolled thousands
    of pixels without a commit.

    BUG=353346
    Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256953

    Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=257852

    Change-Id: I8ed3bbaab8f8b7a72c10fd764d2c3f6331f70ded

commit 48d0fb7507fb901727b8ed545140124cfeec593e
Author: Ben Murdoch <benm@google.com>
Date:   Wed Mar 19 15:52:58 2014 +0000

    cc: Add a tiling iterator that doesn't include borders

    Resolve conflicts from https://codereview.chromium.org/202753002/
    merged to WebView release branch.

    Bug:13302269

    Original description
    cc: Add a tiling iterator that doesn't include borders

    This iterator is needed to reland
    https://codereview.chromium.org/196343005/ correctly, as whether or not
    a set of picture tiles can raster a particular rect needs to ignore
    borders.

    BUG=353346
    Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=257688

    Change-Id: I965befecd57c5fa470927143cc8f5de828e9e699

commit 230e813e2f5430e9af8ceede2b4877b9aa605ba6
Merge: fe24f36 5f0ea8d
Author: The Android Automerger <android-build@google.com>
Date:   Wed Mar 19 06:00:47 2014 -0700

    merge in klp-mr2-release history after reset to klp-dev

commit 5f0ea8d60a95b31abe0afb275d70600d26390700
Merge: 9b49902 55e9ed4
Author: The Android Automerger <android-build@google.com>
Date:   Tue Mar 18 06:00:35 2014 -0700

    merge in klp-mr2-release history after reset to klp-dev

commit fe24f36e7a3125d43f5817092cc33f90774df791
Author: Ben Murdoch <benm@google.com>
Date:   Tue Mar 18 10:30:45 2014 +0000

    Add CleanSpec after system skia switch

    Bug: 13246311
    Change-Id: I83ce2ee46bc5148045058426c405a9f86b9b939d

commit 9b49902f8e3d0543e2d5b187f0a25c8f15daa6e4
Merge: 9a996fb 8a6e767
Author: Ben Murdoch <benm@google.com>
Date:   Tue Mar 18 10:04:22 2014 +0000

    Merge "Revert "Revert "Use system skia for WebView.""" into m33

commit 8a6e767a9a0f68da5436efe3d7faeb4aede10357
Author: Ben Murdoch <benm@google.com>
Date:   Mon Mar 17 20:56:09 2014 +0000

    Revert "Revert "Use system skia for WebView.""

    Build issues should now be resolved.

    This reverts commit 4d135918e7e9a7cf35ec3e36a91ad974f5b69da1.

    Change-Id: I974092865acb959febf4516c25f570e6e249cb49

commit 55e9ed44fca6fe94d30c3188c0c041c6e7a605ac
Merge: 9a996fb 38a962e
Author: The Android Automerger <android-build@google.com>
Date:   Mon Mar 17 06:00:49 2014 -0700

    merge in klp-mr2-release history after reset to klp-dev

commit 9a996fbf4241a4f266b519bd5227e348f13e0859
Merge: d2866e0 4d13591
Author: Bart Sears <bsears@google.com>
Date:   Sat Mar 15 21:39:22 2014 +0000

    Merge "Revert "Use system skia for WebView."" into m33

commit 4d135918e7e9a7cf35ec3e36a91ad974f5b69da1
Author: Bart Sears <bsears@google.com>
Date:   Sat Mar 15 21:35:15 2014 +0000

    Revert "Use system skia for WebView."

    This CL was causing some build failures in klp-modular-dev and
    klp-volantis-dev.  Reverting while we investigate.

    This reverts commit 63baaa137ed8bfe0b24385a0e1c944cd3dd811bd.

    Change-Id: Ib3c84431ee294efbb243387afde820ca33082186

commit d2866e016307567e10190c0e2e9ab2fc78438be2
Merge: 979ef06 63baaa1
Author: Bart Sears <bsears@google.com>
Date:   Sat Mar 15 03:53:34 2014 +0000

    Merge "Use system skia for WebView." into m33

commit 979ef06dc14aa57cc6b757f7e122f8728085272d
Author: Bo Liu <boliu@chromium.org>
Date:   Fri Mar 14 13:30:13 2014 -0700

    Cherry-pick: gpu: Add extension check when initializing MailboxSync

    Cherry-pick of https://codereview.chromium.org/196653019

    Conflicts:
        android_webview/lib/main/aw_main_delegate.cc
        ui/gl/generate_bindings.py

    Original description:

    And do not enable accelerated canvas in webview if extensions are
    missing.

    BUG: 13328348
    Change-Id: I127cce53c66e81471c6ccfcabad675c5b9aada07

commit 63baaa137ed8bfe0b24385a0e1c944cd3dd811bd
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Mar 13 15:03:28 2014 +0000

    Use system skia for WebView.

    Define use_system_skia when building for WebView, and update makefiles.

    Bug: 13246311
    Change-Id: Ie0b28dbbac7cc8e6afca04bc83af8aad6e46ebb8

commit 6324be499f7a618fe395a9f687123119960ce63c
Author: Bo Liu <boliu@google.com>
Date:   Fri Mar 14 08:24:56 2014 -0700

    Merge diff: gpu: Mailbox emulation with EGLImage

    Merge diff between https://codereview.chromium.org/180723023/ PS6 and
    the commit crrev.com/r256962

    BUG: 13328348
    Change-Id: I354f56bddd7d8e387e5f2edc342d87c0a68138f8

commit 34d5ff371b445afddb3c51ffc75ca0805b625007
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date:   Fri Mar 14 06:24:42 2014 +0000

    Cherry-pick: aw: Disable hardware features for software layer

    Cherry-pick of crrev.com/r257037.

    Conflicts:
    	android_webview/java/src/org/chromium/android_webview/AwContents.java

    Original description:

    If the webview is put into a software layer, then disable hardware only
    features such as accelerated canvas even if we are attached to a
    hardware view tree.

    Previously we did not take layer type into account.

    BUG: 13328348
    Change-Id: I1e43056d52074ea79c18f1a56cfe3a9e7e1835d0

commit d10938716716a1a4c0abe2b5e2bbdff8a8e871ec
Author: Ben Murdoch <benm@google.com>
Date:   Fri Mar 14 10:36:09 2014 +0000

    Record Chromium merge at DEPS revision 33.0.1750.166

    This commit was generated by merge_to_master.py.

    Change-Id: I344ccbe5936ea750ec97cfe14fe5ef7e3bfa23a7

commit 577f0d8067567e25b63130cd6d3c45f50df1221a
Author: Ben Murdoch <benm@google.com>
Date:   Fri Mar 14 10:36:09 2014 +0000

    Merge from Chromium at DEPS revision 33.0.1750.166

    This commit was generated by merge_to_master.py.

    Change-Id: I13450f191a4974fca5c79afcc0cc1806bb4411a3

commit cf4758d7a03da27b27e5bb0cc65a5ae07fe37490
Merge: 1c2127d 7a75445
Author: Hui Shu <hush@google.com>
Date:   Thu Mar 13 23:44:29 2014 +0000

    Merge "Cherry pick: Revert "hide the input method window when the user is done typing"" into m33

commit 7a7544588ad14f14dbe996d9799aa655718ae0a6
Author: Hui Shu <hush@google.com>
Date:   Thu Mar 13 15:52:45 2014 -0700

    Cherry pick: Revert "hide the input method window when the user is done typing"

    Upstream bug description:
    BUG=340100
    Review URL: https://codereview.chromium.org/197763002
    Committed:
    https://src.chromium.org/viewvc/chrome?view=rev&revision=256750

    BUG: b/11157219
    Change-Id: I544a36717b8dcdf715d2ab7c3de20ae0d788c1fa

commit 1c2127d68ebf98646724ece9d687a5b9144c8a25
Merge: 394e20c 7e573dc
Author: Hui Shu <hush@google.com>
Date:   Thu Mar 13 20:51:14 2014 +0000

    Merge "Always invalidate the webview when requested to do so." into m33

commit 38a962ee123a727c1b029c8bd74ba6044b425e4b
Merge: f0d1159 715d62e
Author: The Android Automerger <android-build@google.com>
Date:   Thu Mar 13 12:08:19 2014 -0700

    merge in klp-mr2-release history after reset to klp-dev

commit 7e573dc0c327dc410a4d9b5656a20c292d6b4766
Author: Hui Shu <hush@google.com>
Date:   Thu Mar 13 10:56:53 2014 -0700

    Always invalidate the webview when requested to do so.

    The Android framework will ignore the unnecessary invalidates for you.
    This fix is part of the refactoring in upstream:
    https://codereview.chromium.org/176543004

    BUG: b/13433290
    Change-Id: I87c637f8c15123416ed3df7d13c687917b500afa

commit 394e20cdf68b5b22a6525fc5ce7168a218579435
Author: Ben Murdoch <benm@google.com>
Date:   Thu Mar 13 17:53:26 2014 +0000

    Revert "Use system skia for WebView."

    This reverts commit f0d11593d7d32a9316daf1f6bff047b8cc6735fb.

    Change-Id: I7ab7c17d5eb21d9e75a512ea5bb152d020631496

commit f0d11593d7d32a9316daf1f6bff047b8cc6735fb
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Mar 13 15:03:28 2014 +0000

    Use system skia for WebView.

    Define use_system_skia when building for WebView, and update makefiles.

    Bug: 13246311
    Change-Id: I1510c0684ea6388048b88e52e42e8ad5ffa35caf

commit dea9c967c8c8a497aa27f6569863d65b7f0cfcbc
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Mar 12 18:49:40 2014 +0000

    Set required skia flag to build against system skia.

    Disable deprecation warnings from the skia interface when building
    against the system skia.

    Bug: 13246311
    Change-Id: Ic93427f825175384a1a9216d1fbed354d32ccb76

commit 715d62e95d795149302d78383a665f9aaeae7fa6
Merge: 1662a88 9d9951a
Author: The Android Automerger <android-build@google.com>
Date:   Thu Mar 13 06:00:53 2014 -0700

    merge in klp-mr2-release history after reset to klp-dev

commit 6d5f7a33a78c7c3a3ae05d0724b4abcab531b29f
Author: Bo Liu <boliu@google.com>
Date:   Wed Mar 12 20:24:10 2014 -0700

    Fork: Early out WebMediaPlayerAndroid::copyVideoTextureToPlatformTexture

    This is to prevent crash for reading back a video into a canvas.
    This never worked in webview with software canvas, so not a regression.

    BUG: 13328348
    Change-Id: I6d9d722f27603c9669a2a92cde54a3e6d852ad8b

commit 871ad5406650fa38062582bc125fffcd2f6d5159
Author: sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date:   Wed Mar 12 18:57:35 2014 -0700

    Cherry-pick: Mailbox emulation with EGLImage

    Cherry-pick of https://codereview.chromium.org/180723023/ PS6

    Conflicts:
    	android_webview/lib/main/aw_main_delegate.cc
    	gpu/command_buffer/service/gles2_cmd_decoder_unittest.cc
    	gpu/command_buffer/service/texture_manager.h

    Original description:

    This adds support for sharing image buffers through EGLImage-like
    semantics. It's made to look as if textures were shared through
    mailboxes by creating multiple Texture instances and synchronizing
    parameters and image handle etc. across MailboxManager instances (for
    example across contexts and possibly GPU threads).

    Since GL clients are async anyways, it only guarantees that changes to
    the texture structure or filters become visible after the client has
    waited on a sync point, while fences are used to synchronize read/write
    access to the underlying buffer.

    BUG: 13328348
    Change-Id: I4beae39e72249ff63e03e51c5db9e62bd5998b6c

commit 11598a0b86407edcb90d17cf39c8b7718485b573
Author: sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date:   Tue Feb 25 18:13:27 2014 +0000

    Cherry-pick: GLInProcessContext: Implement global sync points

    Clean cherry-pick of crrev.com/r253201

    Original description:

    Replaces the implementation that relied on flush ordering since that
    is not guaranteed when running different service threads.

    BUG: 13328348

    Change-Id: I1ca360324399e0de7220a733d2aca47772838e02

commit c4a24b18634a014e91bb0c7cb2ea75e9dd0caa14
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date:   Tue Feb 25 05:01:29 2014 +0000

    Cherry-pick: Keep Compositor Offscreen context in sync compositor

    Clean cherry-pick of crrev.com/r253081

    Original description:

    This is used as the share context for video on main thread. Until we can
    properly clean up the video context, just skip releasing the this
    context to avoid issues during mode switch.

    BUG: 13328348

    Change-Id: Ie0c10a932299f395c0acdac4c47477541aae0c51

commit a1a4478c1f45e01b398ca4776fc933a77b33e3ce
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date:   Tue Feb 18 22:11:59 2014 +0000

    Cherry-pick: cc: Update Main RendererCapabilities on DeferredInitialize

    Clean cherry-pick of crrev.com/r251853 with additional modifications.

    Original change depends on crrev.com/r246957 and modified to remove this
    dependency.

    Original description:

    Also update caps on ReleaseGL. The updated RendererCapabilities
    are posted back to the main thread. Main thread layers will
    receive OnOutputSurfaceCreated (should be renamed to
    OnRendererCapabilitiesChanged) when this happens. Note this
    is also called on first renderer initialization.

    BUG: 13328348

    Change-Id: I42a71879690d52a8e237bd86a1f7cfd99c851687

commit 29b9551cc916527928033a672e723526b237da3f
Author: sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date:   Thu Feb 13 14:25:25 2014 +0000

    Cherry-pick: Support multiple service instances with GLInProcessContext

    Cherry-pick with conflict of crrev.com/r250984

    Conflicts:
    	content/browser/android/in_process/synchronous_compositor_factory_impl.cc
    	content/browser/android/in_process/synchronous_compositor_factory_impl.h
    	content/browser/android/in_process/synchronous_compositor_output_surface.cc

    Conflicts are due to not having crrev.com/r249099 and crrev.com/r244697.
    Moved had to fix some includes and add gfx::GLSurface::InitializeOneOff to
    SynchronousCompositorFactoryImpl::SetDeferredGpuService.

    Original description:

    For example, it supports running two GPU threads.

    This simplifies the scheduling/queuing logic in InProcessCommandBuffer
    a bit and moves the non-thread/queue implementation out to WebView by
    allowing for passing in a InProcessCommandBuffer::Service instance
    when creating a context.

    BUG: 13328348

    Change-Id: Ia0c108cdf0275dfbfedb3cf0b27500d3f57fcf49

commit da769a35c9c196554ed122b3eb0030370c4503d7
Author: sievers@chromium.org <sievers@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date:   Wed Feb 12 18:51:33 2014 +0000

    Cherry-pick: gpu: Use a single container for GLInProcessContext share group

    Cherry-pick with conflict of crrev.com/r250765

    Conflicts:
    	gpu/command_buffer/service/in_process_command_buffer.cc

    Original description:

    Instead of having two global containers for GLInProcessContext
    and InProcessCommandBuffer, use a single one for the former
    and pass in the service-side share group while we are holding the
    lock anyways.

    This makes it simpler to support multiple service threads.

    BUG: 13328348

    Change-Id: Ia6d5817688e90cbd00d9cc6077d82e59c3933a0d

commit 10fa3987b403dcc25174693e4947dd4cd8b8612e
Author: piman@chromium.org <piman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date:   Sat Feb 8 03:38:32 2014 +0000

    Cherry-pick: Stop using HMAC for gpu mailboxes

    Cherry-pick with conflict of crrev.com/r249922

    Conflicts:
    	gpu/command_buffer/tests/gl_texture_mailbox_unittest.cc

    Original description:

    For a long time, we've been using HMAC to sign the mailbox names on the GPU
    process. However, we don't actually need the mailbox names to be guaranteed to
    be generated by the GPU process, we only need to ensure they're unguessable.

    The HMAC signature and verification has several costs:
    - the cost to sign the mailbox
    - the cost to verify the mailbox
    - the initialization cost (e.g. starting NSS in the GPU process)

    We can actually save all that cost, by just making the mailbox names
    (crypto-)random.

    BUG: 13328348
    Change-Id: I3338a92a0908a17099d2d92de1c2bca266684fda

commit 5bbd2b0e0089bd78e3d3cc82ac95523f0a190689
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date:   Thu Jan 23 21:30:47 2014 +0000

    Cherry-pick: cc: Free Mailbox on TextureLayerImpl::ReleaseResources

    Clean cherry-pick of crrev.com/r246690

    Original description:

    Add unit tests to run through this code path

    BUG: 13328348

    Change-Id: I7c8e0311d666cff13248dee6addec181c5334ab2

commit 37167aa070a3a89c84438971b445f2463aaa7b04
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date:   Fri Jan 17 22:50:01 2014 +0000

    Cherry-pick: [Android WebView] Turn on accelerated canvas based on View.isHardwareAccelerated

    Clean cherry-pick of crrev.com/r245648

    Original description:

    In onAttachedToWindow, check that if the view is hardware accelerated,
    then enable hardware accelerated 2d canvas. Similarly disable canvas on
    detach.

    Note that accelerated 2d canvas is still off by default, but this patch
    adds a command line switch to turn it on.

    BUG: 13328348

    Change-Id: I7ceb7b4ef6cefca6b37f7911357fbcd9e2dbef6b

commit 2e7d13f35e0857b017e21f672352906eddeedb56
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date:   Fri Jan 17 20:58:59 2014 +0000

    Cherry-pick: [Android WebView] Do not block GetOffscreenContextProviderForMainThread

    Clean cherry-pick of crrev.com/r245613

    Original description:

    Before this, we fail create a main thread shared context if there are no
    webviews in hardware initialized mode. The future plan is for
    accelerated 2d canvas and webgl to use a shared context with the gpu
    thread service, but keep inline video using the ui thread service.

    Currently only video uses main thread context for webview, so for now,
    only gate context creation for main video on having a
    hardware-initalized webview. This makes turning on accelerated canvas
    more convenient.

    BUG: 13328348

    Change-Id: I1ade9f1c1b738fdbd5045fb7523958e5eb2c672d

commit 87f58e12eeb69005db1f255eab8e88bab8977eec
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date:   Wed Jan 15 12:54:58 2014 +0000

    Cherry-pick: cc: Add RendererCapabilitiesImpl

    Clean cherry-pick of crrev.com/r244870

    Original description:

    Separate RendererCapabilities and RendererCapabilitiesImpl classes to
    separate out capabilities that are not needed on main thread to be
    not copied to main thread. This is to prepare for the future when main
    and impl RendererCapabilities copies can temporarily get out of sync,
    and there are less values to worry about.

    BUG: 13328348

    Change-Id: I68b85861bb85d07b9b23da78c55eac140c30ebd7

commit 8218cdcecd3977329cf3e7c0365c46675a42c6a0
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date:   Tue Jan 7 17:07:45 2014 +0000

    Cherry-pick: Move SynchronousCompositorFactoryImpl into separate h/cc files

    Clean cherry-pick of crrev.com/r243314

    Original description:

    This is a long overdue clean up to make future changes in this area
    saner. Only shuffling code and these cosmetic changes:

    Removed unused SynchronousCompositorImpl* argument from
    SynchronousCompositorFactoryImpl::CompositorInitializedHardwareDraw
    and SynchronousCompositorFactoryImpl::CompositorReleasedHardwareDraw.

    Add virtual SynchronousCompositorFactory destructor.

    BUG: 13328348

    Change-Id: I53511ada3763d837de091b7e8d8f0e8735487335

commit 1662a88d45c1e29e1d8e5ac4625605a078c6d5a6
Merge: 613f9f2 04fded3
Author: Hui Shu <hush@google.com>
Date:   Thu Mar 13 01:17:49 2014 +0000

    Merge "Set the original url correctly if the frame is loaded via loadData Base URL" into m33

commit 04fded3e627c9cb50145efff1cea488cb394a045
Author: Hui Shu <hush@google.com>
Date:   Wed Mar 12 16:12:28 2014 -0700

    Set the original url correctly if the frame is loaded via loadData Base URL

    Upstream fix: https://codereview.chromium.org/176883012
    BUG: b/13206940
    This is not a direct cherry pick because this code schange get refactored
    into render_frame_impl in chromium trunk.

    Change-Id: If807722dfee9b8570bb0b54e53c383f857a57fd1

commit 9d9951a7c80f71286ff8284c7f098223cea7567e
Merge: 613f9f2 3043209
Author: The Android Automerger <android-build@google.com>
Date:   Wed Mar 12 06:00:40 2014 -0700

    merge in klp-mr2-release history after reset to klp-dev

commit 613f9f21cff8daa66be408061bebed49676cedeb
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date:   Tue Mar 11 15:49:10 2014 +0000

    Cherry-pick: aw: Always call computeScrollOffset for fling state

    Cherry-pick of crrev.com/r256242

    Original description:

    Apparently computeScrollAndAbsorbGlow can be skipped in certain
    situation and we would be stuck in fling state forever.

    BUG: 13227361
    Change-Id: Ib6380b1e675e6c6d252583a93db33aeddf9da73d

commit ccaa519e119b27f3706b11c7fa3bb9329b2efd52
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date:   Tue Mar 11 03:59:58 2014 +0000

    Cherry-pick: cc: Do not skip TileManager::ManageTiles due to invalid viewport

    Clean cherry-pick of crrev.com/r256122

    Original description:

    Tile ordering information is updated in
    PictureLayerImpl::UpdateTilePriorities, which is already
    skipped if viewport is not valid. So there is no point in
    also skipping TileManager::ManageTiles, which currently
    may make TileManager get stuck in smoothness mode forever.

    BUG: 13227361

    Change-Id: I6892a8fd9d0dfe6169ac26ef1133e622ec716106

commit 3043209a3273ce436c4ae3fe787c250a0bd2265b
Merge: c468a50 32fb0be
Author: The Android Automerger <android-build@google.com>
Date:   Wed Mar 5 07:53:02 2014 -0800

    merge in klp-mr2-release history after reset to klp-dev

commit c468a5018071df0fd4e569618f753977b63a90b6
Author: Kristian Monsen <kristianm@google.com>
Date:   Mon Sep 23 14:08:03 2013 -0700

    Allow all mixed content

    Only for K releases, to match classic before we can introduce a new
    API. When there is a new API we will turn it off by default.

    Tracking klp-mr2 fix in bug 13301630 (fix for origianl issue was
    tracked in bug 10570054)

    Change-Id: Idaf46def48020d22cacb2b55c4205697117e970b
    (cherry picked from commit 3e35739886bcb31eef708caed3d7e45aa522b142)

commit b04959b95f497caabd7b35709f19ee0562090789
Merge: ca49023 258a408
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Mar 4 18:03:21 2014 +0000

    Merge "Minimise logging in release branch." into m33

commit 258a408d613669275f708aff369210a05fd6fd86
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Mar 4 17:33:28 2014 +0000

    Minimise logging in release branch.

    Make the release branch have minimal logging like offical Chrome. Also
    disable NOTIMPLEMENTED() as the messages generated are not actionable by
    app developers.

    Bug: 11505403
    Change-Id: I1513f6e90fe067a6564b3cc19731091e25ba0c97

commit ca4902361193251bab3a7ed8206e6f2185cae21d
Author: Ben Murdoch <benm@google.com>
Date:   Tue Mar 4 14:29:25 2014 +0000

    Record Chromium merge at DEPS revision 33.0.1750.146

    This commit was generated by merge_to_master.py.

    Change-Id: I2543f1b10f3f10001e239aa3f80d0656d90f26ee

commit f5859ba46034e02ada5ef522d9d9c09fbbddccd8
Author: Ben Murdoch <benm@google.com>
Date:   Tue Mar 4 14:29:24 2014 +0000

    Merge from Chromium at DEPS revision 33.0.1750.146

    This commit was generated by merge_to_master.py.

    Change-Id: Ica4c6efda1e5ad7b526818ac33bbce2e692086f5

commit 32fb0be6bbe7adfcbb5a69b6934964c5183d8aae
Merge: fb3a634 d2403b5
Author: The Android Automerger <android-build@google.com>
Date:   Tue Mar 4 06:00:37 2014 -0800

    merge in klp-mr2-release history after reset to klp-dev

commit 7477a40ea31ef6d3af3271fe9508dac834604667
Author: Ben Murdoch <benm@google.com>
Date:   Tue Mar 4 12:37:30 2014 +0000

    Cherry pick: [Android] Fix bug in address parser.

    Bug: 12125045

    Original description:

    [Android] Fix bug in address parser.

    Substring takes a length, not an index.

    Bug:b/12125045

    BUG=

    Committed:
    https://src.chromium.org/viewvc/chrome?view=rev&revision=253956

    Change-Id: I2685a366f70b191c85e01522efcd6be319bf4da9

commit fb3a634e80020b3bca490fae024181f5ee7bfd11
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Mar 4 10:39:26 2014 +0000

    Fork: fix fatal warning on x86.

    x86 builds with -Werror=unused-but-set-variable - remove the variable in
    question as it isn't needed.

    Bug: 13285002
    Change-Id: Id68d6365585e4e91398e1818d9f2b454a71fe2e2

commit 93a3fb344803996a78f67e59ebd52e1e63e49c10
Author: Hui Shu <hush@google.com>
Date:   Mon Mar 3 16:48:13 2014 -0800

    Cherry pick: Show IME when DPAD_CENTER is pressed

    BUG: 12117192

    Upstream bug description:
    BUG=343311
    Review URL: https://codereview.chromium.org/161933002
    Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=251447

    Change-Id: Iab6ac09b25b5b5c20cada7dd05047b2e4c44f084

commit 6680793cbf6b80d9dabf0def799cdc62ca552bf6
Author: Tao Bai <michaelbai@google.com>
Date:   Tue Feb 25 16:42:11 2014 -0800

    Cherry pick: Don't process pending prefetch events if we fail to create video decoder job

    The fix has been cherry pick to M34 in upstream.

    BUG: 13183769

    Upstream bug description:
        In the current logic, we continue to process prefetch requests if video decoder job fails to
        However, that may lead to a NPE because we do not do null check on video_decoder_job_ in our
        Since StartInternal() won't do anything if video decoder job is null, we can return early whe
        Playback will continue once a non-empty surface is passed to MSP.

        BUG=343508

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

        git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252489 0039d316-1c4b-4281-b951-d872f2087c

    Change-Id: Ia09631d8208416107c69bbbf8c4ac4e7f669c4a7

commit def509d4cf46dd7a2707d20e31ecd575d385650b
Author: Ben Murdoch <benm@google.com>
Date:   Tue Feb 25 14:07:49 2014 +0000

    Record Chromium merge at DEPS revision 33.0.1750.132

    This commit was generated by merge_to_master.py.

    Change-Id: I1c0808bd8d2484f32407a8880c556f6d44b55ca6

commit e6402284a6517cc047655bc051a7f1269e182040
Author: Ben Murdoch <benm@google.com>
Date:   Tue Feb 25 14:07:49 2014 +0000

    Merge from Chromium at DEPS revision 33.0.1750.132

    This commit was generated by merge_to_master.py.

    Change-Id: Ia453edb30860128d73b942b5f0aff9450a488f62

commit eff0ac5d8563afd5f38316cf23b971f1224757a2
Author: Bo Liu <boliu@google.com>
Date:   Mon Feb 24 14:15:35 2014 -0800

    Fork: Fix deadlock in AudioManagerAndroid.init

    SettingsObserverThread is started by UI thread, and UI thread waits for
    it to start by waiting on a lock. However the thread is started when the
    lock is not held, meaning it could start and signal the lock, all before
    UI thread even enters the lock synchronized code, thus causing the wait
    to simply deadlock.

    Fix by moving start to lock synchronized code.

    Note that Chrome m33 is going to ship with this bug unfixed. Chromium
    trunk already has this fixed. But it was only inadvertently fixed as
    part of a larger refactor, so not appropriate to cherry-pick.

    BUG: 13131862
    Change-Id: I7b758d39e6a23ac762c937271e67a3718dafcbf2

commit c4df102e74e16dbe8f83a039fa6324b9d612c96f
Author: Ben Murdoch <benm@google.com>
Date:   Mon Feb 24 15:08:35 2014 +0000

    Fork: Allow embedders to override text from scaling by system font scale

    Original change: https://codereview.chromium.org/173943002/

    Clean cherrypick into m33.

    Bug: 13083442

    Original description:

    [Android WebView] Allow embedders to override text from scaling by
    system font scale.

    Relaxes the use of system font scale. Before this patch,
    we would override the value passed to AwSettings.setTextZoom to take
    into account system font scale. Now, if an app does not invoke
    setTextZoom then we'll respect the system font scale. However if an
    embedder then later invokes setTextZoom, we'll honor their value without
    applying any scale.

    BUG=345294
    Committed:
    https://src.chromium.org/viewvc/chrome?view=rev&revision=252347

    Change-Id: Iece907424a8544f116ad429aacc25ffff43ae833

commit 3fecddbc5d6c1c1365e9db3f0bcc303d45200926
Author: Ben Murdoch <benm@google.com>
Date:   Fri Feb 21 11:16:06 2014 +0000

    Record Chromium merge at DEPS revision 33.0.1750.126

    This commit was generated by merge_to_master.py.

    Change-Id: I084430caae1abb283dff869266779f7a0f611106

commit 4e4e753d5cd2290fa40ed922142a29a98128a209
Author: Ben Murdoch <benm@google.com>
Date:   Fri Feb 21 11:16:06 2014 +0000

    Merge from Chromium at DEPS revision 33.0.1750.126

    This commit was generated by merge_to_master.py.

    Change-Id: I963083558dc7f89f4b841561b519ae011f7a12f3

commit 5cb43bf77a8abde1c5230a900debca3fa398c02f
Author: Ben Murdoch <benm@google.com>
Date:   Thu Feb 20 12:28:08 2014 +0000

    Record Chromium merge at DEPS revision 33.0.1750.115

    This commit was generated by merge_to_master.py.

    Change-Id: Iaeea6c5ebc0a2cdebdd2cc8bc048d8436ca55916

commit 33bff6d6e5e82ca5f2abf842074e33f4944cc250
Author: Ben Murdoch <benm@google.com>
Date:   Thu Feb 20 12:28:07 2014 +0000

    Merge from Chromium at DEPS revision 33.0.1750.115

    This commit was generated by merge_to_master.py.

    Change-Id: I6486608ee5cb020693c7c4c19fbf3eb0e4750ca2

commit 6d844e7f2feb33556b047425718ce9b1955572cd
Author: Ben Murdoch <benm@google.com>
Date:   Thu Feb 13 15:45:15 2014 +0000

    Record Chromium merge at DEPS revision 33.0.1750.91

    This commit was generated by merge_to_master.py.

    Change-Id: I9057b29c53289a217561551957ac43485f00ce69

commit 81d04fa4ca6b8e7c49e7a3401149aa77d5b4f381
Author: Ben Murdoch <benm@google.com>
Date:   Thu Feb 13 15:45:13 2014 +0000

    Merge from Chromium at DEPS revision 33.0.1750.91

    This commit was generated by merge_to_master.py.

    Change-Id: I7ea9bcc5d2d80fd541dc7f2e3ef922b403a3e408

commit f44b70ad331d839d3a1799ae91fe9d8a3433ee57
Author: Ben Murdoch <benm@google.com>
Date:   Thu Feb 13 12:28:56 2014 +0000

    FORK: Fix the crash issue caused by vibrate permission

    Original change: https://codereview.chromium.org/143673004/

    Bug: 12832701
    Change-Id: Id05a37baa30dde92e6f9371b0dee3be5deae502f

commit d2403b5c15351723b800eb6eb87588d7b8459206
Author: Tao Bai <michaelbai@google.com>
Date:   Tue Feb 11 12:04:14 2014 -0800

    Revert "Add PowerSaveBlocker in ContentVideoView"

    This reverts commit fae0fbdd42d6d367c67a35e689742f0e4debacca.

commit b401273577ed9561f7cea58cf3897dcae621a4d7
Author: Ben Murdoch <benm@google.com>
Date:   Thu Feb 6 17:27:01 2014 +0000

    Record Chromium merge at DEPS revision 33.0.1750.70

    This commit was generated by merge_to_master.py.

    Change-Id: Idba7ab350035239bc66296225faf75419de6e665

commit 923bd855a3a49144a9f75d8a8200416a52bae775
Author: Ben Murdoch <benm@google.com>
Date:   Thu Feb 6 17:27:01 2014 +0000

    Merge from Chromium at DEPS revision 33.0.1750.70

    This commit was generated by merge_to_master.py.

    Change-Id: I6569f95eba2f2906773a1fa9738645cc45bf3845

commit fae0fbdd42d6d367c67a35e689742f0e4debacca
Author: Tao Bai <michaelbai@google.com>
Date:   Wed Feb 5 12:22:25 2014 -0800

    Add PowerSaveBlocker in ContentVideoView

    This patch add additonal PowerSaveBlocker in ContentVideoView, and will block
    screen sleep when ContentView's container isn't visiable.

    Upstream change: https://codereview.chromium.org/141553010/

    BUG: 12597703

    Change-Id: Ic0f64d4efeabac27aa1dbc74decce878343733b9

commit 6b28dcd1dabd0d0b6dcaea21c3e7558589b02628
Author: Ben Murdoch <benm@google.com>
Date:   Wed Feb 5 10:40:40 2014 +0000

    Record Chromium merge at DEPS revision 33.0.1750.68

    This commit was generated by merge_to_master.py.

    Change-Id: Ic61126c8b3349d4dc99fc9d86156983edce2f4df

commit 03339f79c3d8d49edd8f774b930bea09594c9a79
Author: Ben Murdoch <benm@google.com>
Date:   Wed Feb 5 10:40:39 2014 +0000

    Merge from Chromium at DEPS revision 33.0.1750.68

    This commit was generated by merge_to_master.py.

    Change-Id: Id5b157193ca431586fbf7615bf4a7a152aab3ff9

commit 644f6e134ba2860685475f322387b114418a269c
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Jan 30 10:51:07 2014 +0000

    Record Chromium merge at DEPS revision 33.0.1750.58

    This commit was generated by merge_to_master.py.

    Change-Id: I60f7ecd93de688ac88af47f46923aa21e1520a8d

commit 7da551c69e84cdee501ba0193ee132bc3b5b2c1d
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Jan 30 10:51:06 2014 +0000

    Merge from Chromium at DEPS revision 33.0.1750.58

    This commit was generated by merge_to_master.py.

    Change-Id: I28f293c6ddd80bb1e7f8aa5726c9ba44cbd5d3d3

commit 1fda896a614c398733984435ef2070c96346898e
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Jan 23 21:41:26 2014 +0000

    Record Chromium merge at DEPS revision 33.0.1750.46

    This commit was generated by merge_to_master.py.

    Change-Id: I96ec4e97dbf63037b04ef9eb6dbc7bfeedaec919

commit 81843c7b1423e241009db79d34acf2450330fcc5
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Jan 23 21:41:25 2014 +0000

    Merge from Chromium at DEPS revision 33.0.1750.46

    This commit was generated by merge_to_master.py.

    Change-Id: I096a0fc4786df60da839ee2eefffb1db293071ea

commit d273ce5ed23e43893c48445d86222a46cd57548b
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Jan 15 19:33:36 2014 +0000

    Record Chromium merge at DEPS revision 33.0.1750.29

    This commit was generated by merge_to_master.py.

    Change-Id: Iefd18a3d83fdea558e96ff663613e52ad3b6eead

commit d8f2b4b00825da44f52b775a415bc945dcd54811
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Jan 15 19:33:35 2014 +0000

    Merge from Chromium at DEPS revision 33.0.1750.29

    This commit was generated by merge_to_master.py.

    Change-Id: I1ad39a3dffafbde2b517578820a3b4d77d690d56

commit b4efa9af2755db4991db8aa4d5856ef3f50daf51
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Jan 9 14:12:08 2014 +0000

    Record Chromium merge at DEPS revision 33.0.1750.22

    This commit was generated by merge_to_master.py.

    Change-Id: I1f947828384f27e43e74f65ed56bacd3fc365660

commit 31fc3ed1513c41bdd4a09cdd402f3c4f53b0cecd
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Jan 9 14:12:08 2014 +0000

    Merge from Chromium at DEPS revision 33.0.1750.22

    This commit was generated by merge_to_master.py.

    Change-Id: I6921ac363bb1e55bc9e48d25552106ad8d723ca7

commit 10004abfee1ae673bc9cff02cb4ade884635777c
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Jan 7 12:19:52 2014 +0000

    Record Chromium merge at DEPS revision 33.0.1750.16

    This commit was generated by merge_to_master.py.

    Change-Id: Ic910f77a73e2c3e40af0512052853b8747b77c84

commit f60fc993c7b081abf77ce2ffc7fcca1142c8cb01
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Jan 7 12:19:50 2014 +0000

    Merge from Chromium at DEPS revision 33.0.1750.16

    This commit was generated by merge_to_master.py.

    Change-Id: Ib37ad3db0a0ea2780878ced2798d0b398d383137

commit afed7ce262c29cc50f56cf5858ff2010d5fa49c2
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Jan 2 15:17:50 2014 +0000

    Record Chromium merge at DEPS revision 241107

    This commit was generated by merge_to_master.py.

    Change-Id: I2d130c2203dcee974b61dae269b10df6294a44d8

commit f1ee9c14ae164ee884cd0272f4c806b60a0575e2
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Jan 2 15:17:49 2014 +0000

    Merge from Chromium at DEPS revision 241107

    This commit was generated by merge_to_master.py.

    Change-Id: I63f24ce19d60572ce2d8e792d7d9003cc9a03e06

commit bd323bb972d0ddc2a319aaa7bab693a32bd43288
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Jan 2 13:44:25 2014 +0000

    Record Chromium merge at DEPS revision 241094

    This commit was generated by merge_to_master.py.

    Change-Id: I5cec082a5baa12c502286f638d933220787e937c

commit d57369da7c6519fef57db42085f7b42d4c8845c1
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Jan 2 13:44:22 2014 +0000

    Merge from Chromium at DEPS revision 241094

    This commit was generated by merge_to_master.py.

    Change-Id: Ic69269a3a00901711ccf4510285c238b75be4236

commit 07586ff53052a089e78582e7d85d59d752a04ac7
Author: Bart Sears <bsears@google.com>
Date:   Fri Dec 20 18:08:07 2013 +0000

    Revert "Support Samsung's SmartClip feature."

    Now that we have a build with their feature, pull it back
    out.

    This reverts commit 83ee7761419011fad56ed05dbf8059edf71b042f.

    Change-Id: I9bcdd848574816ba9ad92503758630042c95add1

commit 83ee7761419011fad56ed05dbf8059edf71b042f
Author: Torne (Richard Coles) <torne@google.com>
Date:   Fri Dec 20 13:13:30 2013 +0000

    Support Samsung's SmartClip feature.

    Patch from Samsung to support SmartClip.

    Bug: 12242896
    Change-Id: I2d496839d25fcc8396ac589b8cee2ac37a473ff1

commit e862bac9c33104a29d98631d62668ae7b6676510
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Dec 18 16:25:13 2013 +0000

    Record Chromium merge at DEPS revision 240154

    This commit was generated by merge_to_master.py.

    Change-Id: I866540864a5aa4c8494282158f5e9a762dc58427

commit a3f6a49ab37290eeeb8db0f41ec0f1cb74a68be7
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Dec 18 16:25:09 2013 +0000

    Merge from Chromium at DEPS revision 240154

    This commit was generated by merge_to_master.py.

    Change-Id: I8f2ba858cf0e7f413dddedc2ae91dc37f7136c2e

commit d5f893c0bc79db3066bb5ae5d3d972ba1be7dd5f
Merge: 261f332 a38a770
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Dec 10 01:58:37 2013 +0000

    am a38a7707: (-s ours) am f7ec27e1: Merge commit \'1940731af14148e5a80066fe0ff471f40b9182a5\' into HEAD

    * commit 'a38a7707a5187cf9566c88c372b8c1fa1cb43725':

commit 261f332a9cbadcda5d64c00db9bb8fff76c70f8f
Merge: 11b57d1 7b1c56e
Author: Narayan Kamath <narayan@google.com>
Date:   Tue Dec 10 01:58:23 2013 +0000

    am 7b1c56ec: (-s ours) am 973eb0c7: am 9ab926b5: Merge "Update android generator to handle java7."

    * commit '7b1c56eca3a3e7f47c31fe8ebeb5cb256e36fba1':
      Update android generator to handle java7.

commit 11b57d1c5f7e89659d11fc02443497252f609d3c
Merge: 7ecaf2f b8bff2e
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Dec 10 01:58:12 2013 +0000

    am b8bff2ef: (-s ours) am 95735982: am 9660f096: Merge in Android 4.4

    * commit 'b8bff2ef3f6e1eae67bfde7ee8357b9ff2e7184a':

commit 7ecaf2f38ae3a8d0a986af0f0a18d057b7047ec3
Merge: 938b556 509e287
Author: Baligh Uddin <baligh@google.com>
Date:   Tue Dec 10 01:58:09 2013 +0000

    am 509e287d: (-s ours) am e5c58275: am 25a43fa8: Merge remote-tracking branch \'origin/kitkat-dev\'

    * commit '509e287d8150b3ace144873416c6a6005c866086':
      Initial empty repository

commit 938b556a21e8ed61633feea08088dd7ba4c40709
Merge: 4c950c6 2e1be59
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Dec 10 01:51:20 2013 +0000

    am 2e1be59a: (-s ours) am ff70f338: Merge commit \'311703cfcb02c62b6e6bd949b8aae0ad59ce33bc\' into HEAD

    * commit '2e1be59a23eb4200df2bbef56d8e0eecc395202d':

commit 4c950c672a5918c40bdc2b8c862c7047e24bd1b8
Merge: 8f23a68 1940731
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Dec 10 01:51:16 2013 +0000

    am 1940731a: (-s ours) am e31b3128: Cherry-pick: [Android WebView] Fix in-line video part 1

    * commit '1940731af14148e5a80066fe0ff471f40b9182a5':

commit 8f23a6868bfaf0aec8407b565ba2a8b90d48ffde
Merge: 4a80993 5f3a011
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:51:13 2013 +0000

    am 5f3a0113: (-s ours) am 3311b27c: Cherry pick  [Android] MediaPlayerBridge should pass Bridge to getAllowedOperations

    * commit '5f3a011304cff9ce0f67e21db4fb9d306812d176':
      Cherry pick  [Android] MediaPlayerBridge should pass Bridge to getAllowedOperations

commit 4a809938fd258d2d661ac43f1645f46644a37da3
Merge: 83b5c4b 7f422a0
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:51:10 2013 +0000

    am 7f422a0f: (-s ours) am 41a8683e: Cherry pick android: fix base::Time::FromLocalExploded() crash.

    * commit '7f422a0fc614245c4b74bb4a9a85271535f36970':
      Cherry pick android: fix base::Time::FromLocalExploded() crash.

commit 83b5c4bd6db8e7f997575464dd3ef441eb355352
Merge: 9f40fe1 30685bf
Author: Jonathan Dixon <joth@google.com>
Date:   Tue Dec 10 01:51:06 2013 +0000

    am 30685bf3: (-s ours) am eae6ad96: Merge "Revert "Cherry Pick https://codereview.chromium.org/65273002/ PS 8"" into klp-dev

    * commit '30685bf38db842ad0238276a4bca5f0d9ac4b6d8':

commit 9f40fe11f7bf94668fdb5e1c6cf54f5f4c0e96e3
Merge: c0b49e7 a069f89
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:51:03 2013 +0000

    am a069f89c: (-s ours) am 9f30eaed: Merge "Make sure to show the correct URL from CVC" into klp-dev

    * commit 'a069f89cdee91bc48a862eb7a4e69955688cdb58':

commit c0b49e7bf4aa64339177a7d25663fca9d44e1a9b
Merge: 99f7082 21ed682
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:51:00 2013 +0000

    am 21ed682b: (-s ours) am 1fb9f596: Merge "IndexedDB: Ignore duplicate transaction IDs sent by renderer" into klp-dev

    * commit '21ed682b62ae927729aecc4aa99748fc27747ca2':

commit 99f708291696c85297644a54000050b26d6097b8
Merge: c528761 cf7f6b3
Author: Jonathan Dixon <joth@google.com>
Date:   Tue Dec 10 01:50:57 2013 +0000

    am cf7f6b39: (-s ours) am 7daa8ff7: Merge "(Fork) MR1 Fix for crash in <select> drop down" into klp-dev

    * commit 'cf7f6b39edcfe0ad3c22cfe4647c131a6e5be4ea':

commit c5287612ade6210001352b0030e1348bc9efbaf9
Merge: 59ffbf5 fd45b03
Author: Kristian Monsen <kristianm@google.com>
Date:   Tue Dec 10 01:50:54 2013 +0000

    am fd45b039: (-s ours) am c2f5b209: Merge "Fix for pasting html clipboard content into a webview" into klp-dev

    * commit 'fd45b039992566adcbf8d5ecf11f5f4944befb62':

commit 59ffbf511fe43cba56181615d2442419731099a0
Merge: de1dc35 c83d4c4
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:50:50 2013 +0000

    am c83d4c40: (-s ours) am c82c7db6: Merge "don\'t preserve 1xx responses in parser buffer" into klp-dev

    * commit 'c83d4c406e6e4b28120c8c16868f1983e2884068':

commit de1dc35be0001839942dcf3cbcdfde974b83073c
Merge: dec5a61 b988a91
Author: Leon Scroggins III <scroggo@google.com>
Date:   Tue Dec 10 01:50:47 2013 +0000

    am b988a91e: (-s ours) am dec53b83: Override drawRRect in fake SkBitmapDevices.

    * commit 'b988a91e08b2ab80e8dc8de2818b6fc3aae9aaa7':

commit dec5a610d3b81ac78c01f3ab080bd83eaf21e074
Merge: 4539390 ae10b35
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:50:44 2013 +0000

    am ae10b350: (-s ours) am 3c29aaba: Merge "Cherry Pick https://codereview.chromium.org/65273002/ PS 8" into klp-dev

    * commit 'ae10b35080e2330a1008b9423b75047748c58f38':

commit 4539390fa620556a7d2dbe897a0140f6d1a11ee2
Merge: 2399ef1 4230c23
Author: Martin Kosiba <mkosiba@google.com>
Date:   Tue Dec 10 01:50:40 2013 +0000

    am 4230c23c: (-s ours) am 3d97cf50: Merge "[android_webview] Fix UAF in request interception code." into klp-dev

    * commit '4230c23c20984bd969c130f21a15d6a39c36094b':

commit 2399ef1dade26fda4521cb9eaf6ab576e5aea190
Merge: d226a6c e9d4d01
Author: Tao Bai <michaelbai@google.com>
Date:   Tue Dec 10 01:50:37 2013 +0000

    am e9d4d013: (-s ours) am c906bf1a: Merge "Cherry-pick: Create WindowAndroid to make PowerSave work." into klp-dev

    * commit 'e9d4d0137f6165f2f3e917e9e058ed8243794e89':

commit d226a6cc92b411903b414cbf2efedd55589f1a86
Merge: aea9003 80dfa5e
Author: Bo Liu <boliu@google.com>
Date:   Tue Dec 10 01:50:34 2013 +0000

    am 80dfa5e7: (-s ours) am e1049c79: Fix incorrect resolving of merge conflict causing graphics corruption

    * commit '80dfa5e7fedd772cf499a33c71c427b3aa92059d':

commit aea90035cc556cafb4dfed3505753db0a51ba6e6
Merge: ea5cf75 3516e14
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:50:31 2013 +0000

    am 3516e14e: (-s ours) am 91e7787f: Merge "Call correct shouldoverrideurlloading when popups are created." into klp-dev

    * commit '3516e14e417107ba8b1d0d6dfe64fd5082604644':

commit ea5cf7564d245ee60515c22d4e774a693154ca31
Merge: 2d0589c 10a99cc
Author: Jonathan Dixon <joth@google.com>
Date:   Tue Dec 10 01:50:27 2013 +0000

    am 10a99cc9: (-s ours) am 7cf8cef2: Merge "Cherry-pick "Fix a fd leak in NPChannelBase on Posix"" into klp-dev

    * commit '10a99cc9b56e6081acb094f84457b0172e38c660':

commit 2d0589cfef14924a8dfb6f541562ff5fe48c9b6a
Merge: 05d7fa3 0dea1d6
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Dec 10 01:50:24 2013 +0000

    am 0dea1d65: (-s ours) am 18760af8: Cherry-pick: [Android WebView] Null check syncOnNewPictureStateToNative

    * commit '0dea1d65901f2b86b848b69c6859ff0fdf356967':

commit 05d7fa38b8ecfcead3978e8947acf3e9fd7000c6
Merge: 7f334fd 1646560
Author: Bo Liu <boliu@google.com>
Date:   Tue Dec 10 01:50:20 2013 +0000

    am 16465605: (-s ours) am 2d28b99e: Merge "Cherry-pick: [Android WebView] Only throttle fallback tick" into klp-dev

    * commit '164656050ff18a23bb2620fe38c7f04a8bea8c87':

commit 7f334fd7433ddc2f4483a8f41a5f1e64180474a8
Merge: c379658 d163266
Author: Tao Bai <michaelbai@google.com>
Date:   Tue Dec 10 01:50:17 2013 +0000

    am d1632665: (-s ours) am dc4f02f0: Merge "Cherry-pick: Block media loading when AwSettings.setBlockNetworkLoads is true." into klp-dev

    * commit 'd1632665d2298198369ea4eb79aeefe7bc3ce926':

commit c3796580b3972b381720a118e4ed7a19e56fb0a6
Merge: 7d3e070 716f609
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Dec 10 01:50:12 2013 +0000

    am 716f6095: (-s ours) am 493c03e6: Cherry-pick: [Android WebView] Change tile size to 384

    * commit '716f60956099fb9810b96e254fbebbd77be69d43':

commit 7d3e070e1b1f9a09adb90a98227da3823b3ac09e
Merge: 3d1a28d da2e089
Author: Jonathan Dixon <joth@google.com>
Date:   Tue Dec 10 01:50:08 2013 +0000

    am da2e0893: (-s ours) am b40c061f: Merge changes I3bfa9cdd,Ideb06f7d,I9ecff16e,I0c7677a4 into klp-dev

    * commit 'da2e0893eeeb5c11c5f779789aa15d4f4447898e':

commit 3d1a28d8d2859c2839decd04c9643756822efac6
Merge: 4e62783 693c5be
Author: Martin Kosiba <mkosiba@google.com>
Date:   Tue Dec 10 01:50:05 2013 +0000

    am 693c5be8: (-s ours) am f9bd2a04: [android] Fire accessibility events when scrolling sublayers.

    * commit '693c5be8e8bb2bccc72f01ab019dc5f1f4a23d92':

commit 4e62783688236f3b495b97f02a2625e93b7b8d72
Merge: b71e735 ce3ae6a
Author: Martin Kosiba <mkosiba@google.com>
Date:   Tue Dec 10 01:50:02 2013 +0000

    am ce3ae6a6: (-s ours) am e38e0d9c: Merge "Set a fixed layout size only if the container view has a WRAP_CONTENT layout mode." into klp-dev

    * commit 'ce3ae6a641de67fb482dd77e7f3ed8039e47a88e':

commit b71e73568439160b7358130dab8fafa4fe1069a3
Merge: ab89d94 7a01c51
Author: Bo Liu <boliu@google.com>
Date:   Tue Dec 10 01:49:58 2013 +0000

    am 7a01c510: (-s ours) am 040e397b: Fork: Skip gralloc unbind on all except NVIDIA

    * commit '7a01c5105b5d965f50cd86a3cb314e2272b1c212':

commit ab89d944e34fdf1311cdc102cab23fea0255f01d
Merge: 5030566 069a3cc
Author: peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Dec 10 01:49:55 2013 +0000

    am 069a3cc7: (-s ours) am ad8795de: Cherry-pick "Android should be able to copy HTML snippets to the system clipboard."

    * commit '069a3cc7aa98e6eb015dbc313d4398243552138f':

commit 50305662afa270a6589c5a3ef0ac352832f83434
Merge: 65a18d7 2700558
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:49:51 2013 +0000

    am 27005583: (-s ours) am 3556c0ac: Merge "Disable NOTIMPLEMENTED() in release branch." into klp-dev

    * commit '2700558311677ffb6ecd0c23798d8cf96ebd5300':

commit 65a18d770bb9300cd5f38701305e1ab836081968
Merge: 81f24a0 2dc41da
Author: Jonathan Dixon <joth@google.com>
Date:   Tue Dec 10 01:49:47 2013 +0000

    am 2dc41da5: (-s ours) am 6e78fdd9: Merge "Cherry-pick "Reject rather than abort client certificates"" into klp-dev

    * commit '2dc41da5b83246aa22a48e24472709e612afebc2':

commit 81f24a08851f7d82f193e6ae0948703c4f928ceb
Merge: f5b6e87 c63b452
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Dec 10 01:49:44 2013 +0000

    am c63b4525: (-s ours) am c5ed0dd4: Cherry-pick with modification: cc: Fix CHECK failure in PictureLayerImpl::UpdateTilePriorities

    * commit 'c63b452598f969550ab1f15189e324f734a42b55':

commit f5b6e87fcc32e4c52912bfc781bcbbd465d3100d
Merge: 0a0ac0f e40b873
Author: Jonathan Dixon <joth@google.com>
Date:   Tue Dec 10 01:49:41 2013 +0000

    am e40b873f: (-s ours) am 491c833c: Merge "Cherry-pick "Dynamically enable spatial navigation based on events"" into klp-dev

    * commit 'e40b873f639fec7e6b624a3d13d4e3c49042ed6d':

commit 0a0ac0fdaefea5c9d39ab43878af567741325649
Merge: 32f17a6 ba32978
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Dec 10 01:49:37 2013 +0000

    am ba329784: (-s ours) am 2735d698: Cherry-pick with modification: cc: PictureLayerImpl with empty bounds should not have tiles

    * commit 'ba329784fa4fd3b10dda8a2f9a00601ca8fbcccb':

commit 32f17a62f7910710319e99e9c9d03f7edd7effdc
Merge: f356b82 ca50eb8
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:49:34 2013 +0000

    am ca50eb83: (-s ours) am 2c3943e4: Merge "Prevent log spam in autofill" into klp-dev

    * commit 'ca50eb831cefa92d02f812984a0df4ba7e8d6d5b':

commit f356b826fe5e5c54905054e4a3a5e3d022b9addf
Merge: 1d96333 20348a8
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:49:31 2013 +0000

    am 20348a88: (-s ours) am f3dbc6e1: Merge "Do not exclude background images/colors when printing" into klp-dev

    * commit '20348a88e70bcbf6a42f1ef16842bdbd9cdacbfc':

commit 1d963336db50572a99537211c6236ed5181b8a43
Merge: 767b292 c6879f8
Author: Marcin Kosiba <mkosiba@google.com>
Date:   Tue Dec 10 01:49:27 2013 +0000

    am c6879f88: (-s ours) am 37fd82dc: Merge "[android_webview] Fix crash in testCreateDestroy." into klp-dev

    * commit 'c6879f88f0219abbfe73721278ef5323e57c3aa6':

commit 767b29238992f0f3e8cb4173cb7b3f1a8a04638f
Merge: 66643ad fc1f6f7
Author: Bart Sears <bsears@google.com>
Date:   Tue Dec 10 01:49:24 2013 +0000

    am fc1f6f7c: (-s ours) am 218d56eb: Merge "Cherry pick  [Android] MediaPlayerBridge should pass Bridge to getAllowedOperations" into klp-dev

    * commit 'fc1f6f7c2f49bd08c1b0ef5c5c96d83df4cee04f':

commit 66643addd6189816bdc13420e651b7b6c251ec04
Merge: 8189f34 397b981
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:49:20 2013 +0000

    am 397b9819: (-s ours) am a8e6223c: Merge "Android WebView: use IO thread for cookie manager." into klp-dev

    * commit '397b9819bc60e42792a4c1ab9384d361492e7db7':

commit 8189f3432fac4cc7db3518bcb3aca51817dc6ed1
Merge: c292e64 4cc4ebb
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:49:17 2013 +0000

    am 4cc4ebb0: (-s ours) am 3919f93d: Cherry pick android: fix base::Time::FromLocalExploded() crash.

    * commit '4cc4ebb007ad26ded97605809b12b865ae115e76':

commit c292e64dbb48a049374ee5048ac637c02056e05f
Merge: 9c64260 c1be817
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:49:13 2013 +0000

    am c1be817f: (-s ours) am eb7b2273: Cherry pick [Android] Hide handles when the containing view moves

    * commit 'c1be817f9e16e904f39be8dfa885c89e8c0197f9':

commit 9c64260c3f7468ee662f52601b6f64794f240100
Merge: 238309d 8c13e3e
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:49:09 2013 +0000

    am 8c13e3e1: (-s ours) am 00d67fbe: Cherry pick [Android] Allow text handles to observe position of "parent" view

    * commit '8c13e3e15cf293b637262855248851e96fd62b8e':

commit 238309d866b67ddcfe5ef849f7746ef8a0b3db99
Merge: 35a8803 6dfc281
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:49:05 2013 +0000

    am 6dfc2813: (-s ours) am 2cabbb3b: Merge "Cherry Pick [Android] Properly handle cancelled scroll events" into klp-dev

    * commit '6dfc2813bb4361726196fa559e7a26bccce44089':

commit 35a8803be6b9813de9c32798a8292f66fd928ffc
Merge: 7ee3441 be966bc
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:49:02 2013 +0000

    am be966bc7: (-s ours) am d81d4fb9: Merge "Cherry-pick "[Android] Don\'t hide text handles if they are being dragged"" into klp-dev

    * commit 'be966bc74ff9f1d539d77b991d8013b6a4bb94c1':

commit 7ee3441313739b962023dfa86841c92e66e10b35
Merge: 7f25600 20a1630
Author: Bo Liu <boliu@google.com>
Date:   Tue Dec 10 01:48:58 2013 +0000

    am 20a16309: (-s ours) am efe95cda: Revert "Fork: Read and skip glBindRenderbufferEXT if no change"

    * commit '20a16309141cd9d06fc19962deb8bef7cae0daf3':

commit 7f256001aaaef82500bb73f92d352a1d883363bc
Merge: 201ca24 982982d
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Dec 10 01:48:54 2013 +0000

    am 982982d8: (-s ours) am cf0c1a0e: Cherry-pick: [Android WebView] Do not throttle if need picture listener

    * commit '982982d8220cac9a019ffd3901e4a3dfb9146eb9':

commit 201ca24c7fdc72564d8ce7baeff8d350f21d2018
Merge: 304a415 311703c
Author: Ed Heyl <edheyl@google.com>
Date:   Tue Dec 10 01:48:50 2013 +0000

    am 311703cf: (-s ours) am b175e69a: merge in klp-release (no-op)

    * commit '311703cfcb02c62b6e6bd949b8aae0ad59ce33bc':

commit 304a415b11ac9e1c7a40a88011451fb8628c9295
Merge: b49f1fd 3d80e5a
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:48:47 2013 +0000

    am 3d80e5ac: (-s ours) am 11d030b3: Support a prebuilt WebView.

    * commit '3d80e5ac884e19d034406aee0804d5b6e9303ca6':

commit b49f1fd8e02c422a8866418e64234f5e67eb300c
Merge: dfe5664 d95e742
Author: Bo Liu <boliu@google.com>
Date:   Tue Dec 10 01:48:43 2013 +0000

    am d95e742d: (-s ours) am 28e3c708: Fork: Skip unbind image to texture on ARM

    * commit 'd95e742dc1d802a1216ab65cb4c415c3b4e2f6f5':

commit dfe5664e24fd3a2a67391c9c90a7c2bc6b5f4ee5
Merge: 9f424b9 a7e9d60
Author: Bo Liu <boliu@google.com>
Date:   Tue Dec 10 01:48:39 2013 +0000

    am a7e9d60b: (-s ours) am 99d7eee1: Merge "Fork: Read and skip glBindRenderbufferEXT if no change" into klp-dev

    * commit 'a7e9d60b8f3054066369d3ec505ac9654db0108e':

commit 9f424b9cf8d5f5aeb60ec22fe5e5d001451c3a05
Merge: c3df502 2b70b31
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:48:36 2013 +0000

    am 2b70b315: (-s ours) am de8ca0a0: Merge "Make extra headers only apply to the main frame." into klp-dev

    * commit '2b70b3150289c9a7950f53e3880bad76adcd9cd8':

commit c3df502b4172e3cc8378a74f5dd39bd64c8eaa9e
Merge: 12bfd96 c46a830
Author: Jonathan Dixon <joth@google.com>
Date:   Tue Dec 10 01:48:31 2013 +0000

    am c46a830a: (-s ours) am 828d8c23: Merge "Wire up the quirk for merging multiple <meta viewport> tags" into klp-dev

    * commit 'c46a830a4bc20f29241811414f224a867a87ea0b':

commit 12bfd96e0f3818ff563d15acc0247d708bdcea04
Merge: 43fb1db b23c102
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Dec 10 01:48:27 2013 +0000

    am b23c102b: (-s ours) am fcd5c11b: Cherry-pick: [Android] Use getEventTime for long press timeout

    * commit 'b23c102ba7edbdaca4742bf6fad905e92ed71f14':

commit 43fb1db1e4d498b5309cb3711dde46e5d19cc824
Merge: 889ac6d aeb31a1
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:48:21 2013 +0000

    am aeb31a14: (-s ours) am 81db8d8d: Merge "Maintain a ref to Java objects while print in progress" into klp-dev

    * commit 'aeb31a144c474d3c67c0f23bd59126b6575abd4c':

commit 889ac6dc08643ef475ea6857c2e29c2ea534c9bb
Merge: 759c8f4 c5cb6b0
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Dec 10 01:48:18 2013 +0000

    am c5cb6b0c: (-s ours) am 0aabc40a: Cherry-pick: [Android] Retry create StreamTextureProxy on play

    * commit 'c5cb6b0c913dc2c8721f4e53338ff7444c4d8310':

commit 759c8f4a99f07c6b4d2b8d3ac135bfdd2b1f269a
Merge: e38b7f4 d029b0a
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Dec 10 01:48:14 2013 +0000

    am d029b0a0: (-s ours) am ff02a590: Cherry-pick with modifications: cc: Fix HeadsUpDisplayLayerImpl NPE after resource loss

    * commit 'd029b0a0cbde888746df2b3fc0a75269436e9499':

commit e38b7f420cd796fdc2b6893e0f1124c9acdd4ef6
Merge: 65810b0 4fb70a3
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:48:10 2013 +0000

    am 4fb70a37: (-s ours) am e3c7845b: Record Chromium merge at DEPS revision 30.0.1599.101

    * commit '4fb70a37be354305ceffb024c45561d13f6c995e':

commit 65810b0b65f33f064b9bf8dc22d1a54089dc5187
Merge: 5e01112 8957106
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:48:06 2013 +0000

    am 8957106d: (-s ours) am f5936e50: Merge from Chromium at DEPS revision 30.0.1599.101

    * commit '8957106d8ee749294117c206f80db64846716563':

commit 5e01112e70df52be0666658e578c59db5d1c378f
Merge: c32b834 030d018
Author: Richard Coles <torne@google.com>
Date:   Tue Dec 10 01:48:03 2013 +0000

    am 030d0181: (-s ours) am 772f35d4: Merge "Cherry-pick: Android: disable 2d canvas AA in a different place." into klp-dev

    * commit '030d0181f4d031a2e2630d323a8168a19fcb0f15':

commit c32b834a238e9d6bea7bf5c1afb807300cbb0d5e
Merge: 4dc0266 c021d31
Author: Martin Kosiba <mkosiba@google.com>
Date:   Tue Dec 10 01:47:59 2013 +0000

    am c021d31e: (-s ours) am 6d3352ed: [android_webview] Update fixed layout size on page scale changes.

    * commit 'c021d31e70f9219a622cf87f5301fe13874cc718':

commit 4dc0266db0ac97df3c106f948dcebc0993602c22
Merge: 6260675 7d86f6e
Author: Mikhail Naganov <mnaganov@google.com>
Date:   Tue Dec 10 01:47:56 2013 +0000

    am 7d86f6e3: (-s ours) am b76d682e: Cherry-pick: [Android WebView] Enable the Blink quirk for returning screen sizes in physical pixels

    * commit '7d86f6e36a8160cf4fa3ae076305cfbcfc5e6011':

commit 6260675a2961e3d0ad287c782f7fc0b6ee1bf76e
Merge: 51d5cc7 0f6c272
Author: Jonathan Dixon <joth@google.com>
Date:   Tue Dec 10 01:47:52 2013 +0000

    am 0f6c2726: (-s ours) am ab145de0: Merge "Workaround for apps expecting invalid URL resolutions" into klp-dev

    * commit '0f6c2726036eb1d2508bff636f45a1a8a615418f':

commit 51d5cc71bd2aabd3114171c5f6d6f5d56039a8e1
Merge: 757bbd5 462be53
Author: Jonathan Dixon <joth@google.com>
Date:   Tue Dec 10 01:47:48 2013 +0000

    am 462be539: (-s ours) am f24abfd8: Merge "Use total page scale in the LayerScrollOffsetDelegate." into klp-dev

    * commit '462be5396238a8312dec31f53991db748fddcb69':

commit 757bbd53dcbb8bb2852632b472727f8bb223157c
Merge: 98590d0 3ccf1ab
Author: Bo Liu <boliu@chromium.org>
Date:   Tue Dec 10 01:47:44 2013 +0000

    am 3ccf1abd: (-s ours) am 431571a3: Fork: Do not clear document background in Android WebView

    * commit '3ccf1abdf1b9f6931c7c4d2b308dc1f7f88862b0':

commit 98590d0f669b4febcad708ec98f4201d7fa4914e
Merge: cf7ad7e 0c1c990
Author: Jonathan Dixon <joth@google.com>
Date:   Tue Dec 10 01:47:39 2013 +0000

    am 0c1c990a: (-s ours) am fbc84d90: Merge "Cherry-pick "Add --disable-compositor-touch-hit-testing flag"" into klp-dev

    * commit '0c1c990abf97a7707b8548d6f39e2b51daafdcc6':

commit cf7ad7eef68a52b679a2605ab0595f95fee58623
Merge: 76ea86f b49f334
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:47:36 2013 +0000

    am b49f3343: (-s ours) am 5f8ef208: WebView: Fix CookieManager file:// scheme functions.

    * commit 'b49f33431f5221db0a78f0d521b40bb467a2792c':

commit 76ea86fbb01119846696c6e1f1a013e6c1d39077
Merge: ac35fed c76b8d9
Author: Alexandre Elias <aelias@google.com>
Date:   Tue Dec 10 01:47:32 2013 +0000

    am c76b8d95: (-s ours) am bb535fb2: Merge "Cherry-pick http://crrev.com/25233002 "Make Android WebView filtering depend on scrolling status."" into klp-dev

    * commit 'c76b8d956647a09ca0300bfb8a0c62147a4d1385':

commit ac35fede701a04a4d36016ed9dcf3b0f95b853a8
Merge: 8f535cd 3d3e9b0
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:47:29 2013 +0000

    am 3d3e9b0e: (-s ours) am 3d4c8d8c: Merge "Fix shouldoverrideurlloading." into klp-dev

    * commit '3d3e9b0eb714fa04e6606a89747aabb223537054':

commit 8f535cd04e84da8725b4634f8c8e8c8da8aecac5
Merge: 740d1d4 c747c9c
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:47:25 2013 +0000

    am c747c9c2: (-s ours) am 66486001: Merge "Revert "Further cleanup of shouldoverrideUrlloading change"" into klp-dev

    * commit 'c747c9c22e312eb7933a498db6b5bd247188e4b9':

commit 740d1d4643279d2f1941bbcc498a9136c3be6a65
Merge: 4e8b6d0 6dcf375
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:47:21 2013 +0000

    am 6dcf3759: (-s ours) am b6c936bc: Merge "Revert "Complete Sync shouldoverrideurlloading by cleaning code"" into klp-dev

    * commit '6dcf375957520acb293fbe1a9288c3133df7c40b':

commit 4e8b6d03c0e4d4f85b099300c245fb8902503ae6
Merge: a4f87f3 804cef2
Author: Ed Heyl <edheyl@google.com>
Date:   Tue Dec 10 01:47:11 2013 +0000

    am 804cef28: (-s ours) am ba09230b: merge in KFS78N (no-op)

    * commit '804cef2843187e4a0d2fa542e86dea4151c43aa5':

commit a4f87f36ee030151a0b617c46f45156cf15f5c36
Merge: ae5a7fc b779fb0
Author: Bo Liu <boliu@google.com>
Date:   Tue Dec 10 01:47:03 2013 +0000

    am b779fb01: (-s ours) am dfb6aded: Merge "Cherry-pick: cc: Fix ideal_content_scale check in PictureImageLayerImpl" into klp-dev

    * commit 'b779fb01e4062baef16bbf2b06a7d831c9535150':

commit ae5a7fcd26fbf4f22b900e54cbb2cde7f91734c5
Merge: 2cfb76a 6017e26
Author: Ed Heyl <edheyl@google.com>
Date:   Tue Dec 10 01:46:59 2013 +0000

    am 6017e26c: (-s ours) am 2a31b712: merge in KQS81M

    * commit '6017e26c238576cd239b79489db7cef532c393c0':

commit 2cfb76a34531d0b18ca3e5135ca6c04e83dfc3fe
Merge: 9794df4 c438901
Author: torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Dec 10 01:46:56 2013 +0000

    am c4389012: (-s ours) am 2c5321ad: Cherry-pick: Android WebView: post QuotaManager calls to UI thread.

    * commit 'c4389012889a6668beddd55fc858d4e15d127948':

commit 9794df4c943c5445f1ed12ebb3b4dc42426a2151
Merge: 17fb428 e59bcb3
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:46:53 2013 +0000

    am e59bcb37: (-s ours) am 1cca3922: Record Chromium merge at DEPS revision 30.0.1599.100

    * commit 'e59bcb370bee4fb00f23ba041e208bc130baf141':

commit 17fb428b1d8cd342098409df2cc7cf599cc2beb6
Merge: 8fbe486 1ccef68
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:46:50 2013 +0000

    am 1ccef681: (-s ours) am 9ab648a9: Merge from Chromium at DEPS revision 30.0.1599.100

    * commit '1ccef681aabf83ae71e8c003d59ac39639e2c9b2':

commit 8fbe4862059b124bba0f5529e05826d9bfad6990
Merge: c5f50d6 fc8ba36
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Dec 10 01:46:46 2013 +0000

    am fc8ba36f: (-s ours) am f1f5a614: Cherry-pick: [Android WebView] Disable shrinksStandaloneImagesToFit

    * commit 'fc8ba36f21d0e13c516a000554dc7327cff9b9e3':

commit c5f50d6272beec70e278e484500f04c4ff02b485
Merge: 376cc9e ce7ac9b
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:46:43 2013 +0000

    am ce7ac9be: (-s ours) am c93e8595: Merge "Cherry pick [Android WebView] Disable WebRTC." into klp-dev

    * commit 'ce7ac9be5ccae0e7088ccadda151e9791e8fbbf2':

commit 376cc9eb12164993526d5582cff91928ffcbb4fb
Merge: 3627ed1 8a75909
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:46:40 2013 +0000

    am 8a759098: (-s ours) am 6d46f372: Merge "Cherry Pick [Android WebView] Add an API to control favicon loading." into klp-dev

    * commit '8a759098f692f59d2b29ce5a0e429b6be04f3f3d':

commit 3627ed12fc32e3cd12ea4e1f4047b088cea321b5
Merge: 99c2a77 c990aba
Author: Bo Liu <boliu@google.com>
Date:   Tue Dec 10 01:46:36 2013 +0000

    am c990abaa: (-s ours) am d3b04d94: Fork: Activation do not depend on BeginFrame

    * commit 'c990abaac8779c1d24ac5f90f9cd0e950b778b4d':

commit 99c2a7778e40720e7db50df122d1db2598403093
Merge: 969aa3f 3e86d63
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:46:30 2013 +0000

    am 3e86d63d: (-s ours) am 20a183ad: Allow CookieManager to be used without starting Chromium.

    * commit '3e86d63dfdc4140a5287784f7e6e6d10780d0d50':

commit 969aa3f8c18aa5181046f6f92692122e236ef013
Merge: 9d47af0 05966d4
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Dec 10 01:46:27 2013 +0000

    am 05966d4b: (-s ours) am 1e62f0c0: Cherry-pick: [Android WebView] Check AwContentsIoThreadClient usage

    * commit '05966d4bac9411de465d7b9274d3667be76e068f':

commit 9d47af085ecf106d83b0f72d4c12c52863fad76a
Merge: 1a7c51c e6f1907
Author: Bo Liu <boliu@google.com>
Date:   Tue Dec 10 01:46:22 2013 +0000

    am e6f19072: (-s ours) am 00bdd09e: Merge "Cherry-pick: [Android] Prevent re-entrance into ContentVideoView.exitFullscreen" into klp-dev

    * commit 'e6f19072a08e12a37b26b20838cdadbe206959d7':

commit 1a7c51cc0380346ce93e87786c13d4a4c1937b4a
Merge: 039bf43 b937125
Author: Bo Liu <boliu@google.com>
Date:   Tue Dec 10 01:46:18 2013 +0000

    am b9371259: (-s ours) am e0f9243d: Merge "Cherry-pick: [Android WebView] Change default tile size to 512x512" into klp-dev

    * commit 'b9371259bb6e495937b6f2ab4d21dc0b5b664a55':

commit 039bf430f80cc171187ab292297fe3c6e83db8f3
Merge: 65588b4 7da5d83
Author: Jonathan Dixon <joth@google.com>
Date:   Tue Dec 10 01:46:14 2013 +0000

    am 7da5d838: (-s ours) am e61eb146: Split AwSettings contruction out of AwContents

    * commit '7da5d838ec7123c14102279d9b552ad615938bef':

commit 65588b4daab6e6cb34122c00daa2c4ab4399f688
Merge: 3064dd4 b6be751
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:46:11 2013 +0000

    am b6be7517: (-s ours) am c7bc4150: Android code should not assume main thread == UI thread.

    * commit 'b6be751718f4af376340ac0dce2370b8ae3456ad':

commit 3064dd4e121bc820d57174d075d833bc211bdbcc
Merge: 689935a 1cef9f7
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Dec 10 01:46:08 2013 +0000

    am 1cef9f7e: (-s ours) am d3df597f: Cherry-pick: [Android WebView] Fix invalidate corner case

    * commit '1cef9f7e92ffbb4cc2bfa75f4a8a9ddc6d569fa8':

commit 689935a7646477b7862f2e93d11182223c317aa5
Merge: 0e02f51 91d63e6
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Dec 10 01:46:04 2013 +0000

    am 91d63e66: (-s ours) am 7211bb13: Cherry-pick: [Android WebView] OnMemoryPressure to drop tile memory

    * commit '91d63e665872b8400d535373f5fe3b9627e60724':

commit 0e02f510ee07d7558c8c38f04dc472b461e27bfa
Merge: c87c669 ffb0f12
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Dec 10 01:46:01 2013 +0000

    am ffb0f123: (-s ours) am 83f0adcf: Cherry-pick: [Android] Restore EGL Context after collecting GPU info

    * commit 'ffb0f123253b2249457f07c557e4dc4221bdd8e3':

commit c87c669dcd8abc62d68d9d74349c6b3d5448faf8
Merge: faec9ee 51e8264
Author: Bo Liu <boliu@google.com>
Date:   Tue Dec 10 01:45:58 2013 +0000

    am 51e8264a: (-s ours) am b95a50b8: Merge "Cherry-pick: [Android WebView] Fix fallback tick corner cases" into klp-dev

    * commit '51e8264a6ceecd86b6c94489d679e2efdffc2f1c':

commit faec9ee5722863f476a97d385925e19e4a707063
Merge: b9a024d 8de333e
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Dec 10 01:45:54 2013 +0000

    am 8de333ea: (-s ours) am 52946908: Cherry-pick: [Android WebView] Use CUTOFF_ALLOW_NICE_TO_HAVE

    * commit '8de333ea7e65c549a0d4493d2701826c0d876fff':

commit b9a024dc00aede94eceebc8039af0df1e401a0db
Merge: d5e754e 29da34b
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:45:51 2013 +0000

    am 29da34bf: (-s ours) am a78ae862: Record Chromium merge at DEPS revision 30.0.1599.85

    * commit '29da34bfb2275bb0f78d4b016ed72d30badbcb5b':

commit d5e754e253571e7c3eae0ad65f5507c0ffdd95db
Merge: 652597a 17512eb
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:45:48 2013 +0000

    am 17512eba: (-s ours) am 762b2f21: Merge from Chromium at DEPS revision 30.0.1599.85

    * commit '17512eba2f11a0e94d5afe786e6d4f9cfbcc9ed0':

commit 652597a215ea61ead087484e151e01cc821c095d
Merge: 0200b9a 70a5b5a
Author: primiano@chromium.org <primiano@chromium.org>
Date:   Tue Dec 10 01:45:44 2013 +0000

    am 70a5b5af: (-s ours) am 331ba8b1: Cherry-pick: CC: Fix call order of ScrollOffsetDelegate in ActivatePendingTree.

    * commit '70a5b5afadccb276303231b41df659f5f3044195':

commit 0200b9a6e56417f47aef1501b2df0a6704417581
Merge: 51fbf1d 9f899bd
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:45:41 2013 +0000

    am 9f899bd3: (-s ours) am 3f1a192d: Cherry-pick: Early out if contentviewcore native side is null.

    * commit '9f899bd36ec25fd33c416971cd82bb135e1915c2':

commit 51fbf1d38f8c9267b7e60feb12a346d043ad0200
Merge: 682e16e b500f4e
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Dec 10 01:45:38 2013 +0000

    am b500f4ed: (-s ours) am 58b78f98: Cherry-pick: [Android WebView] Hook up MemoryPressureListener

    * commit 'b500f4edb58a227c473cf9a720df377a8681f5ba':

commit 682e16ec610ea71c2db78df4df5a551294bb21a5
Merge: 03a671a a38f505
Author: Alexandre Elias <aelias@google.com>
Date:   Tue Dec 10 01:45:34 2013 +0000

    am a38f505d: (-s ours) am 58a2f6b8: Merge "Cherry-pick http://crrev.com/24280009" into klp-dev

    * commit 'a38f505d0c1accb318f8f6dde54802af9172345c':

commit 03a671a13323fc774f1113b3cf3eba34c42780ce
Merge: 719e145 96679ad
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Dec 10 01:45:31 2013 +0000

    am 96679adf: (-s ours) am ad048f7a: Cherry-pick: [Android WebView] Tweak gpu memory for low end devices

    * commit '96679adfff5e335f4feac521cd872f3958288627':

commit 719e1455e46b428844bd7e20ab4f4ef1120df3b5
Merge: 1f5de64 fc1e1af
Author: Bo Liu <boliu@google.com>
Date:   Tue Dec 10 01:45:28 2013 +0000

    am fc1e1af1: (-s ours) am 9c54b5e6: Merge "Cherry-pick: [Android WebView] Fix NPE in video when context creation fails" into klp-dev

    * commit 'fc1e1af18c67f89b54e1f29fc55043ba5124a213':

commit 1f5de6471cf1da227f1326e6391716583d897d9c
Merge: 2c60ec9 639d504
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:45:24 2013 +0000

    am 639d5041: (-s ours) am a5bfe74f: Merge "Cherry pick [Android WebView] Populate WebKit WebPreferences correctly in browser" into klp-dev

    * commit '639d504134b6026be034824d7be161c3b4d3cc75':

commit 2c60ec9019da3d7483ba51440e35703142957494
Merge: ef71785 010272e
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:45:16 2013 +0000

    am 010272e3: (-s ours) am e4d11e16: Merge "Cherry pick [Android] When toggling AX script inject, also set native AX state." into klp-dev

    * commit '010272e3eebac5835594222224ab1c982c23180c':

commit ef7178553ecb5f9b1cfa9cf396b92022de793516
Merge: 608e51d c176e4d
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:45:12 2013 +0000

    am c176e4d2: (-s ours) am 9117cf27: Record Chromium merge at DEPS revision 30.0.1599.82

    * commit 'c176e4d27e3179641d0b3afb3897de33f7bac193':

commit 608e51daee58b4d528eff16f6fb9518a423da534
Merge: d2858ea 289c0fb
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:45:09 2013 +0000

    am 289c0fb4: (-s ours) am f4c09e4d: Merge from Chromium at DEPS revision 30.0.1599.82

    * commit '289c0fb437e41350d75658f09840928f2d263e46':

commit d2858ea74341e3b106c15dbd447aaa57c291d062
Merge: 65da20e 35c11fe
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:45:06 2013 +0000

    am 35c11fef: (-s ours) am e1036150: Fix the build

    * commit '35c11fefa26cf38fe8bffc6f0c40f1f83bf31eda':

commit 65da20e64c015f4b24700761da62cf25e817328d
Merge: 02cec4f f8e7e59
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:44:56 2013 +0000

    am f8e7e59b: (-s ours) am b82173f6: Merge "Revert "Cherry pick [Android WebView] Populate WebKit WebPreferences correctly in browser"" into klp-dev

    * commit 'f8e7e59b91c721bd5d802e759af06af6f351d4c9':

commit 02cec4f954580cf2e5de16f487991977952d28f2
Merge: a91707a 19196cb
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:44:52 2013 +0000

    am 19196cbf: (-s ours) am 141c4083: Merge "Revert "Cherry pick [Android] When toggling AX script inject, also set native AX state."" into klp-dev

    * commit '19196cbfa11cabdc175e97772055b4461cb47b48':

commit a91707a414b44af8f5ac07d55a9f96f9681da1a3
Merge: 705d4d1 0153217
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:44:47 2013 +0000

    am 01532179: (-s ours) am ba279007: Merge "Cherry pick [Android WebView] Populate WebKit WebPreferences correctly in browser" into klp-dev

    * commit '015321797590a90cf805207556da3127c510b865':

commit 705d4d148b01e4996eaebca10901f4deb4d84051
Merge: 4f49a5d 2b42565
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:44:38 2013 +0000

    am 2b425653: (-s ours) am e6ed3473: Merge "Cherry pick [Android] When toggling AX script inject, also set native AX state." into klp-dev

    * commit '2b425653aeccfbca35f28f914902e3f16e309ccd':

commit 4f49a5d9f7c1db017dee2e869a307a0a4eca7fcf
Merge: f262dab c7c4551
Author: aurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872>
Date:   Tue Dec 10 01:44:34 2013 +0000

    am c7c45514: (-s ours) am 2a0dedf6: Cherry-pick: A workaround of LatinIME using targetAPI < 15.

    * commit 'c7c4551497fab6bd92b64398f4358a469f74ad4b':

commit f262dab9bc0354c0da80a6eeeabffe47e8f5c6af
Merge: cc36596 73db176
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:44:29 2013 +0000

    am 73db176f: (-s ours) am e6cbc2f9: Merge "Always send DidOverscroll callback for android_webview." into klp-dev

    * commit '73db176f4859e09dd12b0bccaad3d9a7d0dbb2b6':

commit cc3659665634387ee522f939bb1236597a11e007
Merge: 088811b c3de095
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:44:26 2013 +0000

    am c3de095d: (-s ours) am 8a1f3c12: Merge "Fixes to shouldoverrideurlloading for compatibility" into klp-dev

    * commit 'c3de095d788988fcf3af19dd43d76fe55de1eea9':

commit 088811bbdf6ae621406cb444ff5a2cbb6e7414a5
Merge: 27284da 0b067a5
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:44:16 2013 +0000

    am 0b067a57: (-s ours) am 19c7886e: Merge "Work around thread unsafety in NPChannelBase." into klp-dev

    * commit '0b067a57d3669f8d8f0f3f3f9d19e0a17b3e9abf':

commit 27284dad81a73a8b9305c0f13227a4dbc65a1f6a
Merge: de3453f a8159f2
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:44:12 2013 +0000

    am a8159f22: (-s ours) am e4a023bf: Record Chromium merge at DEPS revision 30.0.1599.80

    * commit 'a8159f224e725be8c1c035016cecbff5c3f9bd92':

commit de3453fe232eeae03d3a5e855bbea41283ec8d80
Merge: 60edcc0 1c3505c
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:44:09 2013 +0000

    am 1c3505cf: (-s ours) am 6f2f9e25: Merge from Chromium at DEPS revision 30.0.1599.80

    * commit '1c3505cf3f3a0b5e8cbdc8bf593b8b95dd004441':

commit 60edcc0a7efccdc54a91f828eac7f6ed3235c1e3
Merge: c563030 336a2b6
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:44:06 2013 +0000

    am 336a2b6d: (-s ours) am 030a55ef: Merge "[android_webview] Use a fraction to calculate scroll offset." into klp-dev

    * commit '336a2b6dca75a5d483f320e96daa6102f9c0e9ec':

commit c563030c50e40a8e72054afdb3ba7a7e51bc8664
Merge: a9f4a7d 3fb12f3
Author: Bo Liu <boliu@google.com>
Date:   Tue Dec 10 01:44:02 2013 +0000

    am 3fb12f3a: (-s ours) am 4214a892: Merge "Cherry-pick: cc: Set needs update draw properties during renderer creation" into klp-dev

    * commit '3fb12f3a348f3b1da58c9dc1bb5a4de2990dd59d':

commit a9f4a7de625172a425eeeb4e1c3c7634c8548548
Merge: afc9f73 10eef2a
Author: Alexandre Elias <aelias@google.com>
Date:   Tue Dec 10 01:43:59 2013 +0000

    am 10eef2aa: (-s ours) am 6fd053bb: Merge "Cherry-pick r218169 "cc: Layer::SetTouchEventHandlerRegion should SetNeedsCommit"" into klp-dev

    * commit '10eef2aaf9641bb53eb3ff019d4f6d2f2f4c8a80':

commit afc9f73037f2bc163f804e367123c8fd3681f88c
Merge: 53b0efc 01ed8b5
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:43:55 2013 +0000

    am 01ed8b56: (-s ours) am 2a82f7b6: Merge "Extend WebView useragent to mention Chrome version." into klp-dev

    * commit '01ed8b568cde08d63ea2369d17e047beb0b4a651':

commit 53b0efcec34d7367ae65aa4e4113608850ae9dcf
Merge: dc66ebb 5c47a22
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:43:52 2013 +0000

    am 5c47a220: (-s ours) am 7283965d: Merge "Merge [Android] Inflate Select Action Bar from XML." into klp-dev

    * commit '5c47a220da80133b8eba0416c2924d81209ca6e2':

commit dc66ebbb38eef16199d27d6e8fb2ca6aed196d42
Merge: 79d2c39 5a799df
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:43:48 2013 +0000

    am 5a799dfa: (-s ours) am f265c479: Record Chromium merge at DEPS revision 30.0.1599.61

    * commit '5a799dfa49e568bf85ed5ca2cc559d125db22e24':

commit 79d2c3937624e0889f9e888a92b9fed3ecc97454
Merge: 510c5d7 99bccbd
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:43:45 2013 +0000

    am 99bccbdb: (-s ours) am cd5e6109: Merge from Chromium at DEPS revision 30.0.1599.61

    * commit '99bccbdbe1cdc4048aa8eedc77731935266872fc':

commit 510c5d759fd4ec68091f3e92032995f52443b130
Merge: e2cf1c4 d92bb20
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:43:42 2013 +0000

    am d92bb205: (-s ours) am c838ef4c: Merge "Further cleanup of shouldoverrideUrlloading change" into klp-dev

    * commit 'd92bb2054ee2fadcdf4de4938add208523d3cc30':

commit e2cf1c465de25ffdb7223c33530036cfa8290bba
Merge: ba1a806 34ec37a
Author: Jonathan Dixon <joth@google.com>
Date:   Tue Dec 10 01:43:38 2013 +0000

    am 34ec37a5: (-s ours) am 06797e42: Cherry-pick "Support URL fragment resolution againt non-hierarchical schemes"

    * commit '34ec37a5d6dece1a84cafcc39e159ca8bcc8634f':

commit ba1a8069c678e68b04b23a509c0ac2889549d3e9
Merge: a0613b6 cfaff75
Author: Jonathan Dixon <joth@google.com>
Date:   Tue Dec 10 01:43:35 2013 +0000

    am cfaff75b: (-s ours) am de1bd3eb: Cherry-pick "Preparing to support fragment resolution against non-hierarchical schemes"

    * commit 'cfaff75b37564acfc7b1931e47a2a5625217ccd9':

commit a0613b66a716557e8ac2a551190d9566f7d18aa5
Merge: 754755d 8a6c26d
Author: Jonathan Dixon <joth@google.com>
Date:   Tue Dec 10 01:43:31 2013 +0000

    am 8a6c26d7: (-s ours) am e5b9a41b: Revert "Work-around for URL fragments resolving against about:blank"

    * commit '8a6c26d7a74f34a458d1c7a785a2689c4e93b131':

commit 754755dc03be62971dd934569cb58d6972519764
Merge: 40dd688 8b8015c
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:43:28 2013 +0000

    am 8b8015c8: (-s ours) am 824b33ec: Record Chromium merge at DEPS revision 30.0.1599.58

    * commit '8b8015c8c4ae7787ac94196e91233c6706dc8c94':

commit 40dd688cb576faaf0e4eca956aa45de948cbc3bf
Merge: 9be11a6 f57cbda
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:43:25 2013 +0000

    am f57cbda3: (-s ours) am c6a03b66: Merge from Chromium at DEPS revision 30.0.1599.58

    * commit 'f57cbda30ad004513ae4fea065bcb0e28ec055f7':

commit 9be11a62a75b9507013a524c43ec8f6fc6eaca6e
Merge: 0992df5 45d098f
Author: Alexandre Elias <aelias@google.com>
Date:   Tue Dec 10 01:43:22 2013 +0000

    am 45d098f2: (-s ours) am 58efff2e: Merge "[Android WebView] Wire up ignoreMainFrameOverflowHiddenQuirk." into klp-dev

    * commit '45d098f24bfb2417d772178d366d3f81f30d584b':

commit 0992df5c09b48caa68f845714d20442e4a2aaf06
Merge: 7e66e05 3668ddd
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:43:19 2013 +0000

    am 3668ddd3: (-s ours) am 5024ed27: Merge "Call onPageStarted and onPageFinished in a message on the UI thread" into klp-dev

    * commit '3668ddd309fc389c4f8d5cae1adbb617eb167f38':

commit 7e66e05ebb2c4c7d35c711d4313fd7b7b9c0b057
Merge: e72f15c d706af7
Author: Kristian Monsen <kristianm@google.com>
Date:   Tue Dec 10 01:43:16 2013 +0000

    am d706af7f: (-s ours) am 341c7932: Merge "Allow all mixed content" into klp-dev

    * commit 'd706af7f6ed7aa39a5ecd03fcc2e98420e5baac9':

commit e72f15c268cc3be74fba5422834eda53f3544a2f
Merge: 2ab7031 5ae3c85
Author: Kristian Monsen <kristianm@google.com>
Date:   Tue Dec 10 01:43:12 2013 +0000

    am 5ae3c851: (-s ours) am dd8a3616: Merge "Cherry-pick: Implement clearView to match classic" into klp-dev

    * commit '5ae3c8516cb79162349f09ce6f7324673d18a0d1':

commit 2ab70319bc69554b4bde2c01b442a279b2aa7d26
Merge: f6f67ef 86cbe88
Author: Bo Liu <boliu@google.com>
Date:   Tue Dec 10 01:43:09 2013 +0000

    am 86cbe889: (-s ours) am b95ebc05: Merge "Cherry-pick: [Android WebView] Set initial visiblity" into klp-dev

    * commit '86cbe889d1abb833afe23108235761b12fb8475d':

commit f6f67efc4ad42782c36bdf3c2fff92a72e0a76ed
Merge: 8ecbc22 314de3c
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:43:06 2013 +0000

    am 314de3cf: (-s ours) am 4797c25b: Record Chromium merge at DEPS revision 30.0.1599.56

    * commit '314de3cf67d4748728cc7df9aa285041373ece15':

commit 8ecbc22e47771efe63cdeac89c0b032286112b5a
Merge: 27ec257 f5470a9
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:43:02 2013 +0000

    am f5470a94: (-s ours) am 810e1ddb: Merge from Chromium at DEPS revision 30.0.1599.56

    * commit 'f5470a946947a68385b9a7839e4e04e28c8d971e':

commit 27ec257abc441fdbb2e692dc8ed6284a05e917a0
Merge: c582bb5 17f9f06
Author: Bo Liu <boliu@google.com>
Date:   Tue Dec 10 01:42:59 2013 +0000

    am 17f9f068: (-s ours) am 63d0ac2a: Chromium Fork: Increase URL length limit to 20MB

    * commit '17f9f0687d41eddc1f9e48f7e584c702cbce82f2':

commit c582bb5a7288a5eabfb0a8a1d6670004689e28c1
Merge: 9dee26d e505483
Author: Mikhail Naganov <mnaganov@google.com>
Date:   Tue Dec 10 01:42:55 2013 +0000

    am e505483f: (-s ours) am 663642a4: [Android WebView] Make web contents debugging controllable

    * commit 'e505483fafd0659893d570bf555fd72fba0431ff':

commit 9dee26deaae9370121401947340a89fb2aa3b759
Merge: a009f5d 090d69f
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:42:51 2013 +0000

    am 090d69f3: (-s ours) am 01d3471d: Merge "Revert "[Android WebView] Make web contents debugging controllable"" into klp-dev

    * commit '090d69f315cee10d16afcda921ca550e7982ae51':

commit a009f5d8b2a9647177792ecdf0009f00b74454d3
Merge: a291c4a d4df036
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:42:48 2013 +0000

    am d4df0360: (-s ours) am 89c370b6: Merge "[Android WebView] Make web contents debugging controllable" into klp-dev

    * commit 'd4df0360d3941381ec3f8ee46a71e451ac6a691c':

commit a291c4afd9bc7f12a7cf0c8ca421d856675fd89e
Merge: 034d253 20bc8ca
Author: Jared Duke <jdduke@google.com>
Date:   Tue Dec 10 01:42:44 2013 +0000

    am 20bc8ca0: (-s ours) am dff2b325: Merge "Cherry-pick: Restrict the assumption that the OSK will trigger a resize" into klp-dev

    * commit '20bc8ca030bda524333ea2cc01e8de36e31890c5':

commit 034d25328e416382968f816387db818265c497da
Merge: abac496 f4075cf
Author: Bo Liu <boliu@google.com>
Date:   Tue Dec 10 01:42:41 2013 +0000

    am f4075cfa: (-s ours) am 66858998: Merge "Cherry-pick: [Android WebView] Early out DrawGL if not attached to window" into klp-dev

    * commit 'f4075cfad1010c2237b4761ad529d401a2e13e18':

commit abac496a75a942195eec48efb0edc11e68e96295
Merge: a21aa14 eaafa0d
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:42:37 2013 +0000

    am eaafa0d8: (-s ours) am 822f024c: Merge "Cherry pick [Android] Decouple pausing video from RenderView pause." into klp-dev

    * commit 'eaafa0d88eaa34faea7e788f93c84752d8204528':

commit a21aa144d6c3710237094e6718c96075a3a37af7
Merge: 5c944de d035f93
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:42:32 2013 +0000

    am d035f937: (-s ours) am 0a8f47fb: Complete Sync shouldoverrideurlloading by cleaning code

    * commit 'd035f937b0470333701a8afdad177fb4b923baba':

commit 5c944de746493f8bec91a0cb178262acaf434b54
Merge: e6e4bf2 39c3b54
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:42:29 2013 +0000

    am 39c3b54c: (-s ours) am 77ceb718: Implement ShouldOverrideUrlLoading using a Sync IPC

    * commit '39c3b54c396ccda911426a7a92060771c1e70ae8':

commit e6e4bf2205fd0a4f6de71a9ca5c9b550863b589d
Merge: 0c00619 f0f53f6
Author: Primiano Tucci <primiano@google.com>
Date:   Tue Dec 10 01:42:25 2013 +0000

    am f0f53f65: (-s ours) am 95ef9ffb: Merge "Cherry-pick: [Android WebView] Make InputStreamImpl::Read fill the IOBuffer." into klp-dev

    * commit 'f0f53f65865861ccf7123d68109e1f70cb799ac9':

commit 0c006191f3f2c531cf0914afdd5356149607fb2b
Merge: 01f1a56 a91609d
Author: epenner@chromium.org <epenner@chromium.org@0039d316-1c4b-4281-b951-d872>
Date:   Tue Dec 10 01:42:22 2013 +0000

    am a91609d4: (-s ours) am d28fd5bf: Cherry-pick: CC: Fix polling in sync compositor.

    * commit 'a91609d40aa0a9d2241a6855db90cff66dee1761':

commit 01f1a56fd17ed89f858a7d373e14c3b48d76adc3
Merge: e19bead ec624b5
Author: Martin Kosiba <mkosiba@google.com>
Date:   Tue Dec 10 01:42:19 2013 +0000

    am ec624b57: (-s ours) am 6b2e6666: [android_webview] Fix layout in AT_MOST mode.

    * commit 'ec624b57407e73168abd7401ed348b1e64e0d0f6':

commit e19bead725aea36a79151fecb27819df62539ef0
Merge: 9196c75 42e75ae
Author: Martin Kosiba <mkosiba@google.com>
Date:   Tue Dec 10 01:42:15 2013 +0000

    am 42e75ae6: (-s ours) am 314c2667: Remove accidentally checked in spammy log from ContentViewCore.

    * commit '42e75ae68e7c91e765fdf43f57388366a50c06df':

commit 9196c75bd91cb1e99853bb6496cf3881289dcaaa
Merge: a4aa116 7a42e8f
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:42:11 2013 +0000

    am 7a42e8fe: (-s ours) am 1e34f592: Record Chromium merge at DEPS revision 30.0.1599.50

    * commit '7a42e8fee27f90d3f360a24eeb8963b865f35d27':

commit a4aa1167d8a226abedfd6feaf19916fac3aa2cad
Merge: 136633d 830c012
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:42:08 2013 +0000

    am 830c0127: (-s ours) am 4686f8b2: Merge from Chromium at DEPS revision 30.0.1599.50

    * commit '830c0127aa518c2a2f4d324a9ca6ef895fefbafe':

commit 136633dc398cff124346cc73e84a3e1849401825
Merge: c21648d ffae626
Author: Martin Kosiba <mkosiba@google.com>
Date:   Tue Dec 10 01:42:05 2013 +0000

    am ffae626f: (-s ours) am ba732bd5: Merge "[cherry-pick] Use contents size for android_webview layout size." into klp-dev

    * commit 'ffae626fdeba479ec784fbd7d127c5cfb3ecb8cd':

commit c21648d50abec48ab68c890f577ce65589c17629
Merge: d7db45b 6d91a64
Author: Tao Bai <michaelbai@google.com>
Date:   Tue Dec 10 01:42:02 2013 +0000

    am 6d91a647: (-s ours) am 7a6d53f1: Merge "Cherry-pick: [Android WebView] Make evaluateJavaScript return with no-op." into klp-dev

    * commit '6d91a6476f7b828331a712dc987cb3da602776ef':

commit d7db45bf0e354433a1be05cc857a983f8d707ea6
Merge: c2802a9 7c857d7
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:41:59 2013 +0000

    am 7c857d7b: (-s ours) am 53f28f4a: Merge "Cherry-pick: Reuse webview classic cookies file" into klp-dev

    * commit '7c857d7b30e7f0ac779ea9893f7306942c4e7b8f':

commit c2802a9160f79715b125f443b8a4624a875dbb81
Merge: 07b1523 81e1380
Author: Marcin Kosiba <mkosiba@google.com>
Date:   Tue Dec 10 01:41:55 2013 +0000

    am 81e13806: (-s ours) am 2c8786fd: Merge "Cherry-pick: Defer scrolls until provided a valid content size" into klp-dev

    * commit '81e13806e9ba74fa9941971a769fd7f9e3a08ee0':

commit 07b15239cb1ad65e6af9c6d5e475366e28fc0e3b
Merge: aefbfc7 58206f2
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:41:52 2013 +0000

    am 58206f27: (-s ours) am 97162f9b: Record Chromium merge at DEPS revision 30.0.1599.48

    * commit '58206f279c27869b2e5e452e116245d1842744e1':

commit aefbfc78604345fdc00a15708b256d4ba26a492f
Merge: 2332087 4f1df81
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:41:49 2013 +0000

    am 4f1df814: (-s ours) am b32343c9: Merge from Chromium at DEPS revision 30.0.1599.48

    * commit '4f1df8149f424e254d4c92ca0207949565cd8473':

commit 2332087a482a93e9af05d197302c75c88d11925f
Merge: c0d431d a94b51e
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:41:46 2013 +0000

    am a94b51e1: (-s ours) am 652dfbe8: Merge "Cherry pick of [Android] Update RenderWidgetHostView focus state on creation." into klp-dev

    * commit 'a94b51e1e8ed4054de2c0d09a804310dc6e6bae5':

commit c0d431def75487a66de1a6e1777122e04239dd93
Merge: 9df5526 46f4ed8
Author: cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d87>
Date:   Tue Dec 10 01:41:42 2013 +0000

    am 46f4ed8a: (-s ours) am b82f98ed: Cherry-pick: [Android] Fix vibrate on select text

    * commit '46f4ed8af232e51cd81247b1db98dc945dfba14e':

commit 9df55265f07bb65154e05302c5e569abde88d19a
Merge: 12d9469 daac6be
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:41:38 2013 +0000

    am daac6bee: (-s ours) am 2366fa9d: Record Chromium merge at DEPS revision 30.0.1599.46

    * commit 'daac6bee4aca69fb3aaa4ee3da4c8f602afb4d9f':

commit 12d94692472bf296d64481e9ef097004d180d13c
Merge: b28071e 167b7d9
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:41:35 2013 +0000

    am 167b7d97: (-s ours) am 4d551d56: Merge from Chromium at DEPS revision 30.0.1599.46

    * commit '167b7d97da782c46c3bbe6a9edb40c59f004886d':

commit b28071e4dafe96e4cefa60436ce7d7e8b2c62525
Merge: 0e1ea27 322fa41
Author: Jonathan Dixon <joth@google.com>
Date:   Tue Dec 10 01:41:32 2013 +0000

    am 322fa419: (-s ours) am 4f6117de: Merge "Work-around for URL fragments resolving against about:blank" into klp-dev

    * commit '322fa4191450050699fc8d93d782e1c50f351b75':

commit 0e1ea27c417fd885515622d6f715f399e9b92787
Merge: 7307557 789a4d4
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:41:28 2013 +0000

    am 789a4d4f: (-s ours) am 30c9e02f: Record Chromium merge at DEPS revision 30.0.1599.44

    * commit '789a4d4f798934d0615621923564fff09d30776c':

commit 73075571ca3d10a19caa3c213947923563ed8bd5
Merge: 40e17e4 2e24b77
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:41:25 2013 +0000

    am 2e24b775: (-s ours) am 4c533772: Merge from Chromium at DEPS revision 30.0.1599.44

    * commit '2e24b775f0cb8738d0fd0ba797f876226f1993b2':

commit 40e17e4cb9980a709297f0785e6f838b93be10d6
Merge: 8d77ce6 cd63ffd
Author: Primiano Tucci <primiano@google.com>
Date:   Tue Dec 10 01:41:22 2013 +0000

    am cd63ffd5: (-s ours) am c42723f8: Merge "Cherry-pick: [Android WebView] Pass absolute URL to requestFocusNodeHref." into klp-dev

    * commit 'cd63ffd5512aa1caad20bcc822e87422b6e55573':

commit 8d77ce6ec34ee9c3ce6df408db95e02baee9efbc
Merge: 6b0fce0 eb3fbf9
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:41:18 2013 +0000

    am eb3fbf94: (-s ours) am 845ed6b2: Minimise logging/tracing in release builds.

    * commit 'eb3fbf94ee9b5084e4b1385eeb3129fbd441d63f':

commit 6b0fce0650636a0cb6e0058cd27711922976549d
Merge: 8b0f6d5 6cb9026
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:41:15 2013 +0000

    am 6cb9026e: (-s ours) am ebaa8109: Record Chromium merge at DEPS revision 30.0.1599.41

    * commit '6cb9026e1e0054bb89316320040a5d1382d61fcc':

commit 8b0f6d5c6a60ef44d650ac5fb43209153703b4af
Merge: f0fcf5c 44655c4
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:41:11 2013 +0000

    am 44655c40: (-s ours) am f7530a7a: Merge from Chromium at DEPS revision 30.0.1599.41

    * commit '44655c402df3988d6737ac99764bff68d4242868':

commit f0fcf5ca1343fa6d9f762c4c48a12eb616ba3ac3
Merge: 64a8c38 c3fb693
Author: Jonathan Dixon <joth@google.com>
Date:   Tue Dec 10 01:41:07 2013 +0000

    am c3fb6936: (-s ours) am ed1701ee: Merge "Cherry-pick Add CONTENT_EXPORT to some swtiches needed for WebView" into klp-dev

    * commit 'c3fb69360bc456eb3757d419d066000a316f75fe':

commit 64a8c383d1730cf737b2a7ead406ce72f88208a1
Merge: 6acdad5 ce3807e
Author: Qiwen Zhao <zhao@google.com>
Date:   Tue Dec 10 01:41:03 2013 +0000

    am ce3807e2: (-s ours) am 690201eb: Revert "Revert "Downstream Workaround for Qualcomm Bug 10205015""

    * commit 'ce3807e2ad47f4b6d1f2d1890c5074a648f563f2':

commit 6acdad521f04cd083f2932aab15f97aad75978f4
Merge: 90090ed 064b682
Author: Martin Kosiba <mkosiba@google.com>
Date:   Tue Dec 10 01:41:00 2013 +0000

    am 064b6826: (-s ours) am 6607c8fe: Merge "Cherry-pick http://crrev.com/23478022" into klp-dev

    * commit '064b68268088d94b50b2ed2b427c66ae022ddfcb':

commit 90090ed604d6387fa96556734b649f82e8f56be2
Merge: bc65045 c39220b
Author: Qiwen Zhao <zhao@google.com>
Date:   Tue Dec 10 01:40:56 2013 +0000

    am c39220b5: (-s ours) am 0c3a0d0c: Merge "Revert "Downstream Workaround for Qualcomm Bug 10205015"" into klp-dev

    * commit 'c39220b5dad683109b13f1bffe1362316ea6def0':

commit bc650453fa8c762521666f0bbbadb7d1af28a17f
Merge: a97400f 2306930
Author: Martin Kosiba <mkosiba@google.com>
Date:   Tue Dec 10 01:40:53 2013 +0000

    am 23069308: (-s ours) am 406a4f85: Merge "Revert "Patch in http://crrev.com/22903029"" into klp-dev

    * commit '230693084d7c0a56a4ed9c4bed3a04006531adfe':

commit a97400f0d710c339f084e67f46e58327d421a799
Merge: 5523e46 376e230
Author: Kristian Monsen <kristianm@google.com>
Date:   Tue Dec 10 01:40:41 2013 +0000

    am 376e2305: (-s ours) am 85b0a633: Merge "Cherry-pick: Adding a getter for base url" into klp-dev

    * commit '376e2305b2f4a2fe97e6204b22e906445aac830f':

commit 5523e463fc6b785de59046bdf1db26929d8b9826
Merge: 9d72bbf 3cda62b
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Dec 10 01:40:36 2013 +0000

    am 3cda62b3: (-s ours) am 66cb5b9b: Cherry-pick: [Android WebView] Match chrome font settings

    * commit '3cda62b3fc1a8f355be972b91260c8356987c0c5':

commit 9d72bbf16be7fb609fe9b7399fad3b543e6262c8
Merge: 4db3b63 c340736
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Dec 10 01:40:31 2013 +0000

    am c3407362: (-s ours) am 99f7c4a5: Cherry-pick: [Android WebView] Do not interfere with requests after destroy

    * commit 'c3407362bf564bbc420df88d3c4e452d83d0109c':

commit 4db3b63d28601c196e0732f54c6243dc32fd778c
Merge: 2e484c3 e3b2fd2
Author: Bo Liu <boliu@google.com>
Date:   Tue Dec 10 01:34:17 2013 +0000

    am e3b2fd29: (-s ours) am adbec73f: Merge "Cherry-pick: [Android WebView] First cut memory management" into klp-dev

    * commit 'e3b2fd29ad75262ac1835008f9759d7a56b1def2':

commit 2e484c3d8e1ded0fb17d3470745be2e997fdea77
Merge: ff583c9 b490545
Author: brianderson@chromium.org <brianderson@chromium.org@0039d316-1c4b-4281-b951->
Date:   Tue Dec 10 01:34:14 2013 +0000

    am b4905453: (-s ours) am b2ce3138: Cherry-pick: cc: Poll for state that triggers draws (synchronous compositor only)

    * commit 'b4905453ecaa67fe77347025249f32ad4800cba5':

commit ff583c9b626a7a99e20afda87e56e4c691d2e354
Merge: cbc8642 a9859a9
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:34:09 2013 +0000

    am a9859a92: (-s ours) am 4ce95411: Record Chromium merge at DEPS revision 30.0.1599.40

    * commit 'a9859a9206f252fdafe1a5c115687cb9b1aa70dc':

commit cbc8642732e8461fc4b9b2ce4eab71bb037039d7
Merge: e9f27de 910024f
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:34:03 2013 +0000

    am 910024f4: (-s ours) am 0f5d3685: Merge from Chromium at DEPS revision 30.0.1599.40

    * commit '910024f4f83da230dd8d7b028733aa6357b7729c':

commit e9f27de74de55d8b08389a4e2f2b86246832ece3
Merge: 702bceb c6fec18
Author: Svetoslav <svetoslavganov@google.com>
Date:   Tue Dec 10 01:33:57 2013 +0000

    am c6fec187: (-s ours) am 58251847: Update AwPrintDocumentAdapter due to API changes

    * commit 'c6fec187bd39dfd14ff5f524882eca8831f0c11d':

commit 702bcebc45d4a660445a6b3ed4b76c967f736239
Merge: b6d4dbc 818590d
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:33:54 2013 +0000

    am 818590d5: (-s ours) am 9e24fc07: Merge "Reflect printAPI changes." into klp-dev

    * commit '818590d5541b252166813b4a3bea6ec0a4cd104a':

commit b6d4dbcc9651bb1804057a5b383cc9037e784c42
Merge: aed99a7 cd33f03
Author: Jonathan Dixon <joth@google.com>
Date:   Tue Dec 10 01:33:48 2013 +0000

    am cd33f03b: (-s ours) am 4c87edc0: Merge "Cherry-pick "Switch AwPixelInfo to wrap SkCanvasLayerState"" into klp-dev

    * commit 'cd33f03b17807fce0d73248fe14dd679a89fa999':

commit aed99a7870e0e78643fdf2bd988d3327bd91d7fc
Merge: 689e7eb acdcd9e
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:33:42 2013 +0000

    am acdcd9e3: (-s ours) am 05375ba3: Record Chromium merge at DEPS revision 30.0.1599.39

    * commit 'acdcd9e382e0391dcf3b413ba8156503ea2b4acc':

commit 689e7ebea123cd05292a42416c045ffa625ea96e
Merge: c41753a 91c1b4d
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:33:39 2013 +0000

    am 91c1b4d3: (-s ours) am 389f8918: Merge from Chromium at DEPS revision 30.0.1599.39

    * commit '91c1b4d3ecd26e5fc4e1d8802226095415a8ae98':

commit c41753a16553bcd4f8620383d8cd2d9480185e10
Merge: 938a4d6 ca8cc12
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:33:32 2013 +0000

    am ca8cc127: (-s ours) am 60534036: Record Chromium merge at DEPS revision 30.0.1599.38

    * commit 'ca8cc127386a08e0bae9cd0c39f42b78eef09a41':

commit 938a4d652562c2796a9c0d109306b44446de9da9
Merge: 5da6488 bc4b00f
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:33:29 2013 +0000

    am bc4b00f2: (-s ours) am bffa5683: Merge from Chromium at DEPS revision 30.0.1599.38

    * commit 'bc4b00f23371fe42ce2de775add7402e0b2579da':

commit 5da6488dc45ccfb0454183129fa19fed8d5c8519
Merge: d22fd8d 45f6dbb
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:33:22 2013 +0000

    am 45f6dbb3: (-s ours) am f76851f0: Merge "Cherry pick from upstream Chromium to ease merge from M30." into klp-dev

    * commit '45f6dbb333fcb5a8cf7782b04c58e303aabeb5af':

commit d22fd8d0306c45c9a325d2cc22025423d780e133
Merge: 229ac1a 785b89e
Author: Kristian Monsen <kristianm@google.com>
Date:   Tue Dec 10 01:33:19 2013 +0000

    am 785b89eb: (-s ours) am cbc64c0b: Manual cherry-pick of https://codereview.chromium.org/23623020

    * commit '785b89eb7bd6405e41a6571a826b6b74bc156f39':

commit 229ac1a3baddfa353b00e9ebdf5134c470d25e35
Merge: 88df1cf 49da357
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:33:14 2013 +0000

    am 49da3570: (-s ours) am 06a27858: Record Chromium merge at DEPS revision 30.0.1599.36

    * commit '49da3570487056b7d8f654e66fb6aee06d18d4e2':

commit 88df1cfa1559119d5ce36d18a4faaa0f9563842e
Merge: 68f7997 3e7d576
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:33:10 2013 +0000

    am 3e7d576b: (-s ours) am 76ea5963: Merge from Chromium at DEPS revision 30.0.1599.36

    * commit '3e7d576b4c045d018f310775b4c44a122465d44d':

commit 68f79972093ae963f2c4f129e1524ba0d9f9d9cb
Merge: cb444b5 a1b174f
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:33:02 2013 +0000

    am a1b174fd: (-s ours) am 5d58f322: Record Chromium merge at DEPS revision 30.0.1599.35

    * commit 'a1b174fd4524f22aca122665477d20498e5ce776':

commit cb444b5ed04d3735e3af9e43b56291283af2e65d
Merge: 51870d6 19e1d71
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:32:58 2013 +0000

    am 19e1d71d: (-s ours) am 4d476689: Merge from Chromium at DEPS revision 30.0.1599.35

    * commit '19e1d71dd8b91222d4b21436a8e76f2dad73b1dc':

commit 51870d65f7e41d70023279d60b082d517cb36240
Merge: 41af507 74a0652
Author: Bo Liu <boliu@google.com>
Date:   Tue Dec 10 01:32:51 2013 +0000

    am 74a06524: (-s ours) am c37b93fe: Merge "Cherry-pick: Fix video in software mode" into klp-dev

    * commit '74a0652415c8995343ee3bf70551cbb4229d039e':

commit 41af50789aac69058e4163e7a530664a599d334e
Merge: 3364800 3263682
Author: Jonathan Dixon <joth@google.com>
Date:   Tue Dec 10 01:32:44 2013 +0000

    am 32636820: (-s ours) am a02260b3: Merge "Cherry-pick "Send Android accessibility "content changed" event for any change"" into klp-dev

    * commit '326368202f71405f01751a6e151c5f1219c5bba4':

commit 33648003590c95b9f20437b0b842d8a243338dd6
Merge: 9004297 dc5582b
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:32:39 2013 +0000

    am dc5582bd: (-s ours) am 162276c9: Record Chromium merge at DEPS revision 30.0.1599.32

    * commit 'dc5582bd1a2b771b38c28c0d86e4135bf51b07f7':

commit 9004297c6bba69efd4d387f185431cb037c00e82
Merge: 4840bf2 0e70f44
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:32:36 2013 +0000

    am 0e70f44e: (-s ours) am 7879b4e3: Merge from Chromium at DEPS revision 30.0.1599.32

    * commit '0e70f44e07596a1c29d274f8b4d8fc7d3c98261b':

commit 4840bf2be0f3f6709c4204822cc27ff61859960e
Merge: bf7624a cd7901b
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:32:30 2013 +0000

    am cd7901b5: (-s ours) am 3dff3ed7: Disable fatal linker warnings on x86.

    * commit 'cd7901b506298d1eed0128d796d22781f1f60eab':

commit bf7624ada2d9aacdd565d4cd794c47799f180ae3
Merge: f0db943 79fa022
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:32:26 2013 +0000

    am 79fa022f: (-s ours) am 819cc77b: Merge "Cherry pick https://chromiumcodereview.appspot.com/23503020 PS3" into klp-dev

    * commit '79fa022f72445ac8a0414a6fd7ef2dc14447d95c':

commit f0db943c54e800eebeee48259dd44e3bd85fa713
Merge: 2c19297 f2372de
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:32:20 2013 +0000

    am f2372de9: (-s ours) am b25cc192: Record Chromium merge at DEPS revision 30.0.1599.31

    * commit 'f2372de962e3400f1fa0a04d792198aa993e8d57':

commit 2c19297316741932ff177df73bf3c80b79e1d882
Merge: 2d6c070 62284fb
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:32:17 2013 +0000

    am 62284fbe: (-s ours) am 13a64a3c: Merge from Chromium at DEPS revision 30.0.1599.31

    * commit '62284fbea6499c89a3cc765d1fcce1c01dbc86a0':

commit 2d6c070cabc34d7997f89ddf03ecf5e5c59da97f
Merge: bebdd03 3d371e7
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:32:13 2013 +0000

    am 3d371e74: (-s ours) am e1f7496c: Record Chromium merge at DEPS revision 30.0.1599.30

    * commit '3d371e7417ab667bba5f1e0b4bda1e488fd08999':

commit bebdd030a1e8cc57ae5137fe69e4861f1ae67cad
Merge: 0ae34d4 f83341f
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:32:10 2013 +0000

    am f83341f3: (-s ours) am eee4ebda: Merge from Chromium at DEPS revision 30.0.1599.30

    * commit 'f83341f3ef47f88cbe8dad68e7b4c2b60c5d1634':

commit 0ae34d44b2bbb631adfebdc740e4f3c5deacc769
Merge: c798307 02cca2a
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:32:06 2013 +0000

    am 02cca2a5: (-s ours) am bbcd8928: Record Chromium merge at DEPS revision 30.0.1599.26

    * commit '02cca2a5d49fe348a4b5cfb209fbdd5c42fa0b77':

commit c798307c8daf0654a6a76d9c6e9491f740c1d8fa
Merge: 2290a67 4173ac8
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:32:03 2013 +0000

    am 4173ac81: (-s ours) am 6594c208: Merge from Chromium at DEPS revision 30.0.1599.26

    * commit '4173ac81fcc999936f8900fe30eb9c921a8d4a35':

commit 2290a6738b657057ed9dcf36547808b9f2498b2f
Merge: 42e1f5b 39cae7d
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:31:59 2013 +0000

    am 39cae7d0: (-s ours) am a0ac9246: Merge "Do not close file descriptor." into klp-dev

    * commit '39cae7d0074d779eb3fbf136405aeb91593a72de':

commit 42e1f5b5fcbad10797aae441e612c162f2145fc4
Merge: 5e15242 7eec145
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:31:55 2013 +0000

    am 7eec145f: (-s ours) am 7ba7d829: Merge "The generated makefiles for printing" into klp-dev

    * commit '7eec145f8f70b47c9436e7a2fafbc6e48f1ad630':

commit 5e1524224763f04ccc0ed04789dcaa74af5fdf0e
Merge: 374130f 01e5f22
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:31:52 2013 +0000

    am 01e5f224: (-s ours) am 8e502b6b: Merge "Printing changes for page layout" into klp-dev

    * commit '01e5f224b6f9feee225129a9d8779318d04422d7':

commit 374130fb3cc7782052f618d2b5f758d2d4ce5e81
Merge: 67402ba 6140769
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:31:48 2013 +0000

    am 61407695: (-s ours) am af85e71a: Merge "Copied files from chrome to android." into klp-dev

    * commit '614076957dd4936395ef4816c2a509bece9716c8':

commit 67402ba8999e3f8f0d90a2aee179e41433103ad5
Merge: 28ba989 198cc94
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:31:45 2013 +0000

    am 198cc940: (-s ours) am 86e43a2a: Record Chromium merge at DEPS revision 30.0.1599.25

    * commit '198cc940b7bad75b71073359cbcd378fa840e40c':

commit 28ba989c6c24e453d1a0408dd54ba04f5632db7e
Merge: 1881f82 6c5c364
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:31:42 2013 +0000

    am 6c5c364d: (-s ours) am 5db5c4ec: Merge from Chromium at DEPS revision 30.0.1599.25

    * commit '6c5c364db3d80a3853a946135bc0d5541e08730f':

commit 1881f82a3f0411648b0ee6d3760606f9dc13d40b
Merge: 404d835 1411513
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:31:37 2013 +0000

    am 14115132: (-s ours) am e0b60a77: Record Chromium merge at DEPS revision 30.0.1599.24

    * commit '1411513211b2852a3bcce0cf88a087d084de27b2':

commit 404d835438d099cb7272f4669f654bc26a570767
Merge: b403fd7 42914c6
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:31:33 2013 +0000

    am 42914c69: (-s ours) am bfebf9c5: Merge from Chromium at DEPS revision 30.0.1599.24

    * commit '42914c69443234f3a99478bcc78ceddb8556d622':

commit b403fd77c71f119ff818952a61a98b4774e2bc70
Merge: 16291ff 9b734c0
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:31:29 2013 +0000

    am 9b734c0d: (-s ours) am 3b557aa7: Record Chromium merge at DEPS revision 30.0.1599.23

    * commit '9b734c0d9ace4105eb274d249a702ce04b02aec3':

commit 16291ffd8e9c574b64e05696ad650d191e51372c
Merge: 74cf63f 55d7d3a
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:31:26 2013 +0000

    am 55d7d3ae: (-s ours) am 6bda25ff: Merge from Chromium at DEPS revision 30.0.1599.23

    * commit '55d7d3ae5171b793dc952dae590189c30ff4ead1':

commit 74cf63fedc42e2ad8a334edd7809d5720e376b04
Merge: deb4695 d2e5f2b
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:31:21 2013 +0000

    am d2e5f2be: (-s ours) am bdacb801: Record Chromium merge at DEPS revision 30.0.1599.21

    * commit 'd2e5f2be683482718d7bc9adadf5bed038828dde':

commit deb4695c0acb687fabca6a73e0ff1d32f0e2ee0e
Merge: b15332f 7c18d97
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:31:17 2013 +0000

    am 7c18d977: (-s ours) am 1347ae41: Merge from Chromium at DEPS revision 30.0.1599.21

    * commit '7c18d9772a29d31f8d9346dee1530891e4a8cf6b':

commit b15332fb44c703a6f5540846dd8c4fcd6886ce9a
Merge: 3ce3182 6b20965
Author: Bo Liu <boliu@google.com>
Date:   Tue Dec 10 01:31:14 2013 +0000

    am 6b209658: (-s ours) am 4dc0716f: Merge "Cherry-pick "Use visible rect instead of clip to make tile management decisions."" into klp-dev

    * commit '6b2096584301a160de633de9f93e7d16998c8671':

commit 3ce3182bd769249e1a52382632dd1e9ef8e739d7
Merge: a289933 67e16c2
Author: Bo Liu <boliu@google.com>
Date:   Tue Dec 10 01:31:11 2013 +0000

    am 67e16c2f: (-s ours) am 7c68f9d6: Cherry-pick of https://codereview.chromium.org/22887048/

    * commit '67e16c2f03dec6f72e1315c8dc2b0a9bef5ef79f':

commit a2899339f243d4ba6310d063fb37411358d709ee
Merge: dd7addd 13bea18
Author: Martin Kosiba <mkosiba@google.com>
Date:   Tue Dec 10 01:31:07 2013 +0000

    am 13bea18d: (-s ours) am cbed202c: Patch in http://crrev.com/22903029

    * commit '13bea18db20438df607ff65640ef4096d6709e8d':

commit dd7addd5e06ff0da2d09f4c4d7ae0f2b7b7f081e
Merge: ff93b14 a150018
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:31:03 2013 +0000

    am a1500182: (-s ours) am b0c7a653: Record Chromium merge at DEPS revision 30.0.1599.18

    * commit 'a1500182ef173da0763fca56af9d217558fc2e5a':

commit ff93b14274444bbbffc791ab9ef1a46a62a10b4d
Merge: 14b15da 919ca23
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:31:00 2013 +0000

    am 919ca238: (-s ours) am 68dded96: Merge from Chromium at DEPS revision 30.0.1599.18

    * commit '919ca238fba1debe2cc5875dd29e4701cd323f85':

commit 14b15da2864c97fa401c3f0a458598772353e5ac
Merge: 8d04997 bb0fb54
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:30:55 2013 +0000

    am bb0fb549: (-s ours) am fc0b34a8: Merge "Fix crash due to a null pointer." into klp-dev

    * commit 'bb0fb54985af2587cabab426e518d62785395983':

commit 8d04997c04832d325d5f7c268fff819a116bfca0
Merge: 7635739 662d111
Author: Jonathan Dixon <joth@google.com>
Date:   Tue Dec 10 01:30:49 2013 +0000

    am 662d1116: (-s ours) am 40f22e4d: Merge "Patch in https://codereview.chromium.org/23018005/" into klp-dev

    * commit '662d1116999c3a2595364b2bac16a567cd5b90d2':

commit 763573919e36f065075fc00b10bc4b2f67ec8846
Merge: c1b035d 88572eb
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:30:44 2013 +0000

    am 88572eb6: (-s ours) am 8df386a7: Patch in https://codereview.chromium.org/23060021

    * commit '88572eb6979a377d3b2450bbc5b42a53038a6d62':

commit c1b035d80dd223e5e407860fae4ce29fdf17d5a7
Merge: a59fa8c 529ec0d
Author: Ben Murdoch <benm@google.com>
Date:   Tue Dec 10 01:30:41 2013 +0000

    am 529ec0df: (-s ours) am a2c6a870: Merge changes I2a5e86ed,Ib2f598c0 into klp-dev

    * commit '529ec0dfd8a452ae0cbe4d33870a7869220b34fa':

commit a59fa8cfaca6b992682ca73bd2ce782518d4ec6e
Merge: a1bcd07 84e2bde
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:30:37 2013 +0000

    am 84e2bdec: (-s ours) am 22a04df7: Record Chromium merge at DEPS revision 30.0.1599.16

    * commit '84e2bdec1d6cd92ea22167d6ee5d951e58f81c7a':

commit a1bcd07769c7eac8c5b9391ef4b662e2d08367d5
Merge: 88fb8be 4744388
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:30:34 2013 +0000

    am 47443886: (-s ours) am f3ce491c: Merge from Chromium at DEPS revision 30.0.1599.16

    * commit '47443886bc0409da89a082b63b7b053753befbbb':

commit 88fb8be34cf4e641383c71884cc4a609cb5412de
Merge: 650656f 40ed7f5
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:30:31 2013 +0000

    am 40ed7f53: (-s ours) am d6abc66f: Record Chromium merge at DEPS revision 30.0.1599.14

    * commit '40ed7f533c3f89d5c62e2e998c24b7c20a1134e7':

commit 650656ff4f7c998b443cf5da25cc09df4664d7e7
Merge: 2f4664c 018bafa
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:30:27 2013 +0000

    am 018bafae: (-s ours) am 7c720b74: Merge from Chromium at DEPS revision 30.0.1599.14

    * commit '018bafae36f434d09b4ed8c14e7765428bc75e28':

commit 2f4664c62795bd023b07d4ecb2c171a5f841dd4f
Merge: 9ef883d ae4c3c7
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:30:24 2013 +0000

    am ae4c3c7d: (-s ours) am 1af4903a: Fix build for mac.

    * commit 'ae4c3c7d0d170d545ae67059f4f312743997b137':

commit 9ef883d1b8bd467f45dd9a27c0fa5701252cd5e5
Merge: d646c3e 90874f1
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:30:21 2013 +0000

    am 90874f1e: (-s ours) am be2b67ad: Fix broken build due to files ignored by git

    * commit '90874f1e3e9de2e74ede4317d5db8bde4f8321ec':

commit d646c3eda09aa7c7f4b5f8daf4905f4b9a66ee48
Merge: f14ea39 da3e673
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Dec 10 01:30:17 2013 +0000

    am da3e6738: (-s ours) am 5d5be6dc: A first cut to printing.

    * commit 'da3e6738ede4ab2dd687854f172ce1e2b29e1348':

commit f14ea3970331a88bca4579c05228acbaa014b4ee
Merge: ea1bf6d dcf1fc2
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Dec 10 01:30:14 2013 +0000

    am dcf1fc2b: (-s ours) am 1ec45469: Enable use_system_skia.

    * commit 'dcf1fc2bdf13e112928f76746892fa3669e9aa06':

commit ea1bf6dd8473815591572c954f89d00b19591883
Merge: 640b6c9 546f35a
Author: torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Dec 10 01:30:11 2013 +0000

    am 546f35a7: (-s ours) am 678c4834: Cherrypick r218021: Android WebView: build fixes for use_system_skia.

    * commit '546f35a7e3d14348577eb1f0839a63e0f0f8a8eb':

commit 640b6c9da945c4bac4ca75a004daa990d403bde7
Merge: 0b28642 c757c3e
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Tue Dec 10 01:30:07 2013 +0000

    am c757c3e1: (-s ours) Reconcile with klp-release - do not merge

    * commit 'c757c3e14c5e9a448264d940ab1c7618ecd43102':

commit a38a7707a5187cf9566c88c372b8c1fa1cb43725
Merge: 7b1c56e f7ec27e
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Dec 5 17:25:21 2013 -0800

    am f7ec27e1: Merge commit \'1940731af14148e5a80066fe0ff471f40b9182a5\' into HEAD

    * commit 'f7ec27e1d91d968732768dd9e301f72d4ede8837':

commit 0b286425acc97ce6638b89c44be1e541b27cc846
Merge: 3b52f03 e31b312
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Dec 5 22:33:32 2013 +0000

    am e31b3128: (-s ours) Cherry-pick: [Android WebView] Fix in-line video part 1

    * commit 'e31b3128a419654fd14003d6117caa8da32697e7':
      Cherry-pick: [Android WebView] Fix in-line video part 1

commit 3b52f0379a02c3fea922a2eee76c4faf2d67c373
Merge: 031999b eae6ad9
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Dec 5 22:33:28 2013 +0000

    am eae6ad96: (-s ours) Merge "Revert "Cherry Pick https://codereview.chromium.org/65273002/ PS 8"" into klp-dev

    * commit 'eae6ad96677247ca0294140bd1e8932c26273500':
      Revert "Cherry Pick https://codereview.chromium.org/65273002/ PS 8"

commit 031999b59ee6d54bcc444a805241a277e198bd8d
Merge: 7d9d19d 9f30eae
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:33:25 2013 +0000

    am 9f30eaed: (-s ours) Merge "Make sure to show the correct URL from CVC" into klp-dev

    * commit '9f30eaedc3089bd173876e73524af2a6f95a6733':
      Make sure to show the correct URL from CVC

commit 7d9d19d7e697f6e1386a6c25fd8c7f939ee13b69
Merge: 444a776 1fb9f59
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:33:22 2013 +0000

    am 1fb9f596: (-s ours) Merge "IndexedDB: Ignore duplicate transaction IDs sent by renderer" into klp-dev

    * commit '1fb9f596cd47b5e6e9abaaaadf2d1873be35cc02':
      IndexedDB: Ignore duplicate transaction IDs sent by renderer

commit 444a776a1518d2f048cf7f4debaea6710afab084
Merge: 0671b44 7daa8ff
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Dec 5 22:33:19 2013 +0000

    am 7daa8ff7: (-s ours) Merge "(Fork) MR1 Fix for crash in <select> drop down" into klp-dev

    * commit '7daa8ff7eab742f86725e5082131e004ed1ff202':
      (Fork) MR1 Fix for crash in <select> drop down

commit 0671b44c5f9e487e0b54172d11ea73890389a7c9
Merge: a80c2a1 c2f5b20
Author: Kristian Monsen <kristianm@google.com>
Date:   Thu Dec 5 22:33:15 2013 +0000

    am c2f5b209: (-s ours) Merge "Fix for pasting html clipboard content into a webview" into klp-dev

    * commit 'c2f5b20934a21f961a3d8e0045d47ca4d6ce3481':
      Fix for pasting html clipboard content into a webview

commit a80c2a11ed71bf9a42179677eba6a3bad180f5f3
Merge: a730d02 c82c7db
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:33:12 2013 +0000

    am c82c7db6: (-s ours) Merge "don\'t preserve 1xx responses in parser buffer" into klp-dev

    * commit 'c82c7db6366a318db6ef91c2a02e1061fb15a319':
      don't preserve 1xx responses in parser buffer

commit a730d027700ae2fe454704c22b4fe4af1cb276a4
Merge: 034d32c dec53b8
Author: Leon Scroggins III <scroggo@google.com>
Date:   Thu Dec 5 22:33:09 2013 +0000

    am dec53b83: (-s ours) Override drawRRect in fake SkBitmapDevices.

    * commit 'dec53b837df8fe3b285f9040e38f696fc09b6f1b':
      Override drawRRect in fake SkBitmapDevices.

commit 034d32c753ce8f46fcf0ee21367f0c952a926d3c
Merge: 4f5fc04 3c29aab
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:33:06 2013 +0000

    am 3c29aaba: (-s ours) Merge "Cherry Pick https://codereview.chromium.org/65273002/ PS 8" into klp-dev

    * commit '3c29aaba6387dabc55557bbec39b59e1cb008484':
      Cherry Pick https://codereview.chromium.org/65273002/ PS 8

commit 4f5fc04741862ac4abc64487647c648b583ebfae
Merge: 6adbff4 3d97cf5
Author: Martin Kosiba <mkosiba@google.com>
Date:   Thu Dec 5 22:33:02 2013 +0000

    am 3d97cf50: (-s ours) Merge "[android_webview] Fix UAF in request interception code." into klp-dev

    * commit '3d97cf500bea628863f9606668061e6bdd59d267':
      [android_webview] Fix UAF in request interception code.

commit 6adbff4426e3b5c6d16d394e858fa7668f3b5b65
Merge: 4ce053a c906bf1
Author: Tao Bai <michaelbai@google.com>
Date:   Thu Dec 5 22:32:59 2013 +0000

    am c906bf1a: (-s ours) Merge "Cherry-pick: Create WindowAndroid to make PowerSave work." into klp-dev

    * commit 'c906bf1a11402847ea5c48e6d2199e6c2ee3404f':
      Cherry-pick: Create WindowAndroid to make PowerSave work.

commit 4ce053aab05f0677a250578767c036cbf3fc109d
Merge: 8c4a8f0 e1049c7
Author: Bo Liu <boliu@google.com>
Date:   Thu Dec 5 22:32:56 2013 +0000

    am e1049c79: (-s ours) Fix incorrect resolving of merge conflict causing graphics corruption

    * commit 'e1049c797e39f4f9f9753731b3c7054473db1b45':
      Fix incorrect resolving of merge conflict causing graphics corruption

commit 8c4a8f0bf066419305759507868eb37e0fc61f43
Merge: fefcaf8 91e7787
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:32:52 2013 +0000

    am 91e7787f: (-s ours) Merge "Call correct shouldoverrideurlloading when popups are created." into klp-dev

    * commit '91e7787fa5338fc0eeb6cbf0c504d4dc187b16ce':
      Call correct shouldoverrideurlloading when popups are created.

commit fefcaf88078128329a9081f415d70a5c91d15ad4
Merge: 68f896c 7cf8cef
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Dec 5 22:32:49 2013 +0000

    am 7cf8cef2: (-s ours) Merge "Cherry-pick "Fix a fd leak in NPChannelBase on Posix"" into klp-dev

    * commit '7cf8cef2daadffac251c9fb11a16be569e0355ed':
      Cherry-pick "Fix a fd leak in NPChannelBase on Posix"

commit 68f896c83b7bee90e322ae479d70c39bd70475d9
Merge: d807696 18760af
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Dec 5 22:32:45 2013 +0000

    am 18760af8: (-s ours) Cherry-pick: [Android WebView] Null check syncOnNewPictureStateToNative

    * commit '18760af88a405ded53cf524d9a273b217e759807':
      Cherry-pick: [Android WebView] Null check syncOnNewPictureStateToNative

commit d80769620dd4adf16f28aa49d383f1624c63286a
Merge: 7be75ff 2d28b99
Author: Bo Liu <boliu@google.com>
Date:   Thu Dec 5 22:32:42 2013 +0000

    am 2d28b99e: (-s ours) Merge "Cherry-pick: [Android WebView] Only throttle fallback tick" into klp-dev

    * commit '2d28b99e19858055810a156a17ba64b173f6e614':
      Cherry-pick: [Android WebView] Only throttle fallback tick

commit 7be75ff00c0506256fe031f37baf38371e999b57
Merge: 895e045 dc4f02f
Author: Tao Bai <michaelbai@google.com>
Date:   Thu Dec 5 22:32:39 2013 +0000

    am dc4f02f0: (-s ours) Merge "Cherry-pick: Block media loading when AwSettings.setBlockNetworkLoads is true." into klp-dev

    * commit 'dc4f02f03ac951145533721607d283ea627dd6fa':
      Cherry-pick: Block media loading when AwSettings.setBlockNetworkLoads is true.

commit 895e04560fd65e2e90521dfa8f6c81373e6f6896
Merge: 426c415 493c03e
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Dec 5 22:32:36 2013 +0000

    am 493c03e6: (-s ours) Cherry-pick: [Android WebView] Change tile size to 384

    * commit '493c03e651ed36e9a01c2ec2caeae079b3db7e8c':
      Cherry-pick: [Android WebView] Change tile size to 384

commit 426c415386e35e29c29a8feb1a99b4a2ca001567
Merge: 044817e b40c061
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Dec 5 22:32:32 2013 +0000

    am b40c061f: (-s ours) Merge changes I3bfa9cdd,Ideb06f7d,I9ecff16e,I0c7677a4 into klp-dev

    * commit 'b40c061feaf4b9e4a6e7dcde888c70f97d34fa41':
      Cherry-pick: gpu: Add Will/DidUseTexImage to GLImage API.
      Cherry-pick: Work around broken GL_TEXTURE_BINDING_EXTERNAL_OES query
      Cherry-pick: CC: Ensure recycle tree contains no 'active' tiles.
      Cherry-pick: CC: Cap the size of the SOON_BIN.

commit 044817ed780fcbf6a5ca218b5ee554c0c9d1aef3
Merge: 8773630 f9bd2a0
Author: Martin Kosiba <mkosiba@google.com>
Date:   Thu Dec 5 22:32:29 2013 +0000

    am f9bd2a04: (-s ours) [android] Fire accessibility events when scrolling sublayers.

    * commit 'f9bd2a04aa7c6c1c64504e0d5c5f5b0a4eb48755':
      [android] Fire accessibility events when scrolling sublayers.

commit 8773630e1db5666fe546b33ba080e4105c4fb23b
Merge: de074dc e38e0d9
Author: Martin Kosiba <mkosiba@google.com>
Date:   Thu Dec 5 22:32:26 2013 +0000

    am e38e0d9c: (-s ours) Merge "Set a fixed layout size only if the container view has a WRAP_CONTENT layout mode." into klp-dev

    * commit 'e38e0d9caf5215dfad883e6934dc1aad1aa7635d':
      Set a fixed layout size only if the container view has a WRAP_CONTENT layout mode.

commit de074dc73bdf75111b47314d2c40bf0e74463910
Merge: 5085a3c 040e397
Author: Bo Liu <boliu@google.com>
Date:   Thu Dec 5 22:32:23 2013 +0000

    am 040e397b: (-s ours) Fork: Skip gralloc unbind on all except NVIDIA

    * commit '040e397bbc0ecd017aa4c19ce9cd87953a60fc8e':
      Fork: Skip gralloc unbind on all except NVIDIA

commit 5085a3cb133a5737b09ac76139583504d54ec082
Merge: 7121ae4 ad8795d
Author: peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Dec 5 22:32:19 2013 +0000

    am ad8795de: (-s ours) Cherry-pick "Android should be able to copy HTML snippets to the system clipboard."

    * commit 'ad8795de7da44277582b3b0fc9910193ca1e511e':
      Cherry-pick "Android should be able to copy HTML snippets to the system clipboard."

commit 7121ae4321cf50c00081d5ba07b9a218f1ffd31d
Merge: 761f2c7 3556c0a
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:32:16 2013 +0000

    am 3556c0ac: (-s ours) Merge "Disable NOTIMPLEMENTED() in release branch." into klp-dev

    * commit '3556c0ac9cef4c8808ca792bd3008dd517a0f2d1':
      Disable NOTIMPLEMENTED() in release branch.

commit 761f2c765a6f9864b12b6bbb78448050a02fbef7
Merge: 7aed6b5 6e78fdd
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Dec 5 22:32:13 2013 +0000

    am 6e78fdd9: (-s ours) Merge "Cherry-pick "Reject rather than abort client certificates"" into klp-dev

    * commit '6e78fdd95ad40eef8b73cb62c6bec7e8136c31d3':
      Cherry-pick "Reject rather than abort client certificates"

commit 7aed6b5d5bb42bd6a25932bac1eafd517a184d3f
Merge: 4f457a7 c5ed0dd
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Dec 5 22:32:10 2013 +0000

    am c5ed0dd4: (-s ours) Cherry-pick with modification: cc: Fix CHECK failure in PictureLayerImpl::UpdateTilePriorities

    * commit 'c5ed0dd4a10d05b45470feb21d7f5e5d21b375db':
      Cherry-pick with modification: cc: Fix CHECK failure in PictureLayerImpl::UpdateTilePriorities

commit 4f457a73fbb1ee34b05bd6bc34fc02b6515af346
Merge: d023305 491c833
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Dec 5 22:32:07 2013 +0000

    am 491c833c: (-s ours) Merge "Cherry-pick "Dynamically enable spatial navigation based on events"" into klp-dev

    * commit '491c833cfd4760ae9961acf48ed51e5b9fff8d09':
      Cherry-pick "Dynamically enable spatial navigation based on events"

commit d023305629e1a6d8da7fdb27c2b0770032d532b4
Merge: ddf6ce7 2735d69
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Dec 5 22:32:03 2013 +0000

    am 2735d698: (-s ours) Cherry-pick with modification: cc: PictureLayerImpl with empty bounds should not have tiles

    * commit '2735d698090c20cd68ed6849096a9a06c25832c8':
      Cherry-pick with modification: cc: PictureLayerImpl with empty bounds should not have tiles

commit ddf6ce7706637651a8f8bc60560d047104d1800c
Merge: e8f3404 2c3943e
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:32:00 2013 +0000

    am 2c3943e4: (-s ours) Merge "Prevent log spam in autofill" into klp-dev

    * commit '2c3943e4a16b91cb1a8122a4f351b56364ba9f9b':
      Prevent log spam in autofill

commit e8f34044d5e325b8ca6db9b104f86d508cc4c659
Merge: f61036f f3dbc6e
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:31:57 2013 +0000

    am f3dbc6e1: (-s ours) Merge "Do not exclude background images/colors when printing" into klp-dev

    * commit 'f3dbc6e198bec673f0ad01df3fd06a8b9adc5c41':
      Do not exclude background images/colors when printing

commit f61036f2a58227b2b444ecb47cc02b3183bcf276
Merge: 4080c96 37fd82d
Author: Marcin Kosiba <mkosiba@google.com>
Date:   Thu Dec 5 22:31:54 2013 +0000

    am 37fd82dc: (-s ours) Merge "[android_webview] Fix crash in testCreateDestroy." into klp-dev

    * commit '37fd82dc6c57fc507cfff1b042001ff2b06d2300':
      [android_webview] Fix crash in testCreateDestroy.

commit 4080c9648806528e129a28abfea5b5b545409152
Merge: b7d77f3 218d56e
Author: Bart Sears <bsears@google.com>
Date:   Thu Dec 5 22:31:50 2013 +0000

    am 218d56eb: (-s ours) Merge "Cherry pick  [Android] MediaPlayerBridge should pass Bridge to getAllowedOperations" into klp-dev

    * commit '218d56ebb43b3487ce1df57f971d82d8180dabbb':
      Cherry pick  [Android] MediaPlayerBridge should pass Bridge to getAllowedOperations

commit b7d77f3ccda0535bb113d2a018a7fb1740db0800
Merge: b7e1541 a8e6223
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:31:47 2013 +0000

    am a8e6223c: (-s ours) Merge "Android WebView: use IO thread for cookie manager." into klp-dev

    * commit 'a8e6223cfbd5e2a25116645ec1527a04fca1044a':
      Android WebView: use IO thread for cookie manager.

commit b7e15413fdb5fcd7b0df1f457d3f36d84d71be69
Merge: 291a71b 3919f93
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:31:44 2013 +0000

    am 3919f93d: (-s ours) Cherry pick android: fix base::Time::FromLocalExploded() crash.

    * commit '3919f93d03121151c87c504c3143d160806c4474':
      Cherry pick android: fix base::Time::FromLocalExploded() crash.

commit 291a71b7066820f231db0f07a75642c3b5480acb
Merge: f8b60db eb7b227
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:31:41 2013 +0000

    am eb7b2273: (-s ours) Cherry pick [Android] Hide handles when the containing view moves

    * commit 'eb7b2273e27c3bc50668efb83c31402500c6c8f1':
      Cherry pick [Android] Hide handles when the containing view moves

commit f8b60dbf7e2c1f488d41728808dc436ccf9630c8
Merge: 53b68e9 00d67fb
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:31:37 2013 +0000

    am 00d67fbe: (-s ours) Cherry pick [Android] Allow text handles to observe position of "parent" view

    * commit '00d67fbec31ea9c007c872d7605303593c83101e':
      Cherry pick [Android] Allow text handles to observe position of "parent" view

commit 53b68e927a7704983dd213557593a1033f4df65f
Merge: bea751b 2cabbb3
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:31:34 2013 +0000

    am 2cabbb3b: (-s ours) Merge "Cherry Pick [Android] Properly handle cancelled scroll events" into klp-dev

    * commit '2cabbb3bae6df73db637a913562823306be613a8':
      Cherry Pick [Android] Properly handle cancelled scroll events

commit bea751b8d3bbd6dd9da39e9a124665352a758b08
Merge: a5d0507 d81d4fb
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:31:31 2013 +0000

    am d81d4fb9: (-s ours) Merge "Cherry-pick "[Android] Don\'t hide text handles if they are being dragged"" into klp-dev

    * commit 'd81d4fb97fe99cc8ea3a20a3ceccb39294c0239f':
      Cherry-pick "[Android] Don't hide text handles if they are being dragged"

commit a5d0507b8245de4d0c84e2c2c785c5f97c9f21b6
Merge: 57b9cea efe95cda
Author: Bo Liu <boliu@google.com>
Date:   Thu Dec 5 22:31:28 2013 +0000

    am efe95cda: (-s ours) Revert "Fork: Read and skip glBindRenderbufferEXT if no change"

    * commit 'efe95cda899c7ca656eaa82685a9cf0443020513':
      Revert "Fork: Read and skip glBindRenderbufferEXT if no change"

commit 57b9ceaecf9b532e6d164b830a976fab1d6b19be
Merge: 75d5b03 cf0c1a0
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Dec 5 22:31:25 2013 +0000

    am cf0c1a0e: (-s ours) Cherry-pick: [Android WebView] Do not throttle if need picture listener

    * commit 'cf0c1a0e7d3ebad160824014d10c9524fba638ae':
      Cherry-pick: [Android WebView] Do not throttle if need picture listener

commit 75d5b036c3f68472912f16b98bdf9d5e70837663
Merge: 219c4ba b175e69
Author: Ed Heyl <edheyl@google.com>
Date:   Thu Dec 5 22:31:21 2013 +0000

    am b175e69a: (-s ours) merge in klp-release (no-op)

    * commit 'b175e69a046cc5fa42171afcaf2d05a731121feb':
      [android_webview] Update fixed layout size on page scale changes.
      Cherry-pick: cc: Fix ideal_content_scale check in PictureImageLayerImpl
      Cherry-pick: [Android WebView] Check AwContentsIoThreadClient usage
      Split AwSettings contruction out of AwContents
      Android code should not assume main thread == UI thread.
      Cherry-pick: Early out if contentviewcore native side is null.
      Fixes to shouldoverrideurlloading for compatibility

commit 219c4ba649aa180581c55afbf8f5c51f3e3b174d
Merge: 740f025 11d030b
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:31:18 2013 +0000

    am 11d030b3: (-s ours) Support a prebuilt WebView.

    * commit '11d030b31fde08e3d37b9a20cb00666ea6222aaf':
      Support a prebuilt WebView.

commit 740f0257dc92bfca79d6266ad5ec0f2c2c2dabcb
Merge: d0c0e43 28e3c70
Author: Bo Liu <boliu@google.com>
Date:   Thu Dec 5 22:31:15 2013 +0000

    am 28e3c708: (-s ours) Fork: Skip unbind image to texture on ARM

    * commit '28e3c708edc98abce5b8c0be99e63ae752bd899c':
      Fork: Skip unbind image to texture on ARM

commit d0c0e43d671754d19d29c220cc3c4b4fd9e55214
Merge: 4a84c6a 99d7eee
Author: Bo Liu <boliu@google.com>
Date:   Thu Dec 5 22:31:12 2013 +0000

    am 99d7eee1: (-s ours) Merge "Fork: Read and skip glBindRenderbufferEXT if no change" into klp-dev

    * commit '99d7eee1ddf8f5c8ef127f961c0f61f58879ca7c':
      Fork: Read and skip glBindRenderbufferEXT if no change

commit 4a84c6aeca9fa619bc09f818fab8832b62f4c6f5
Merge: 4129a3c de8ca0a
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:31:08 2013 +0000

    am de8ca0a0: (-s ours) Merge "Make extra headers only apply to the main frame." into klp-dev

    * commit 'de8ca0a055d88e8ccf9950b0cdba763245993e4e':
      Make extra headers only apply to the main frame.

commit 4129a3ca414bf946e22cdae56b6b886512bf5d16
Merge: 8927bfb 828d8c2
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Dec 5 22:31:05 2013 +0000

    am 828d8c23: (-s ours) Merge "Wire up the quirk for merging multiple <meta viewport> tags" into klp-dev

    * commit '828d8c23d964560acf2a0e0aaf5d572d5aaf9b30':
      Wire up the quirk for merging multiple <meta viewport> tags

commit 8927bfbe785fafac90885c024f10dbc7b83e96ad
Merge: e2bbfb5 fcd5c11
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Dec 5 22:31:01 2013 +0000

    am fcd5c11b: (-s ours) Cherry-pick: [Android] Use getEventTime for long press timeout

    * commit 'fcd5c11bbf7f316110ea1f5435494ecfccf3c5fa':
      Cherry-pick: [Android] Use getEventTime for long press timeout

commit e2bbfb55e39140c787479efbe9b12c6a62c69bc0
Merge: 4a2f259 81db8d8
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:30:58 2013 +0000

    am 81db8d8d: (-s ours) Merge "Maintain a ref to Java objects while print in progress" into klp-dev

    * commit '81db8d8dc9a4a004ebed0f4e13fa8f927fc34d36':
      Maintain a ref to Java objects while print in progress

commit 4a2f25966b4b6119ad5fbb3898b557991ab2799f
Merge: fee1828 0aabc40
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Dec 5 22:30:54 2013 +0000

    am 0aabc40a: (-s ours) Cherry-pick: [Android] Retry create StreamTextureProxy on play

    * commit '0aabc40ab6c782bed30450758afd0c2c71d9969f':
      Cherry-pick: [Android] Retry create StreamTextureProxy on play

commit fee1828eee3ab2e3edc37283ea8b71bdf33b9c8f
Merge: ce27f75 ff02a59
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Dec 5 22:30:51 2013 +0000

    am ff02a590: (-s ours) Cherry-pick with modifications: cc: Fix HeadsUpDisplayLayerImpl NPE after resource loss

    * commit 'ff02a5906993e65f5c8bf12b09245e7a673d8283':
      Cherry-pick with modifications: cc: Fix HeadsUpDisplayLayerImpl NPE after resource loss

commit ce27f751758da11010265905d09aa490e453c039
Merge: 2370e85 e3c7845
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:30:48 2013 +0000

    am e3c7845b: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.101

    * commit 'e3c7845b168eba637e7b68fada7303e7835938e4':
      Record Chromium merge at DEPS revision 30.0.1599.101

commit 2370e85e5119c5354b2cbff0823aced9d01a8f32
Merge: 3c4299e f5936e5
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:30:44 2013 +0000

    am f5936e50: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.101

    * commit 'f5936e50c9ec1155768565fb2a8c955b67d9b962':
      Merge from Chromium at DEPS revision 30.0.1599.101

commit 3c4299e29923e5193e2766897840901cb3a2b8fb
Merge: 7b0bf9c 772f35d
Author: Richard Coles <torne@google.com>
Date:   Thu Dec 5 22:30:41 2013 +0000

    am 772f35d4: (-s ours) Merge "Cherry-pick: Android: disable 2d canvas AA in a different place." into klp-dev

    * commit '772f35d4a19c0c8865427dc75a445829eb132748':
      Cherry-pick: Android: disable 2d canvas AA in a different place.

commit 7b0bf9c1cfcb955abd2edf7c303a51451025e03f
Merge: d5464d3 6d3352e
Author: Martin Kosiba <mkosiba@google.com>
Date:   Thu Dec 5 22:30:33 2013 +0000

    am 6d3352ed: (-s ours) [android_webview] Update fixed layout size on page scale changes.

    * commit '6d3352ed33733df11e4b78c98ab4dcfcb9a64279':
      [android_webview] Update fixed layout size on page scale changes.

commit d5464d36ac4e559fd95b4ee91a0f96ba4f2f30a2
Merge: 28eac64 b76d682
Author: Mikhail Naganov <mnaganov@google.com>
Date:   Thu Dec 5 22:30:29 2013 +0000

    am b76d682e: (-s ours) Cherry-pick: [Android WebView] Enable the Blink quirk for returning screen sizes in physical pixels

    * commit 'b76d682e577a78ae238af2584c91351331c8ea61':
      Cherry-pick: [Android WebView] Enable the Blink quirk for returning screen sizes in physical pixels

commit 28eac6412d9eedaab75c63e8e89fd2fc446b8d86
Merge: 14d551c ab145de
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Dec 5 22:30:26 2013 +0000

    am ab145de0: (-s ours) Merge "Workaround for apps expecting invalid URL resolutions" into klp-dev

    * commit 'ab145de0264be08630f38c48de5759cd9882b97b':
      Workaround for apps expecting invalid URL resolutions

commit 14d551ccceb2bf48bb4cc699eff538ac4f69473a
Merge: 7778473 f24abfd
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Dec 5 22:30:23 2013 +0000

    am f24abfd8: (-s ours) Merge "Use total page scale in the LayerScrollOffsetDelegate." into klp-dev

    * commit 'f24abfd8816a1b217a26172d71568bdad8d243fe':
      Use total page scale in the LayerScrollOffsetDelegate.

commit 77784733b5dbf19400f38342f21245becd6312e1
Merge: 2721502 431571a
Author: Bo Liu <boliu@chromium.org>
Date:   Thu Dec 5 22:30:20 2013 +0000

    am 431571a3: (-s ours) Fork: Do not clear document background in Android WebView

    * commit '431571a3a769041c098e15fed32e0a980b3029d2':
      Fork: Do not clear document background in Android WebView

commit 272150256702896d28ecc54a06f017fea7775985
Merge: 0b4d83a fbc84d9
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Dec 5 22:30:17 2013 +0000

    am fbc84d90: (-s ours) Merge "Cherry-pick "Add --disable-compositor-touch-hit-testing flag"" into klp-dev

    * commit 'fbc84d90c9b42fb02bb9d81bada128d638b942e0':
      Cherry-pick "Add --disable-compositor-touch-hit-testing flag"

commit 0b4d83a9ec0679a75af4cf110c2df75a96cd0201
Merge: 2b3b15b 5f8ef20
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:30:13 2013 +0000

    am 5f8ef208: (-s ours) WebView: Fix CookieManager file:// scheme functions.

    * commit '5f8ef208b84e80afecf9821a90589487c851b400':
      WebView: Fix CookieManager file:// scheme functions.

commit 2b3b15b775bde78e58e79dfac3d767f338e24e48
Merge: 5da4b60 bb535fb
Author: Alexandre Elias <aelias@google.com>
Date:   Thu Dec 5 22:30:10 2013 +0000

    am bb535fb2: (-s ours) Merge "Cherry-pick http://crrev.com/25233002 "Make Android WebView filtering depend on scrolling status."" into klp-dev

    * commit 'bb535fb2ef23e55737a27cd974d4304a1e2e1f7a':
      Cherry-pick http://crrev.com/25233002 "Make Android WebView filtering depend on scrolling status."

commit 5da4b6088ecfc1c38b799fc22327c443f0bef98c
Merge: 7115af7 3d4c8d8
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:30:07 2013 +0000

    am 3d4c8d8c: (-s ours) Merge "Fix shouldoverrideurlloading." into klp-dev

    * commit '3d4c8d8c8f66216ff316a70bc8e227830b23251f':
      Fix shouldoverrideurlloading.

commit 7115af7b9aa905e37b6202def69cff78e5f832d2
Merge: cdf0ae1 6648600
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:30:04 2013 +0000

    am 66486001: (-s ours) Merge "Revert "Further cleanup of shouldoverrideUrlloading change"" into klp-dev

    * commit '664860012f6b3a9cb016b515bde125fc190785c6':
      Revert "Further cleanup of shouldoverrideUrlloading change"

commit cdf0ae14d7e819a5fa46afa699455519f056d208
Merge: 393a0a5 b6c936b
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:30:01 2013 +0000

    am b6c936bc: (-s ours) Merge "Revert "Complete Sync shouldoverrideurlloading by cleaning code"" into klp-dev

    * commit 'b6c936bc99117f4042bb9ff784fc444543fa83de':
      Revert "Complete Sync shouldoverrideurlloading by cleaning code"

commit 393a0a5b1ce38666c8e4bed497db640f62b226e6
Merge: c10bb97 ba09230
Author: Ed Heyl <edheyl@google.com>
Date:   Thu Dec 5 22:29:58 2013 +0000

    am ba09230b: (-s ours) merge in KFS78N (no-op)

    * commit 'ba09230ba6ad5cf4899bfb299beb1fdb17fe82ec':
      Cherry-pick http://crrev.com/23478022
      Revert "Patch in http://crrev.com/22903029"

commit c10bb97c9894a46e6522632c9f4aca3ad4251bf3
Merge: c79d7b1 dfb6ade
Author: Bo Liu <boliu@google.com>
Date:   Thu Dec 5 22:29:54 2013 +0000

    am dfb6aded: (-s ours) Merge "Cherry-pick: cc: Fix ideal_content_scale check in PictureImageLayerImpl" into klp-dev

    * commit 'dfb6aded03a43c65c029b57deedf4cb1fdab3fa7':
      Cherry-pick: cc: Fix ideal_content_scale check in PictureImageLayerImpl

commit c79d7b10eca322d8ab95c317ce6617559474a072
Merge: e2fa049 2a31b71
Author: Ed Heyl <edheyl@google.com>
Date:   Thu Dec 5 22:29:51 2013 +0000

    am 2a31b712: (-s ours) merge in KQS81M

    * commit '2a31b7123aed21a8dd506113d4e03e0492137f7d':
      [android_webview] Fix layout in AT_MOST mode.
      Revert "Downstream Workaround for Qualcomm Bug 10205015"
      Manual cherry-pick of https://codereview.chromium.org/23623020
      Cherry-pick "Send Android accessibility "content changed" event for any change"
      Patch in http://crrev.com/22903029
      Patch in https://codereview.chromium.org/23018005/
      Cherry pick https://codereview.chromium.org/22882002/ PS1
      Cherry pick of https://codereview.chromium.org/22486004/ PS5
      Bump up the fallback OS version number to 4.3.0
      Cherry pick of https://codereview.chromium.org/19522006

commit e2fa049170ee32a7eec0401d0c97aaa9e9af59f9
Merge: 7ba7d49 2c5321a
Author: torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Dec 5 22:29:48 2013 +0000

    am 2c5321ad: (-s ours) Cherry-pick: Android WebView: post QuotaManager calls to UI thread.

    * commit '2c5321ad9e38e13db96aa452156b86271b6c4958':
      Cherry-pick: Android WebView: post QuotaManager calls to UI thread.

commit 7ba7d49d12842e5d61467b5f93ce6fff4af4639f
Merge: 68152fa 1cca392
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:29:45 2013 +0000

    am 1cca3922: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.100

    * commit '1cca392207c98e41cc22bd242c6738f9ce2f5dd2':
      Record Chromium merge at DEPS revision 30.0.1599.100

commit 68152fac7dbd99662819e2b8c635f04baac9ee25
Merge: a7e00d9 9ab648a
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:29:41 2013 +0000

    am 9ab648a9: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.100

    * commit '9ab648a9d8bb43f27cc0620387d8052a8485a5ee':
      Merge from Chromium at DEPS revision 30.0.1599.100

commit a7e00d99ba704f65a359b9b0141e57022d354460
Merge: f52a695 f1f5a61
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Dec 5 22:29:38 2013 +0000

    am f1f5a614: (-s ours) Cherry-pick: [Android WebView] Disable shrinksStandaloneImagesToFit

    * commit 'f1f5a614c72ca11541bdec079819d75c98464177':
      Cherry-pick: [Android WebView] Disable shrinksStandaloneImagesToFit

commit f52a695f976a618133374e1515c9b3f4ec5a431d
Merge: 4dc8361 c93e859
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:29:35 2013 +0000

    am c93e8595: (-s ours) Merge "Cherry pick [Android WebView] Disable WebRTC." into klp-dev

    * commit 'c93e8595cd8964d49e8fa9f82d5c40619cded71c':
      Cherry pick [Android WebView] Disable WebRTC.

commit 4dc83611fcd22eb8dd8578237f91535b7f2da092
Merge: 7be5b93 6d46f37
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:29:32 2013 +0000

    am 6d46f372: (-s ours) Merge "Cherry Pick [Android WebView] Add an API to control favicon loading." into klp-dev

    * commit '6d46f372eaeefc05bad81b4ccbd4be041f6aad1b':
      Cherry Pick [Android WebView] Add an API to control favicon loading.

commit 7be5b93d9ceef1a6ba85ff0a6b40d7ce377b1d05
Merge: 2ac02ce d3b04d9
Author: Bo Liu <boliu@google.com>
Date:   Thu Dec 5 22:29:29 2013 +0000

    am d3b04d94: (-s ours) Fork: Activation do not depend on BeginFrame

    * commit 'd3b04d94ac5d69bc004407623274e7b4f78fe950':
      Fork: Activation do not depend on BeginFrame

commit 2ac02ce460af7957eb49cf3cff53255a8cc9da79
Merge: 00192bc 20a183a
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:29:25 2013 +0000

    am 20a183ad: (-s ours) Allow CookieManager to be used without starting Chromium.

    * commit '20a183ad098c05cd932b716c568006ea05000542':
      Allow CookieManager to be used without starting Chromium.

commit 00192bce69176f2b011490a10492dd098a92e203
Merge: 9eceb76 1e62f0c
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Dec 5 22:29:22 2013 +0000

    am 1e62f0c0: (-s ours) Cherry-pick: [Android WebView] Check AwContentsIoThreadClient usage

    * commit '1e62f0c031cc1d397084dfe50a26162f857ae4c9':
      Cherry-pick: [Android WebView] Check AwContentsIoThreadClient usage

commit 9eceb76291d0fc4abce1c264ba4c9c2bf88e6e35
Merge: 471468b 00bdd09
Author: Bo Liu <boliu@google.com>
Date:   Thu Dec 5 22:29:19 2013 +0000

    am 00bdd09e: (-s ours) Merge "Cherry-pick: [Android] Prevent re-entrance into ContentVideoView.exitFullscreen" into klp-dev

    * commit '00bdd09e0836be18c4253b10d2cf84dfba5cfd3f':
      Cherry-pick: [Android] Prevent re-entrance into ContentVideoView.exitFullscreen

commit 471468b330acf6f15143be1212053b2d2bb5855f
Merge: 0398e99 e0f9243
Author: Bo Liu <boliu@google.com>
Date:   Thu Dec 5 22:29:16 2013 +0000

    am e0f9243d: (-s ours) Merge "Cherry-pick: [Android WebView] Change default tile size to 512x512" into klp-dev

    * commit 'e0f9243d15bc8219966c275be63014ac035046e8':
      Cherry-pick: [Android WebView] Change default tile size to 512x512

commit 0398e99908e24c20a93b564e66541d499469e45a
Merge: 293ac29 e61eb14
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Dec 5 22:29:13 2013 +0000

    am e61eb146: (-s ours) Split AwSettings contruction out of AwContents

    * commit 'e61eb146503996483746547b385915c34528d838':
      Split AwSettings contruction out of AwContents

commit 293ac29b61b5a2710434d60fee3c9d8492d00f72
Merge: e07f28b c7bc415
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:29:09 2013 +0000

    am c7bc4150: (-s ours) Android code should not assume main thread == UI thread.

    * commit 'c7bc4150c7dee00c658772863a771d00102e00fb':
      Android code should not assume main thread == UI thread.

commit e07f28bfcc03ba4a12bffd9c49cc22a520290820
Merge: b9a3c74 d3df597
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Dec 5 22:29:05 2013 +0000

    am d3df597f: (-s ours) Cherry-pick: [Android WebView] Fix invalidate corner case

    * commit 'd3df597fc02afb0e88fef13c90cd425c2065bbf6':
      Cherry-pick: [Android WebView] Fix invalidate corner case

commit b9a3c744a8ecd2ff5e9720cd5143339f0c97f098
Merge: 8cf5338 7211bb1
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Dec 5 22:29:02 2013 +0000

    am 7211bb13: (-s ours) Cherry-pick: [Android WebView] OnMemoryPressure to drop tile memory

    * commit '7211bb133f06cafe148e28f08fbfe0b90c4b1b78':
      Cherry-pick: [Android WebView] OnMemoryPressure to drop tile memory

commit 8cf5338fcf133b2b39caab5855bbdb1b14930372
Merge: 9095b8f 83f0adc
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Dec 5 22:28:58 2013 +0000

    am 83f0adcf: (-s ours) Cherry-pick: [Android] Restore EGL Context after collecting GPU info

    * commit '83f0adcf664daf43b691f703508068b17b86196d':
      Cherry-pick: [Android] Restore EGL Context after collecting GPU info

commit 9095b8f2ba344f7325a78497e63a76aced22d3c4
Merge: e3b7938 b95a50b
Author: Bo Liu <boliu@google.com>
Date:   Thu Dec 5 22:28:55 2013 +0000

    am b95a50b8: (-s ours) Merge "Cherry-pick: [Android WebView] Fix fallback tick corner cases" into klp-dev

    * commit 'b95a50b8fad87211d89087a3e78cf12c8f873f9c':
      Cherry-pick: [Android WebView] Fix fallback tick corner cases

commit e3b7938d460772704c5f6ace798be04574401ed2
Merge: 3dd13aa 5294690
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Dec 5 22:28:52 2013 +0000

    am 52946908: (-s ours) Cherry-pick: [Android WebView] Use CUTOFF_ALLOW_NICE_TO_HAVE

    * commit '52946908e7f3d7793093ef8cda46dbe61175eb3e':
      Cherry-pick: [Android WebView] Use CUTOFF_ALLOW_NICE_TO_HAVE

commit 3dd13aa39b23c3f68cfdc41d990a9ba1091539b9
Merge: 42bc1c9 a78ae86
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:28:49 2013 +0000

    am a78ae862: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.85

    * commit 'a78ae8624443df8a00c2ea634e92faa4c4164cbf':
      Record Chromium merge at DEPS revision 30.0.1599.85

commit 42bc1c97f5de03572bf362dee1f9ee1375b86108
Merge: ed7bd84 762b2f2
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:28:45 2013 +0000

    am 762b2f21: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.85

    * commit '762b2f2129a215bc851e73887244c3a82a892731':
      Merge from Chromium at DEPS revision 30.0.1599.85

commit ed7bd84e71290c4b7a1a5fcfc994f6aec55cd89e
Merge: 5545dad 331ba8b
Author: primiano@chromium.org <primiano@chromium.org>
Date:   Thu Dec 5 22:28:42 2013 +0000

    am 331ba8b1: (-s ours) Cherry-pick: CC: Fix call order of ScrollOffsetDelegate in ActivatePendingTree.

    * commit '331ba8b17b62dfe7ec9544bbfc1203a2ba03c0c3':
      Cherry-pick: CC: Fix call order of ScrollOffsetDelegate in ActivatePendingTree.

commit 5545dad521bf14f4b6719e0acc5e36a1ffc570b0
Merge: 980c5c3 3f1a192
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:28:39 2013 +0000

    am 3f1a192d: (-s ours) Cherry-pick: Early out if contentviewcore native side is null.

    * commit '3f1a192d4cbcd79827e1efe187d4520c4e7df64c':
      Cherry-pick: Early out if contentviewcore native side is null.

commit 980c5c3a3cc499d8cdeb295e506cf0d85dc28907
Merge: dd817ea 58b78f9
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Dec 5 22:28:36 2013 +0000

    am 58b78f98: (-s ours) Cherry-pick: [Android WebView] Hook up MemoryPressureListener

    * commit '58b78f98549d67d69dd93ae7384d8b499bbcba71':
      Cherry-pick: [Android WebView] Hook up MemoryPressureListener

commit dd817eaf742fe5aab41836dde65b9b9f39c52b87
Merge: 89a13cc 58a2f6b
Author: Alexandre Elias <aelias@google.com>
Date:   Thu Dec 5 22:27:51 2013 +0000

    am 58a2f6b8: (-s ours) Merge "Cherry-pick http://crrev.com/24280009" into klp-dev

    * commit '58a2f6b8fd2c42a65d95955e071e72ca7f0ac9b5':
      Cherry-pick http://crrev.com/24280009

commit 89a13cca4f43866f790f58c4d83bccf2eec1f9fb
Merge: e6fe74a ad048f7
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Dec 5 22:27:48 2013 +0000

    am ad048f7a: (-s ours) Cherry-pick: [Android WebView] Tweak gpu memory for low end devices

    * commit 'ad048f7a97bef13992a090518199eebadb06006d':
      Cherry-pick: [Android WebView] Tweak gpu memory for low end devices

commit e6fe74ab1fa97cbb98037fe49f896a59e04d761e
Merge: f16d3b0 9c54b5e
Author: Bo Liu <boliu@google.com>
Date:   Thu Dec 5 22:27:45 2013 +0000

    am 9c54b5e6: (-s ours) Merge "Cherry-pick: [Android WebView] Fix NPE in video when context creation fails" into klp-dev

    * commit '9c54b5e6ab85ca15242bff6b268963384b34b525':
      Cherry-pick: [Android WebView] Fix NPE in video when context creation fails

commit f16d3b08372cbcb902fa9cc47ac824bb6b2490e9
Merge: e54daed a5bfe74
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:27:40 2013 +0000

    am a5bfe74f: (-s ours) Merge "Cherry pick [Android WebView] Populate WebKit WebPreferences correctly in browser" into klp-dev

    * commit 'a5bfe74f6f71a95c561a5a16074f9174acb4884a':
      Cherry pick [Android WebView] Populate WebKit WebPreferences correctly in browser

commit e54daedf3286ac3b31f2383930532d34c2301da4
Merge: d84e92c e4d11e1
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:27:37 2013 +0000

    am e4d11e16: (-s ours) Merge "Cherry pick [Android] When toggling AX script inject, also set native AX state." into klp-dev

    * commit 'e4d11e16722809ba0916c1820c48ba7de74ec064':
      Cherry pick [Android] When toggling AX script inject, also set native AX state.

commit d84e92c37e4f4611d5a678985670e1c8ace4d9d5
Merge: 2258eb6 9117cf2
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:27:33 2013 +0000

    am 9117cf27: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.82

    * commit '9117cf272bd1ff977e53f13cf09f28553ecb34fb':
      Record Chromium merge at DEPS revision 30.0.1599.82

commit 2258eb69b5d3cebb2233125f346e1c26c21e2312
Merge: 4d496d5 f4c09e4
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:27:29 2013 +0000

    am f4c09e4d: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.82

    * commit 'f4c09e4da90034483afafd74218d4788668d380a':
      Merge from Chromium at DEPS revision 30.0.1599.82

commit 4d496d5aa407d5e4fb1787c2a694bbde5a4d4301
Merge: 3755213 e103615
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:27:25 2013 +0000

    am e1036150: (-s ours) Fix the build

    * commit 'e1036150613fa1c175b7e73ca03d6ed3af68b757':
      Fix the build

commit 37552139cdbaec924bf77ea8bc2b5d7457884a18
Merge: 2777dfe b82173f
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:27:22 2013 +0000

    am b82173f6: (-s ours) Merge "Revert "Cherry pick [Android WebView] Populate WebKit WebPreferences correctly in browser"" into klp-dev

    * commit 'b82173f679ea4ba11f50f1c3e7f4b204e43eb506':
      Revert "Cherry pick [Android WebView] Populate WebKit WebPreferences correctly in browser"

commit 2777dfe228a1f66ab8b57e578a8eb8a635d2d567
Merge: c4d1f53 141c408
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:27:18 2013 +0000

    am 141c4083: (-s ours) Merge "Revert "Cherry pick [Android] When toggling AX script inject, also set native AX state."" into klp-dev

    * commit '141c4083c258e442d40031cc44e00edf98deec64':
      Revert "Cherry pick [Android] When toggling AX script inject, also set native AX state."

commit c4d1f53131ce9940188c4cf089bd14f159da81aa
Merge: 7e55021 ba27900
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:27:13 2013 +0000

    am ba279007: (-s ours) Merge "Cherry pick [Android WebView] Populate WebKit WebPreferences correctly in browser" into klp-dev

    * commit 'ba27900735408ce0c0c3ba3d0fa810f995d1978d':
      Cherry pick [Android WebView] Populate WebKit WebPreferences correctly in browser

commit 7e55021e3b5b9881ab480d0fd02a1d07441a618b
Merge: 970d8db e6ed347
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:27:08 2013 +0000

    am e6ed3473: (-s ours) Merge "Cherry pick [Android] When toggling AX script inject, also set native AX state." into klp-dev

    * commit 'e6ed34736639962b89b0c094de7b5543013e1a12':
      Cherry pick [Android] When toggling AX script inject, also set native AX state.

commit 970d8db778524775e9ecb84dffcbb3d91d42d743
Merge: f8a5d62 2a0dedf
Author: aurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872>
Date:   Thu Dec 5 22:27:03 2013 +0000

    am 2a0dedf6: (-s ours) Cherry-pick: A workaround of LatinIME using targetAPI < 15.

    * commit '2a0dedf6d7182f889f42011a4ae94b6bf4740e77':
      Cherry-pick: A workaround of LatinIME using targetAPI < 15.

commit f8a5d6205ea84a6bef23fb10ae2e656bfb736e37
Merge: 15a1312 e6cbc2f
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:27:00 2013 +0000

    am e6cbc2f9: (-s ours) Merge "Always send DidOverscroll callback for android_webview." into klp-dev

    * commit 'e6cbc2f94a2f388b78abafebdd1ad870c96de2fd':
      Always send DidOverscroll callback for android_webview.

commit 15a13129e59cf1723abad6fe8c1975e0cb2a8f70
Merge: d08bdb1 8a1f3c1
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:26:57 2013 +0000

    am 8a1f3c12: (-s ours) Merge "Fixes to shouldoverrideurlloading for compatibility" into klp-dev

    * commit '8a1f3c1247c941882a63a52e8ef66149fa99469a':
      Fixes to shouldoverrideurlloading for compatibility

commit d08bdb1867c08c076302c870da483bf8fa3850a1
Merge: 9e84533 19c7886
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:26:52 2013 +0000

    am 19c7886e: (-s ours) Merge "Work around thread unsafety in NPChannelBase." into klp-dev

    * commit '19c7886ea9fa9a4a10e0a8dcc751499d8fd8e823':
      Work around thread unsafety in NPChannelBase.

commit 9e8453385495fdf76606758c4e485309d1f1840a
Merge: af82fad e4a023b
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:26:48 2013 +0000

    am e4a023bf: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.80

    * commit 'e4a023bf9cca3553b8e28a678ab2c356fee11551':
      Record Chromium merge at DEPS revision 30.0.1599.80

commit af82fade8d3f6d0bf6e96a28ca88f09465fbfb20
Merge: 6ce16ee 6f2f9e2
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:26:44 2013 +0000

    am 6f2f9e25: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.80

    * commit '6f2f9e25f2f6cffbef085af97c00a639a2ce488e':
      Merge from Chromium at DEPS revision 30.0.1599.80

commit 6ce16ee4fa1461ce7deb5ff2a51fd7f94658bf38
Merge: 8f74a8d 030a55e
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:26:41 2013 +0000

    am 030a55ef: (-s ours) Merge "[android_webview] Use a fraction to calculate scroll offset." into klp-dev

    * commit '030a55ef698a4dfb1a4ff344c2b8c20840d5c097':
      [android_webview] Use a fraction to calculate scroll offset.

commit 8f74a8d471a871ad93723692b528394784fd611d
Merge: d9f1d7e 4214a89
Author: Bo Liu <boliu@google.com>
Date:   Thu Dec 5 22:26:36 2013 +0000

    am 4214a892: (-s ours) Merge "Cherry-pick: cc: Set needs update draw properties during renderer creation" into klp-dev

    * commit '4214a89295d23872c8479704983163857b9b516c':
      Cherry-pick: cc: Set needs update draw properties during renderer creation

commit d9f1d7e83c584a3976d66d9bef0e552cfdd135ab
Merge: 2d193e7 6fd053b
Author: Alexandre Elias <aelias@google.com>
Date:   Thu Dec 5 22:26:32 2013 +0000

    am 6fd053bb: (-s ours) Merge "Cherry-pick r218169 "cc: Layer::SetTouchEventHandlerRegion should SetNeedsCommit"" into klp-dev

    * commit '6fd053bb727424cdba15469c192d1cb8ec0ce055':
      Cherry-pick r218169 "cc: Layer::SetTouchEventHandlerRegion should SetNeedsCommit"

commit 2d193e7156f99aea59acb859f64e0923ed3f8fba
Merge: bc0de5a 2a82f7b
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:26:29 2013 +0000

    am 2a82f7b6: (-s ours) Merge "Extend WebView useragent to mention Chrome version." into klp-dev

    * commit '2a82f7b6afb1a853945edd13f4c224aee0afdb93':
      Extend WebView useragent to mention Chrome version.

commit bc0de5a02baff20add80b36c15355cae209a5728
Merge: a858e09 7283965
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:26:19 2013 +0000

    am 7283965d: (-s ours) Merge "Merge [Android] Inflate Select Action Bar from XML." into klp-dev

    * commit '7283965d90df8b6f72a5ff21380791e2dd972ebb':
      Merge [Android] Inflate Select Action Bar from XML.

commit a858e09685395c6dd5436cc68a89df4f11d8f7ef
Merge: 49b813a f265c47
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:26:14 2013 +0000

    am f265c479: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.61

    * commit 'f265c47927521085214ed8bbdd469582dc9af6ef':
      Record Chromium merge at DEPS revision 30.0.1599.61

commit 49b813acf06a691b37af6449613e8275a83fd26f
Merge: 9148394 cd5e610
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:26:11 2013 +0000

    am cd5e6109: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.61

    * commit 'cd5e610960f56ebe90672a265e596c5097594f65':
      Merge from Chromium at DEPS revision 30.0.1599.61

commit 9148394408275b8a85c7a08b9253aede743115d8
Merge: 4dd9af6 c838ef4
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:26:08 2013 +0000

    am c838ef4c: (-s ours) Merge "Further cleanup of shouldoverrideUrlloading change" into klp-dev

    * commit 'c838ef4ccec74c6514dac67c3c5fe4ba78b60610':
      Further cleanup of shouldoverrideUrlloading change

commit 4dd9af64973fd6fb78ad27d5c2f709ad12e48091
Merge: b8f0cb7 06797e4
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Dec 5 22:26:05 2013 +0000

    am 06797e42: (-s ours) Cherry-pick "Support URL fragment resolution againt non-hierarchical schemes"

    * commit '06797e4204bbdcbd3b7f455e312b54c656b4f6b2':
      Cherry-pick "Support URL fragment resolution againt non-hierarchical schemes"

commit b8f0cb77cffc996d5055aeeced4cddaaae208167
Merge: f222243 de1bd3e
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Dec 5 22:26:01 2013 +0000

    am de1bd3eb: (-s ours) Cherry-pick "Preparing to support fragment resolution against non-hierarchical schemes"

    * commit 'de1bd3ebc0808574e846315a068b6935d3e72d5f':
      Cherry-pick "Preparing to support fragment resolution against non-hierarchical schemes"

commit f2222433cf04e2da33a33f7a4c62c7a57e072572
Merge: 8b95570 e5b9a41
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Dec 5 22:25:57 2013 +0000

    am e5b9a41b: (-s ours) Revert "Work-around for URL fragments resolving against about:blank"

    * commit 'e5b9a41b031181f3290329292e84a19acc979e52':
      Revert "Work-around for URL fragments resolving against about:blank"

commit 8b9557063951da456604a3c364b3ba00dfb0ea0e
Merge: 1a045d1 824b33e
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:25:52 2013 +0000

    am 824b33ec: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.58

    * commit '824b33ec54c36368d9d4da34eff7eef6542f3df7':
      Record Chromium merge at DEPS revision 30.0.1599.58

commit 1a045d14c3cd01f4a8cec8e1be9250f34fc8a358
Merge: 2a07463 c6a03b6
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:25:48 2013 +0000

    am c6a03b66: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.58

    * commit 'c6a03b665d27bf9b307170479657cbbf1b5bfe17':
      Merge from Chromium at DEPS revision 30.0.1599.58

commit 2a07463550c05b5141a510b98ed32f6b4b69b60b
Merge: a6cad99 58efff2
Author: Alexandre Elias <aelias@google.com>
Date:   Thu Dec 5 22:25:45 2013 +0000

    am 58efff2e: (-s ours) Merge "[Android WebView] Wire up ignoreMainFrameOverflowHiddenQuirk." into klp-dev

    * commit '58efff2ea0c9395e850b762f2f0a25c920f925b3':
      [Android WebView] Wire up ignoreMainFrameOverflowHiddenQuirk.

commit a6cad99ba375be6bb4ef9ec2d3ebf839632379df
Merge: a2a2fea 5024ed2
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:25:41 2013 +0000

    am 5024ed27: (-s ours) Merge "Call onPageStarted and onPageFinished in a message on the UI thread" into klp-dev

    * commit '5024ed279c9dc5c90b543bacea8bd5d1766dc4f2':
      Call onPageStarted and onPageFinished in a message on the UI thread

commit a2a2feade7411a6e65991a34436e885f583bc5dd
Merge: 5e2f2e7 341c793
Author: Kristian Monsen <kristianm@google.com>
Date:   Thu Dec 5 22:25:38 2013 +0000

    am 341c7932: (-s ours) Merge "Allow all mixed content" into klp-dev

    * commit '341c793236359232d7626ec28ae9393eac2f5a70':
      Allow all mixed content

commit 5e2f2e7dcce6cce581780c185a1cd94843b156ba
Merge: d7be1db dd8a361
Author: Kristian Monsen <kristianm@google.com>
Date:   Thu Dec 5 22:25:32 2013 +0000

    am dd8a3616: (-s ours) Merge "Cherry-pick: Implement clearView to match classic" into klp-dev

    * commit 'dd8a3616cb66368eb531642a80aa39e6a356fa20':
      Cherry-pick: Implement clearView to match classic

commit d7be1db55cc15d8cf2930c2b66c6b06b38238d84
Merge: 9df54be b95ebc0
Author: Bo Liu <boliu@google.com>
Date:   Thu Dec 5 22:25:28 2013 +0000

    am b95ebc05: (-s ours) Merge "Cherry-pick: [Android WebView] Set initial visiblity" into klp-dev

    * commit 'b95ebc05b860fae4158722b8232ef0a3098a1d53':
      Cherry-pick: [Android WebView] Set initial visiblity

commit 9df54beeb6232afc51be18560b55c8109d02c9a1
Merge: 0708af3 4797c25
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:25:24 2013 +0000

    am 4797c25b: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.56

    * commit '4797c25b2a114adb58f4ef6e45e404a036497152':
      Record Chromium merge at DEPS revision 30.0.1599.56

commit 0708af3503564080e84901e4c0c1de6101a3f2f9
Merge: 18d2e33 810e1dd
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:25:20 2013 +0000

    am 810e1ddb: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.56

    * commit '810e1ddbe56b57afdcdf66369cbed8e1ec967838':
      Merge from Chromium at DEPS revision 30.0.1599.56

commit 18d2e33fe87e7baf7cd3c39d2a7246920aa69e90
Merge: 637c43c 63d0ac2
Author: Bo Liu <boliu@google.com>
Date:   Thu Dec 5 22:25:15 2013 +0000

    am 63d0ac2a: (-s ours) Chromium Fork: Increase URL length limit to 20MB

    * commit '63d0ac2aede27ad7d7414a87427221dadf8d859b':
      Chromium Fork: Increase URL length limit to 20MB

commit 637c43cbe7d9188446252d27bcdee61751d2e80d
Merge: 97ec718 663642a
Author: Mikhail Naganov <mnaganov@google.com>
Date:   Thu Dec 5 22:25:10 2013 +0000

    am 663642a4: (-s ours) [Android WebView] Make web contents debugging controllable

    * commit '663642a4ae028fa80519079a6358042ecb4800f7':
      [Android WebView] Make web contents debugging controllable

commit 97ec718b7308f1d57b66771e697807b55e285eb3
Merge: 6db53b3 01d3471
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:25:05 2013 +0000

    am 01d3471d: (-s ours) Merge "Revert "[Android WebView] Make web contents debugging controllable"" into klp-dev

    * commit '01d3471d9dcf00aee75b1d9d298b779d831c5790':
      Revert "[Android WebView] Make web contents debugging controllable"

commit 6db53b3e30a6e5fe00521f9b95c6bc956cb92508
Merge: 00dc7b4 89c370b
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:25:01 2013 +0000

    am 89c370b6: (-s ours) Merge "[Android WebView] Make web contents debugging controllable" into klp-dev

    * commit '89c370b6977ebe69965b441c896e3c94a7864547':
      [Android WebView] Make web contents debugging controllable

commit 00dc7b45a7b4cacfd37f03a666cf21237446a150
Merge: dcb21b3 dff2b32
Author: Jared Duke <jdduke@google.com>
Date:   Thu Dec 5 22:24:57 2013 +0000

    am dff2b325: (-s ours) Merge "Cherry-pick: Restrict the assumption that the OSK will trigger a resize" into klp-dev

    * commit 'dff2b3253b6f0868816d15d5f52b08e211585d9f':
      Cherry-pick: Restrict the assumption that the OSK will trigger a resize

commit dcb21b331b03e04e719d822a1be328f4fd2eace7
Merge: 3b51a50 6685899
Author: Bo Liu <boliu@google.com>
Date:   Thu Dec 5 22:24:50 2013 +0000

    am 66858998: (-s ours) Merge "Cherry-pick: [Android WebView] Early out DrawGL if not attached to window" into klp-dev

    * commit '668589984e077f7c39f5491fc1d77fdb9690c693':
      Cherry-pick: [Android WebView] Early out DrawGL if not attached to window

commit 3b51a509838fda439f93047cd669af15392e5a86
Merge: 524d37d 822f024
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:24:47 2013 +0000

    am 822f024c: (-s ours) Merge "Cherry pick [Android] Decouple pausing video from RenderView pause." into klp-dev

    * commit '822f024cb97780a1aaaf4ee34f85696ce8083aa4':
      Cherry pick [Android] Decouple pausing video from RenderView pause.

commit 524d37dce3976a6b36d55645a9f6c637c16ac185
Merge: 63388d3 0a8f47f
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:24:43 2013 +0000

    am 0a8f47fb: (-s ours) Complete Sync shouldoverrideurlloading by cleaning code

    * commit '0a8f47fbce7f94803320e0340e8fe7855159e31a':
      Complete Sync shouldoverrideurlloading by cleaning code

commit 63388d329d3b95895e70ea98000f1370681114b0
Merge: e8cf687 77ceb71
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:24:40 2013 +0000

    am 77ceb718: (-s ours) Implement ShouldOverrideUrlLoading using a Sync IPC

    * commit '77ceb7188d76b2f05feb0f0b0ee08a2d7a181d16':
      Implement ShouldOverrideUrlLoading using a Sync IPC

commit e8cf687b61d33a1e9d5a4ca6d2c25ab4a19d6e15
Merge: 08ad983 95ef9ff
Author: Primiano Tucci <primiano@google.com>
Date:   Thu Dec 5 22:24:34 2013 +0000

    am 95ef9ffb: (-s ours) Merge "Cherry-pick: [Android WebView] Make InputStreamImpl::Read fill the IOBuffer." into klp-dev

    * commit '95ef9ffb889b48ea23c6d69fbcadd030bf5d9961':
      Cherry-pick: [Android WebView] Make InputStreamImpl::Read fill the IOBuffer.

commit 08ad9838e94936e20d86a74457bf2d07bb90c632
Merge: 801ba78 d28fd5b
Author: epenner@chromium.org <epenner@chromium.org@0039d316-1c4b-4281-b951-d872>
Date:   Thu Dec 5 22:24:30 2013 +0000

    am d28fd5bf: (-s ours) Cherry-pick: CC: Fix polling in sync compositor.

    * commit 'd28fd5bffa874f8f8d9661101e707f67b6f0c879':
      Cherry-pick: CC: Fix polling in sync compositor.

commit 801ba7860f5aa478c3bc2aedf5fc58793a5780e8
Merge: db4b4c5 6b2e666
Author: Martin Kosiba <mkosiba@google.com>
Date:   Thu Dec 5 22:24:27 2013 +0000

    am 6b2e6666: (-s ours) [android_webview] Fix layout in AT_MOST mode.

    * commit '6b2e66668f5d1fb61bc2c766573bef8a2dd2bc70':
      [android_webview] Fix layout in AT_MOST mode.

commit db4b4c500ca9ffce3632a6a90c88e8470cd5c1c3
Merge: 1630ce6 314c266
Author: Martin Kosiba <mkosiba@google.com>
Date:   Thu Dec 5 22:24:23 2013 +0000

    am 314c2667: (-s ours) Remove accidentally checked in spammy log from ContentViewCore.

    * commit '314c26674cfbacb5a47bf556f66f8ad51c3a8faa':
      Remove accidentally checked in spammy log from ContentViewCore.

commit 1630ce6e79fdc990ba865d726eb62eb0f3544c39
Merge: ae205e7 1e34f59
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:24:19 2013 +0000

    am 1e34f592: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.50

    * commit '1e34f5927907084b1c396fec18f004b6748c5afa':
      Record Chromium merge at DEPS revision 30.0.1599.50

commit ae205e7cc5e36734133847c4eaffc954efb4417d
Merge: 98b9058 4686f8b
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:24:07 2013 +0000

    am 4686f8b2: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.50

    * commit '4686f8b28a3a02b3943b29defafde045ca342ced':
      Merge from Chromium at DEPS revision 30.0.1599.50

commit 98b905829a6ca71bc67ebde9593d021631563847
Merge: 31eb2be ba732bd
Author: Martin Kosiba <mkosiba@google.com>
Date:   Thu Dec 5 22:24:04 2013 +0000

    am ba732bd5: (-s ours) Merge "[cherry-pick] Use contents size for android_webview layout size." into klp-dev

    * commit 'ba732bd572b31112fcf35a1b3b494383daabf90a':
      [cherry-pick] Use contents size for android_webview layout size.

commit 31eb2beefbc82b88f834822d5bff65ae3c080724
Merge: 3c59a0b 7a6d53f
Author: Tao Bai <michaelbai@google.com>
Date:   Thu Dec 5 22:24:01 2013 +0000

    am 7a6d53f1: (-s ours) Merge "Cherry-pick: [Android WebView] Make evaluateJavaScript return with no-op." into klp-dev

    * commit '7a6d53f1ab1766f450b0ed3c653fb903bc221f1f':
      Cherry-pick: [Android WebView] Make evaluateJavaScript return with no-op.

commit 3c59a0b5aa2cc246cb9c943e4e46e0ba13a42b83
Merge: a9bb54b 53f28f4
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:23:56 2013 +0000

    am 53f28f4a: (-s ours) Merge "Cherry-pick: Reuse webview classic cookies file" into klp-dev

    * commit '53f28f4a44dea5bffcbddfff2830ea8542b4b755':
      Cherry-pick: Reuse webview classic cookies file

commit a9bb54b56aa389da2fee7502236dec0157a5bb29
Merge: 246083b 2c8786f
Author: Marcin Kosiba <mkosiba@google.com>
Date:   Thu Dec 5 22:23:53 2013 +0000

    am 2c8786fd: (-s ours) Merge "Cherry-pick: Defer scrolls until provided a valid content size" into klp-dev

    * commit '2c8786fde4b6064ed2662f02e8b7565ad8f69b9e':
      Cherry-pick: Defer scrolls until provided a valid content size

commit 246083b44aca1bd5c2b5902039b85e9981d1b17f
Merge: 0cad911 97162f9
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:23:50 2013 +0000

    am 97162f9b: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.48

    * commit '97162f9b37915ad40bfd66ab09e1815decb2a644':
      Record Chromium merge at DEPS revision 30.0.1599.48

commit 0cad911e8ab37c748d41a84d3b95fc2cb7c4a212
Merge: a45f94d b32343c
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:23:46 2013 +0000

    am b32343c9: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.48

    * commit 'b32343c9b70645bd3e272fe2a92d87e22bc2cca8':
      Merge from Chromium at DEPS revision 30.0.1599.48

commit a45f94d8e0efbba35523602e32ea63116695fc43
Merge: 7935026 652dfbe
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:23:43 2013 +0000

    am 652dfbe8: (-s ours) Merge "Cherry pick of [Android] Update RenderWidgetHostView focus state on creation." into klp-dev

    * commit '652dfbe87329f7bdf2148f2633ba0698e802d861':
      Cherry pick of [Android] Update RenderWidgetHostView focus state on creation.

commit 7935026ef49432572715146255d01dcda56b5a1c
Merge: a32a06e b82f98e
Author: cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d87>
Date:   Thu Dec 5 22:23:38 2013 +0000

    am b82f98ed: (-s ours) Cherry-pick: [Android] Fix vibrate on select text

    * commit 'b82f98ed67f72d8a3739d03c4c945bfe9426ef9f':
      Cherry-pick: [Android] Fix vibrate on select text

commit a32a06e975ddf34b188aeaa3b5a22135cda8a132
Merge: 3e51875 2366fa9
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:23:35 2013 +0000

    am 2366fa9d: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.46

    * commit '2366fa9d0828f6d2bf1bfb9b67e77b28df18398b':
      Record Chromium merge at DEPS revision 30.0.1599.46

commit 3e518753b02b3c2fd76284b04f3de7542d4d321e
Merge: b509d3a 4d551d5
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:23:31 2013 +0000

    am 4d551d56: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.46

    * commit '4d551d56ad0f44a3bcc2b10614207fdae059b960':
      Merge from Chromium at DEPS revision 30.0.1599.46

commit b509d3a36b6773c701acd2fec52a1ba32d80ec24
Merge: 42b51f6 4f6117d
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Dec 5 22:23:22 2013 +0000

    am 4f6117de: (-s ours) Merge "Work-around for URL fragments resolving against about:blank" into klp-dev

    * commit '4f6117de31af6a6080786ddc6c03e9cb41a8c0c9':
      Work-around for URL fragments resolving against about:blank

commit 42b51f6b8847cdaf373509449b1224e2ca51f160
Merge: c23501a 30c9e02
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:23:15 2013 +0000

    am 30c9e02f: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.44

    * commit '30c9e02fa40e1ad2b19710dd5e309d5a37ce0c9b':
      Record Chromium merge at DEPS revision 30.0.1599.44

commit c23501acf98f1d04109fd624a4d298fbaa8b88f0
Merge: d687d79 4c53377
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:23:11 2013 +0000

    am 4c533772: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.44

    * commit '4c5337722b0050dc1a8f04eaa6e8dcdb69c14334':
      Merge from Chromium at DEPS revision 30.0.1599.44

commit d687d79bec1f541558055afaa7cd01fad34f3cc7
Merge: 2fa7eec c42723f
Author: Primiano Tucci <primiano@google.com>
Date:   Thu Dec 5 22:23:06 2013 +0000

    am c42723f8: (-s ours) Merge "Cherry-pick: [Android WebView] Pass absolute URL to requestFocusNodeHref." into klp-dev

    * commit 'c42723f8dcfa6ca4d8dfeca2a687417b66a9a9c4':
      Cherry-pick: [Android WebView] Pass absolute URL to requestFocusNodeHref.

commit 2fa7eece3add48680e5a60900566dbf64e79e371
Merge: d0d13d4 845ed6b
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:23:00 2013 +0000

    am 845ed6b2: (-s ours) Minimise logging/tracing in release builds.

    * commit '845ed6b237087326efa8302fe2b3384aa65b1212':
      Minimise logging/tracing in release builds.

commit d0d13d4f512a9f1c677f97fbe1e714debfc19940
Merge: b7d83e4 ebaa810
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:22:57 2013 +0000

    am ebaa8109: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.41

    * commit 'ebaa81098a62149c027a4c120769867b9c7f3cf4':
      Record Chromium merge at DEPS revision 30.0.1599.41

commit b7d83e4fce8b9586dccacc57685c427b03703364
Merge: 0b67c7f f7530a7
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:22:53 2013 +0000

    am f7530a7a: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.41

    * commit 'f7530a7a2b0c81a081d469940714dcf4d3f2505e':
      Merge from Chromium at DEPS revision 30.0.1599.41

commit 0b67c7f0c005933dd886cc3026ac085d1a0ff369
Merge: f83dadb ed1701e
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Dec 5 22:22:49 2013 +0000

    am ed1701ee: (-s ours) Merge "Cherry-pick Add CONTENT_EXPORT to some swtiches needed for WebView" into klp-dev

    * commit 'ed1701ee79a7744de87155c76ecafb87dcc62653':
      Cherry-pick Add CONTENT_EXPORT to some swtiches needed for WebView

commit f83dadb3578ff62e7c484967110898b8def373d1
Merge: 111d230 690201e
Author: Qiwen Zhao <zhao@google.com>
Date:   Thu Dec 5 22:22:45 2013 +0000

    am 690201eb: (-s ours) Revert "Revert "Downstream Workaround for Qualcomm Bug 10205015""

    * commit '690201eb9854b589e6151bf802e50262a392a3d3':
      Revert "Revert "Downstream Workaround for Qualcomm Bug 10205015""

commit 111d2305fee065720d5f365aae812e3b107348ed
Merge: 3a3400d 6607c8f
Author: Martin Kosiba <mkosiba@google.com>
Date:   Thu Dec 5 22:22:40 2013 +0000

    am 6607c8fe: (-s ours) Merge "Cherry-pick http://crrev.com/23478022" into klp-dev

    * commit '6607c8fed94169dc3e4b93b9a0287b71da8f5e8a':
      Cherry-pick http://crrev.com/23478022

commit 3a3400de6804e993fae583d32af1941f56d6e741
Merge: c35b2e8 0c3a0d0
Author: Qiwen Zhao <zhao@google.com>
Date:   Thu Dec 5 22:22:37 2013 +0000

    am 0c3a0d0c: (-s ours) Merge "Revert "Downstream Workaround for Qualcomm Bug 10205015"" into klp-dev

    * commit '0c3a0d0cf8ac86d4f4ca90dad425358c5a10cfbe':
      Revert "Downstream Workaround for Qualcomm Bug 10205015"

commit c35b2e8176e8aa0b91fe9783ff67b88dab09a4c5
Merge: aa8f48a 406a4f8
Author: Martin Kosiba <mkosiba@google.com>
Date:   Thu Dec 5 22:22:33 2013 +0000

    am 406a4f85: (-s ours) Merge "Revert "Patch in http://crrev.com/22903029"" into klp-dev

    * commit '406a4f852bddf83975718a1e4fbbec8904f5e66c':
      Revert "Patch in http://crrev.com/22903029"

commit aa8f48a6b22b314c10e541b8c03e326bd25642cb
Merge: 155f80b 85b0a63
Author: Kristian Monsen <kristianm@google.com>
Date:   Thu Dec 5 22:22:29 2013 +0000

    am 85b0a633: (-s ours) Merge "Cherry-pick: Adding a getter for base url" into klp-dev

    * commit '85b0a633a8568fba6f4fc81d56dcc0d9e952486a':
      Cherry-pick: Adding a getter for base url

commit 155f80b32fb0b48ad35c9ef1ba94c551fc69242e
Merge: e45fed8 66cb5b9
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Dec 5 22:22:26 2013 +0000

    am 66cb5b9b: (-s ours) Cherry-pick: [Android WebView] Match chrome font settings

    * commit '66cb5b9b21b9e7a3ad902333b276cada24fbceb3':
      Cherry-pick: [Android WebView] Match chrome font settings

commit e45fed81d41b3dcc416615b8a52d4635aedb9540
Merge: 180e750 99f7c4a
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Dec 5 22:22:20 2013 +0000

    am 99f7c4a5: (-s ours) Cherry-pick: [Android WebView] Do not interfere with requests after destroy

    * commit '99f7c4a593b7d80fbb6d61c46de477f48bd137ed':
      Cherry-pick: [Android WebView] Do not interfere with requests after destroy

commit 180e750213279caed0a700863b742f65868138eb
Merge: b73bc65 adbec73
Author: Bo Liu <boliu@google.com>
Date:   Thu Dec 5 22:22:17 2013 +0000

    am adbec73f: (-s ours) Merge "Cherry-pick: [Android WebView] First cut memory management" into klp-dev

    * commit 'adbec73fbcc003fbfe001892a2937f5c677213b4':
      Cherry-pick: [Android WebView] First cut memory management

commit b73bc65ff64363dddc0a495186ad0a2360bd9d31
Merge: 0f9270a b2ce313
Author: brianderson@chromium.org <brianderson@chromium.org@0039d316-1c4b-4281-b951->
Date:   Thu Dec 5 22:22:12 2013 +0000

    am b2ce3138: (-s ours) Cherry-pick: cc: Poll for state that triggers draws (synchronous compositor only)

    * commit 'b2ce3138cd0d9813fd7196e3aa78ce90d29b6368':
      Cherry-pick: cc: Poll for state that triggers draws (synchronous compositor only)

commit 0f9270ae1baf3a9076921e6458337b927162c022
Merge: fabbac5 4ce9541
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:22:09 2013 +0000

    am 4ce95411: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.40

    * commit '4ce95411a0a4ad8d03edcb6c31529de17016c7dc':
      Record Chromium merge at DEPS revision 30.0.1599.40

commit fabbac5b3b2eb66e6ce89332dc726be13be8fa74
Merge: 1aa3011 0f5d368
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:22:06 2013 +0000

    am 0f5d3685: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.40

    * commit '0f5d3685b7a827596ac694c0b9e29b9ace5e7ef2':
      Merge from Chromium at DEPS revision 30.0.1599.40

commit 1aa3011529a812b42aaf2c2ae0dcbb70ad50150d
Merge: 31b802b 5825184
Author: Svetoslav <svetoslavganov@google.com>
Date:   Thu Dec 5 22:22:02 2013 +0000

    am 58251847: (-s ours) Update AwPrintDocumentAdapter due to API changes

    * commit '58251847c017e39855226d3c125df2487208cc07':
      Update AwPrintDocumentAdapter due to API changes

commit 31b802b3b5458c0da62fcfff14d6b4c32a4ec044
Merge: 41a6e27 9e24fc0
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:21:58 2013 +0000

    am 9e24fc07: (-s ours) Merge "Reflect printAPI changes." into klp-dev

    * commit '9e24fc0754463786f91d25485aebf991601c021f':
      Reflect printAPI changes.

commit 41a6e27fb97fa46e6a1947e67fe14568744e4fea
Merge: e8cd854 4c87edc
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Dec 5 22:21:54 2013 +0000

    am 4c87edc0: (-s ours) Merge "Cherry-pick "Switch AwPixelInfo to wrap SkCanvasLayerState"" into klp-dev

    * commit '4c87edc050e2fa04c8451ada680a39b8b46ebed1':
      Cherry-pick "Switch AwPixelInfo to wrap SkCanvasLayerState"

commit e8cd854f2cfb37898911ed7c7e02e609b2852f9a
Merge: 31e8e00 05375ba
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:21:49 2013 +0000

    am 05375ba3: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.39

    * commit '05375ba3f38bf1a36e0aff649784874c2a638a61':
      Record Chromium merge at DEPS revision 30.0.1599.39

commit 31e8e00eb2dabaca8b05bf48a5e5e78440936442
Merge: 501f4a6 389f891
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:21:46 2013 +0000

    am 389f8918: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.39

    * commit '389f89184187a18e6314d543397f72960e900659':
      Merge from Chromium at DEPS revision 30.0.1599.39

commit 501f4a61415545096e6f4b27ec8f0766bc7b1bfa
Merge: 25554b6 6053403
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:21:41 2013 +0000

    am 60534036: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.38

    * commit '60534036bfd190fb2f74172c3a43099d7c50888a':
      Record Chromium merge at DEPS revision 30.0.1599.38

commit 25554b67523987acc82f6a061b5acdcdd32a07d8
Merge: c4d0bad bffa568
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:21:38 2013 +0000

    am bffa5683: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.38

    * commit 'bffa56837bb88af19413f59d410b5854f3dd01c3':
      Merge from Chromium at DEPS revision 30.0.1599.38

commit c4d0badfab4b895d0551a88382b6a79dc8e5a09d
Merge: 19fc83b f76851f
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:21:34 2013 +0000

    am f76851f0: (-s ours) Merge "Cherry pick from upstream Chromium to ease merge from M30." into klp-dev

    * commit 'f76851f04911c4cf95028939f6071c7917c76d6f':
      Cherry pick from upstream Chromium to ease merge from M30.

commit 19fc83bcb49e05b58b0aca4c0447c8f55323a54c
Merge: 4b59688 cbc64c0
Author: Kristian Monsen <kristianm@google.com>
Date:   Thu Dec 5 22:21:31 2013 +0000

    am cbc64c0b: (-s ours) Manual cherry-pick of https://codereview.chromium.org/23623020

    * commit 'cbc64c0be3b310fda39ba08409e70f94954e19c8':
      Manual cherry-pick of https://codereview.chromium.org/23623020

commit 4b596882c53682a1ea96d0a98432fdf4ff046cf7
Merge: e2b4c88 06a2785
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:21:27 2013 +0000

    am 06a27858: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.36

    * commit '06a2785875a3a088f5e49861dbcd42a3aff4258d':
      Record Chromium merge at DEPS revision 30.0.1599.36

commit e2b4c8860766ba46331c12cea267793dba954191
Merge: fc06033 76ea596
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:21:24 2013 +0000

    am 76ea5963: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.36

    * commit '76ea5963b934569e221bccdb339c95301a7a7440':
      Merge from Chromium at DEPS revision 30.0.1599.36

commit fc06033499ec8de046f1c7b9c967c393275abfd4
Merge: 6da045b 5d58f32
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:21:17 2013 +0000

    am 5d58f322: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.35

    * commit '5d58f322b0fdc3b2940b7626872ed7d8f31740ca':
      Record Chromium merge at DEPS revision 30.0.1599.35

commit 6da045b078aa736513b3b20db411225422aacd3b
Merge: 78b3232 4d47668
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:21:12 2013 +0000

    am 4d476689: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.35

    * commit '4d476689bb589148ddf278a6fe754e4a1c44a04f':
      Merge from Chromium at DEPS revision 30.0.1599.35

commit 78b3232fcb5dbd5ed72f3b20c232ffd3bc1fee40
Merge: b738abc c37b93f
Author: Bo Liu <boliu@google.com>
Date:   Thu Dec 5 22:21:08 2013 +0000

    am c37b93fe: (-s ours) Merge "Cherry-pick: Fix video in software mode" into klp-dev

    * commit 'c37b93feb04c7bbd8189355d9cc2d54b5430eb12':
      Cherry-pick: Fix video in software mode

commit b738abc8959e82d9411fa428299c529fa99de477
Merge: 2343e82 a02260b
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Dec 5 22:21:03 2013 +0000

    am a02260b3: (-s ours) Merge "Cherry-pick "Send Android accessibility "content changed" event for any change"" into klp-dev

    * commit 'a02260b357ae16877b65d044f139069c86898d58':
      Cherry-pick "Send Android accessibility "content changed" event for any change"

commit 2343e8221292054efc00f3dbe38f813e5df62973
Merge: 61783ed 162276c
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:20:58 2013 +0000

    am 162276c9: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.32

    * commit '162276c993c405176e1f486c44463a86eb38e693':
      Record Chromium merge at DEPS revision 30.0.1599.32

commit 61783ed87d6e9f6773fcdc8987623edfea23efc2
Merge: c801a0b 7879b4e
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:20:55 2013 +0000

    am 7879b4e3: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.32

    * commit '7879b4e35bc0616056661d21ed48d28e6cecd0a0':
      Merge from Chromium at DEPS revision 30.0.1599.32

commit c801a0be0e3665dacfcb15bbc7ef7fda9b0823d3
Merge: c6aebac 3dff3ed
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:20:52 2013 +0000

    am 3dff3ed7: (-s ours) Disable fatal linker warnings on x86.

    * commit '3dff3ed757013f499bb2dcd83c4f3667c6ed443e':
      Disable fatal linker warnings on x86.

commit c6aebac213a8ac4a790210424d990a5ad416f733
Merge: 91aaf7a 819cc77
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:20:48 2013 +0000

    am 819cc77b: (-s ours) Merge "Cherry pick https://chromiumcodereview.appspot.com/23503020 PS3" into klp-dev

    * commit '819cc77bacfd1ed31ef5e7c514c1e61394f8c571':
      Cherry pick https://chromiumcodereview.appspot.com/23503020 PS3

commit 91aaf7ac1f9722d340d8353be1eb8ea1f5615fa2
Merge: c920fa6 b25cc19
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:20:44 2013 +0000

    am b25cc192: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.31

    * commit 'b25cc192032bec93d7d029ea5714605478d983b8':
      Record Chromium merge at DEPS revision 30.0.1599.31

commit c920fa6b7c97caf5e8d3644ebfa15470626bf0f3
Merge: 790409b 13a64a3
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:20:40 2013 +0000

    am 13a64a3c: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.31

    * commit '13a64a3c22259028b75c5b293d2eaed26080c490':
      Merge from Chromium at DEPS revision 30.0.1599.31

commit 790409bf03f9390a92d0bb956070a77c4618588e
Merge: d15740e e1f7496
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:20:37 2013 +0000

    am e1f7496c: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.30

    * commit 'e1f7496c3c11ddb4cf1a28a7cd618da11008982a':
      Record Chromium merge at DEPS revision 30.0.1599.30

commit d15740e1567b2db3be81474b58ea23b810e70ace
Merge: 200e038 eee4ebd
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:20:33 2013 +0000

    am eee4ebda: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.30

    * commit 'eee4ebda36ebfcb751dd752751c071ef22e33b33':
      Merge from Chromium at DEPS revision 30.0.1599.30

commit 200e038d1e25b9964a3720bdfd6be009fbb84915
Merge: cb222fe bbcd892
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:20:29 2013 +0000

    am bbcd8928: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.26

    * commit 'bbcd89285585caf04c0adc6b3b3b9c058d2864a5':
      Record Chromium merge at DEPS revision 30.0.1599.26

commit cb222feaab9d5a0b8722262e89ad41acb6ba6e36
Merge: 5cec850 6594c20
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:20:26 2013 +0000

    am 6594c208: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.26

    * commit '6594c20851cf76932a014f0efe01d79c6ba6eed1':
      Merge from Chromium at DEPS revision 30.0.1599.26

commit 5cec850fb9246210d192f0926277a8a456d7725c
Merge: 9af0b15 a0ac924
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:20:23 2013 +0000

    am a0ac9246: (-s ours) Merge "Do not close file descriptor." into klp-dev

    * commit 'a0ac92460f9ade728cedb5693a34068d4aa2e46e':
      Do not close file descriptor.

commit 9af0b15f6f59be0b8df1f315a0b4d528f9831d18
Merge: d8b16ee 7ba7d82
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:20:19 2013 +0000

    am 7ba7d829: (-s ours) Merge "The generated makefiles for printing" into klp-dev

    * commit '7ba7d829bd114f49f7225775972cdaf7c8992949':
      The generated makefiles for printing

commit d8b16ee1b7d2cccff98b075f870d055e135a77b9
Merge: 90195c5 8e502b6
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:20:16 2013 +0000

    am 8e502b6b: (-s ours) Merge "Printing changes for page layout" into klp-dev

    * commit '8e502b6b4304d7e73f45e488c4824ea91782ff16':
      Printing changes for page layout

commit 90195c59da0b97b79068f435215be3987dbfa03e
Merge: 1112630 af85e71
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:20:12 2013 +0000

    am af85e71a: (-s ours) Merge "Copied files from chrome to android." into klp-dev

    * commit 'af85e71a16545efd27b33233f4bd2420d43b271b':
      Copied files from chrome to android.

commit 1112630296fcd12c848ca4a20af181b0cb685b01
Merge: 203c039 86e43a2
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:20:09 2013 +0000

    am 86e43a2a: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.25

    * commit '86e43a2a4cdb3da88d99e7956c5ede4226adb504':
      Record Chromium merge at DEPS revision 30.0.1599.25

commit 203c039be47d40de48d02bcb5c216cecaa559807
Merge: c57f672 5db5c4e
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:20:06 2013 +0000

    am 5db5c4ec: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.25

    * commit '5db5c4ec98571177cc4dec6df1ad33269f632543':
      Merge from Chromium at DEPS revision 30.0.1599.25

commit c57f6727cee5bd9a56ebc8a2e69877d55f8db684
Merge: 8137ca4 e0b60a7
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:20:01 2013 +0000

    am e0b60a77: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.24

    * commit 'e0b60a777766c8d2c7b09c912b2dff192f6cb8fa':
      Record Chromium merge at DEPS revision 30.0.1599.24

commit 8137ca428df7dfa1f6d4b8c7a6c530b9b9d4af40
Merge: 52f025d bfebf9c
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:19:57 2013 +0000

    am bfebf9c5: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.24

    * commit 'bfebf9c5f0206a13e1fdcf6343cc432a1d5fe776':
      Merge from Chromium at DEPS revision 30.0.1599.24

commit 52f025d73e0e010f773403021046f194036a25a2
Merge: 02e1606 3b557aa
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:19:53 2013 +0000

    am 3b557aa7: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.23

    * commit '3b557aa707c327d76640e4503adc67de00ef80ef':
      Record Chromium merge at DEPS revision 30.0.1599.23

commit 02e16067cbfead28aad1fa9af268772577616065
Merge: 9b38559 6bda25f
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:19:50 2013 +0000

    am 6bda25ff: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.23

    * commit '6bda25ffe15103e73b1811c624157f45962839de':
      Merge from Chromium at DEPS revision 30.0.1599.23

commit 9b385597e1e79d273db91622b4a21574e0405a0f
Merge: 2ce0b6b bdacb80
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:19:45 2013 +0000

    am bdacb801: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.21

    * commit 'bdacb801f880b53c3a75d687a919a7c6e7d4bcf6':
      Record Chromium merge at DEPS revision 30.0.1599.21

commit 2ce0b6b3bd664cc0a27318e9842ded0cab2ad6d1
Merge: e28e920 1347ae4
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:19:42 2013 +0000

    am 1347ae41: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.21

    * commit '1347ae41cdcd6a32dafcda3a178e53b6d8e88f2c':
      Merge from Chromium at DEPS revision 30.0.1599.21

commit e28e9205736f25dd1c98a813ccf14f67ccc94616
Merge: 1066da7 4dc0716
Author: Bo Liu <boliu@google.com>
Date:   Thu Dec 5 22:19:39 2013 +0000

    am 4dc0716f: (-s ours) Merge "Cherry-pick "Use visible rect instead of clip to make tile management decisions."" into klp-dev

    * commit '4dc0716fc1d8ecc2b9ca11e523880525af2a6674':
      Cherry-pick "Use visible rect instead of clip to make tile management decisions."

commit 1066da77b443e2d0beccb083f5b9700f68bb463e
Merge: 414a0bc 7c68f9d
Author: Bo Liu <boliu@google.com>
Date:   Thu Dec 5 22:19:36 2013 +0000

    am 7c68f9d6: (-s ours) Cherry-pick of https://codereview.chromium.org/22887048/

    * commit '7c68f9d6a6730f159e9598ee26c0f40c7f7542be':
      Cherry-pick of https://codereview.chromium.org/22887048/

commit 414a0bc55ac9ed5a1f2671d429a7f6e00a64391b
Merge: a757364 cbed202
Author: Martin Kosiba <mkosiba@google.com>
Date:   Thu Dec 5 22:19:32 2013 +0000

    am cbed202c: (-s ours) Patch in http://crrev.com/22903029

    * commit 'cbed202c2db561056f0a509ecdc209bfb003c29b':
      Patch in http://crrev.com/22903029

commit a757364d1fc7f2ebb01452534eefc3d39c712402
Merge: f7b10dc b0c7a65
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:19:28 2013 +0000

    am b0c7a653: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.18

    * commit 'b0c7a653e58dc6df667b21156a3333c9621354c5':
      Record Chromium merge at DEPS revision 30.0.1599.18

commit f7b10dcd50378a3e31953314500af9d99f95ebf8
Merge: 967c2f6 68dded9
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:19:23 2013 +0000

    am 68dded96: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.18

    * commit '68dded969729681d695306eb2b5a6e13c4f06498':
      Merge from Chromium at DEPS revision 30.0.1599.18

commit 967c2f689f7bed5c56e179e6f06f1dd9eb890375
Merge: 643001b fc0b34a
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:19:18 2013 +0000

    am fc0b34a8: (-s ours) Merge "Fix crash due to a null pointer." into klp-dev

    * commit 'fc0b34a8b1ee0bac5bffe18a6bd743007167727c':
      Fix crash due to a null pointer.

commit 643001b0ff8e43a1fe71280d45b283081fcde685
Merge: 16eaa7c 40f22e4
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Dec 5 22:19:12 2013 +0000

    am 40f22e4d: (-s ours) Merge "Patch in https://codereview.chromium.org/23018005/" into klp-dev

    * commit '40f22e4d6919a45ce6a861184431309ba13d4958':
      Patch in https://codereview.chromium.org/23018005/

commit 16eaa7ca2b7c3668f7c150485eccea9ec8146e6a
Merge: cd5e5d5 8df386a
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:19:07 2013 +0000

    am 8df386a7: (-s ours) Patch in https://codereview.chromium.org/23060021

    * commit '8df386a7f401e6e94b362e4d095699e14dc0a644':
      Patch in https://codereview.chromium.org/23060021

commit cd5e5d54ea4fc8a68b635e3951d5c3af8ccd79c1
Merge: b947ace a2c6a87
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 22:19:04 2013 +0000

    am a2c6a870: (-s ours) Merge changes I2a5e86ed,Ib2f598c0 into klp-dev

    * commit 'a2c6a8706246c1ab9529db64aebf193ea23261ad':
      Patch in https://codereview.chromium.org/23234003
      patch in https://codereview.chromium.org/23072008

commit b947acefc546c115a6d606c04e67d6e0d3959ec7
Merge: dc4ff35 22a04df
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:19:01 2013 +0000

    am 22a04df7: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.16

    * commit '22a04df71a9a6564db99156a1605810f837ee165':
      Record Chromium merge at DEPS revision 30.0.1599.16

commit dc4ff3551210cfa56b8788903fb436e5a0ed2e11
Merge: cd7038e f3ce491
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:18:58 2013 +0000

    am f3ce491c: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.16

    * commit 'f3ce491c3623b9924dccab3703a43e03157e988a':
      Merge from Chromium at DEPS revision 30.0.1599.16

commit cd7038e846a6da059ca3e9ba83242b6e5370fbad
Merge: 39c9d36 d6abc66
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:18:55 2013 +0000

    am d6abc66f: (-s ours) Record Chromium merge at DEPS revision 30.0.1599.14

    * commit 'd6abc66f79bf9f8ee189e80aad7acf69535650c5':
      Record Chromium merge at DEPS revision 30.0.1599.14

commit 39c9d366a987f5d78d261577699f8f6ea111c55f
Merge: 28c812e 7c720b7
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:18:52 2013 +0000

    am 7c720b74: (-s ours) Merge from Chromium at DEPS revision 30.0.1599.14

    * commit '7c720b7466665b17575e0fd6976f9321c6bff489':
      Merge from Chromium at DEPS revision 30.0.1599.14

commit 28c812eac0d2133557b4a15fc459bc6bc795d6e8
Merge: 1bc1cf5 1af4903
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:18:49 2013 +0000

    am 1af4903a: (-s ours) Fix build for mac.

    * commit '1af4903a31e040cf65e23f429f14ef1ee857a52a':
      Fix build for mac.

commit 1bc1cf53f86a474c6cea9b11b5e450c8bd29fc07
Merge: 393e5910 be2b67a
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:18:45 2013 +0000

    am be2b67ad: (-s ours) Fix broken build due to files ignored by git

    * commit 'be2b67ad05bfde6a179b51be143d1abe0c294db8':
      Fix broken build due to files ignored by git

commit 393e5910471696e4154534f3c096760bff51c525
Merge: f9a3895 5d5be6d
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Dec 5 22:18:42 2013 +0000

    am 5d5be6dc: (-s ours) A first cut to printing.

    * commit '5d5be6dc8a24d729a037d5b76e0d1fa711ece471':
      A first cut to printing.

commit f9a3895cc5f7e7e29e40797ca59a3077290b1038
Merge: 8138bd0 1ec4546
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Dec 5 22:18:39 2013 +0000

    am 1ec45469: (-s ours) Enable use_system_skia.

    * commit '1ec45469dfb6c95f1341f572461043760c6eee5f':
      Enable use_system_skia.

commit 8138bd01fc85a59bb62244cdb93fd462707ea86b
Merge: 93048e2 678c483
Author: torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Dec 5 22:18:36 2013 +0000

    am 678c4834: (-s ours) Cherrypick r218021: Android WebView: build fixes for use_system_skia.

    * commit '678c4834910532646cef5bdf036973f8f3df8970':
      Cherrypick r218021: Android WebView: build fixes for use_system_skia.

commit 93048e23cef5ca0cf1064a6b5b2eb410232d2964
Merge: 43833fe 30ed19a
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 21:58:39 2013 +0000

    am 30ed19a6: (-s ours) Record Chromium merge at DEPS revision r217147

    * commit '30ed19a65ff104f9af6b2f0d97a716fe684b156f':
      Record Chromium merge at DEPS revision r217147

commit 43833fe934c3ccec8006b0a42d4934ebd66ab0c3
Merge: 43495a6 f968bfd
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 21:58:36 2013 +0000

    am f968bfd8: (-s ours) Merge from Chromium at DEPS revision r217147

    * commit 'f968bfd8e7e7331d11d96f3ef27f3d9212e92c39':
      Merge from Chromium at DEPS revision r217147

commit 43495a66044eddebfc8549107889bb5084e90c44
Merge: 920baa8 9af2cb2
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 21:58:30 2013 +0000

    am 9af2cb2b: (-s ours) Record Chromium merge at DEPS revision r217092

    * commit '9af2cb2b822b72ff8c1cd20cf8ec3ad9b7bf3f95':
      Record Chromium merge at DEPS revision r217092

commit 920baa822405bd9e534914eec0e186f3e10da3a1
Merge: 315a96f a031efa
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 21:58:25 2013 +0000

    am a031efa9: (-s ours) Merge from Chromium at DEPS revision r217092

    * commit 'a031efa9dbd9b321781674193e8ac7636d47eb1d':
      Merge from Chromium at DEPS revision r217092

commit 315a96fb5dad054a8a60bb4c57a5ae1f4002c9cf
Merge: 1293ddf 60845df
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 21:58:18 2013 +0000

    am 60845df7: (-s ours) Cherry pick https://codereview.chromium.org/22882002/ PS1

    * commit '60845df7c69868627090d7f38de8233b839f7594':
      Cherry pick https://codereview.chromium.org/22882002/ PS1

commit 1293ddfadbab45c706205dae4dcfbe31f8c9de36
Merge: 920f752 c87cee1
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 21:58:08 2013 +0000

    am c87cee15: (-s ours) Record Chromium merge at DEPS revision r216972

    * commit 'c87cee15be68bb4aed12f7034206f65d3eb5f775':
      Record Chromium merge at DEPS revision r216972

commit 920f752e0f9054b3b5bd70dc9e9d38e9ef23eb45
Merge: acf786b 3d4dfb6
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 21:58:05 2013 +0000

    am 3d4dfb6f: (-s ours) Merge from Chromium at DEPS revision r216972

    * commit '3d4dfb6f11fb4e934d658743a8efc26d5490fdb0':
      Merge from Chromium at DEPS revision r216972

commit acf786b6c63b81e7b1565a18010eaaa5e5ae5164
Merge: dd34160 a826e30
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 21:58:02 2013 +0000

    am a826e305: (-s ours) Record Chromium merge at DEPS revision r216896

    * commit 'a826e3052411822bb6b34d441a58864e2d689a2d':
      Record Chromium merge at DEPS revision r216896

commit f7ec27e1d91d968732768dd9e301f72d4ede8837
Merge: 973eb0c 1940731
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Thu Dec 5 12:38:07 2013 -0800

    Merge commit '1940731af14148e5a80066fe0ff471f40b9182a5' into HEAD

commit dd34160d4bfed998f6a12d7a4b4e25b8f1990711
Merge: 0033be6 4311e82
Author: Ben Murdoch <benm@google.com>
Date:   Thu Dec 5 19:46:46 2013 +0000

    am 4311e82a: (-s ours) Merge from Chromium at DEPS revision r216896

    * commit '4311e82a78ceafbe0585f51d4c8a86df9f21aa0d':
      Merge from Chromium at DEPS revision r216896

commit 0033be6c5d0ef01fef18de24834e63a7d63f2fa1
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Nov 28 11:55:48 2013 +0000

    Record Chromium merge at DEPS revision 237746

    This commit was generated by merge_to_master.py.

    Change-Id: I4c0a60daa2cc2403f84a1ee09dd1357126f79f37

commit f2477e01787aa58f445919b809d89e252beef54f
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Nov 28 11:55:43 2013 +0000

    Merge from Chromium at DEPS revision 237746

    This commit was generated by merge_to_master.py.

    Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea

commit 7daea1dd5ff7e419322de831b642d81af3247912
Merge: 15fa748 a121063
Author: Ben Murdoch <benm@google.com>
Date:   Wed Nov 27 17:43:46 2013 +0000

    am a1210631: (-s ours) Cherry pick of https://codereview.chromium.org/22486004/ PS5

    * commit 'a12106315c3f43a5b690628a12779f8d39f5d622':
      Cherry pick of https://codereview.chromium.org/22486004/ PS5

commit 7b1c56eca3a3e7f47c31fe8ebeb5cb256e36fba1
Merge: b8bff2e 973eb0c
Author: Narayan Kamath <narayan@google.com>
Date:   Wed Nov 27 08:12:19 2013 -0800

    am 973eb0c7: am 9ab926b5: Merge "Update android generator to handle java7."

    * commit '973eb0c78ba6552f70ae2a6158e353cb938f652c':
      Update android generator to handle java7.

commit 973eb0c78ba6552f70ae2a6158e353cb938f652c
Merge: 9573598 9ab926b
Author: Narayan Kamath <narayan@google.com>
Date:   Wed Nov 27 07:50:43 2013 -0800

    am 9ab926b5: Merge "Update android generator to handle java7."

    * commit '9ab926b5f7566d8e5cabc73cb69fdc214736e1bd':
      Update android generator to handle java7.

commit 9ab926b5f7566d8e5cabc73cb69fdc214736e1bd
Merge: 9660f09 6402794
Author: Narayan Kamath <narayan@google.com>
Date:   Wed Nov 27 14:52:26 2013 +0000

    Merge "Update android generator to handle java7."

commit 6402794213ea82ac21dfcb24ef997ea102164f23
Author: Narayan Kamath <narayan@google.com>
Date:   Tue Nov 26 12:40:59 2013 +0000

    Update android generator to handle java7.

    This is a combination of several commits made
    to these files:

    https://chromiumcodereview.appspot.com/23587011
    https://codereview.chromium.org/23702057
    https://codereview.chromium.org/40523002
    https://codereview.chromium.org/49913003

    Change-Id: Id944decfde8590c3a6e548ac66f598c45de7169e

commit b8bff2ef3f6e1eae67bfde7ee8357b9ff2e7184a
Merge: 509e287 9573598
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Nov 25 16:32:24 2013 -0800

    am 95735982: am 9660f096: Merge in Android 4.4

    * commit '95735982ecaa03b23947985138850cfff7b07d2c':

commit 509e287d8150b3ace144873416c6a6005c866086
Merge: 2e1be59 e5c5827
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Nov 25 16:32:22 2013 -0800

    am e5c58275: am 25a43fa8: Merge remote-tracking branch \'origin/kitkat-dev\'

    * commit 'e5c58275bf3922dffa02657b8f1ed0e5bf0cb57b':
      Initial empty repository

commit 95735982ecaa03b23947985138850cfff7b07d2c
Merge: e5c5827 9660f09
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Mon Nov 25 16:23:58 2013 -0800

    am 9660f096: Merge in Android 4.4

    * commit '9660f096752d8c43e19beafd2595e46d09758b8b':

commit e5c58275bf3922dffa02657b8f1ed0e5bf0cb57b
Merge: ff70f33 25a43fa
Author: Baligh Uddin <baligh@google.com>
Date:   Mon Nov 25 16:23:56 2013 -0800

    am 25a43fa8: Merge remote-tracking branch \'origin/kitkat-dev\'

    * commit '25a43fa85587560ef6f2f4a13f20208bed97a06d':
      Initial empty repository

commit 9660f096752d8c43e19beafd2595e46d09758b8b
Merge: 25a43fa ff70f33
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Sun Nov 24 16:19:23 2013 -0800

    Merge in Android 4.4

commit 2e1be59a23eb4200df2bbef56d8e0eecc395202d
Merge: 1940731 ff70f33
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Nov 22 17:31:31 2013 -0800

    am ff70f338: Merge commit \'311703cfcb02c62b6e6bd949b8aae0ad59ce33bc\' into HEAD

    * commit 'ff70f338f8b5a28d4382c813d53cc8c9d3d8e4a4':

commit ff70f338f8b5a28d4382c813d53cc8c9d3d8e4a4
Merge: 3311b27 311703c
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Fri Nov 22 10:34:51 2013 -0800

    Merge commit '311703cfcb02c62b6e6bd949b8aae0ad59ce33bc' into HEAD

commit 1940731af14148e5a80066fe0ff471f40b9182a5
Merge: 5f3a011 e31b312
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Fri Nov 15 17:51:52 2013 -0800

    am e31b3128: Cherry-pick: [Android WebView] Fix in-line video part 1

    * commit 'e31b3128a419654fd14003d6117caa8da32697e7':
      Cherry-pick: [Android WebView] Fix in-line video part 1

commit 5f3a011304cff9ce0f67e21db4fb9d306812d176
Merge: 7f422a0 3311b27
Author: Ben Murdoch <benm@google.com>
Date:   Fri Nov 15 14:02:54 2013 -0800

    am 3311b27c: Cherry pick  [Android] MediaPlayerBridge should pass Bridge to getAllowedOperations

    * commit '3311b27cb6fdbe7af035a7d769944a17328c6227':
      Cherry pick  [Android] MediaPlayerBridge should pass Bridge to getAllowedOperations

commit 7f422a0fc614245c4b74bb4a9a85271535f36970
Merge: 30685bf 41a8683
Author: Ben Murdoch <benm@google.com>
Date:   Fri Nov 15 14:02:51 2013 -0800

    am 41a8683e: Cherry pick android: fix base::Time::FromLocalExploded() crash.

    * commit '41a8683eef4139670e32f284a160dc3702d9a5c2':
      Cherry pick android: fix base::Time::FromLocalExploded() crash.

commit 30685bf38db842ad0238276a4bca5f0d9ac4b6d8
Merge: a069f89 eae6ad9
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Nov 14 15:44:23 2013 -0800

    am eae6ad96: Merge "Revert "Cherry Pick https://codereview.chromium.org/65273002/ PS 8"" into klp-dev

    * commit 'eae6ad96677247ca0294140bd1e8932c26273500':
      Revert "Cherry Pick https://codereview.chromium.org/65273002/ PS 8"

commit a069f89cdee91bc48a862eb7a4e69955688cdb58
Merge: 21ed682 9f30eae
Author: Selim Gurun <sgurun@google.com>
Date:   Wed Nov 13 17:20:45 2013 -0800

    am 9f30eaed: Merge "Make sure to show the correct URL from CVC" into klp-dev

    * commit '9f30eaedc3089bd173876e73524af2a6f95a6733':
      Make sure to show the correct URL from CVC

commit 21ed682b62ae927729aecc4aa99748fc27747ca2
Merge: cf7f6b3 1fb9f59
Author: Selim Gurun <sgurun@google.com>
Date:   Wed Nov 13 16:45:01 2013 -0800

    am 1fb9f596: Merge "IndexedDB: Ignore duplicate transaction IDs sent by renderer" into klp-dev

    * commit '1fb9f596cd47b5e6e9abaaaadf2d1873be35cc02':
      IndexedDB: Ignore duplicate transaction IDs sent by renderer

commit cf7f6b39edcfe0ad3c22cfe4647c131a6e5be4ea
Merge: fd45b03 7daa8ff
Author: Jonathan Dixon <joth@google.com>
Date:   Wed Nov 13 12:18:13 2013 -0800

    am 7daa8ff7: Merge "(Fork) MR1 Fix for crash in <select> drop down" into klp-dev

    * commit '7daa8ff7eab742f86725e5082131e004ed1ff202':
      (Fork) MR1 Fix for crash in <select> drop down

commit fd45b039992566adcbf8d5ecf11f5f4944befb62
Merge: c83d4c4 c2f5b20
Author: Kristian Monsen <kristianm@google.com>
Date:   Wed Nov 13 10:57:59 2013 -0800

    am c2f5b209: Merge "Fix for pasting html clipboard content into a webview" into klp-dev

    * commit 'c2f5b20934a21f961a3d8e0045d47ca4d6ce3481':
      Fix for pasting html clipboard content into a webview

commit c83d4c406e6e4b28120c8c16868f1983e2884068
Merge: b988a91 c82c7db
Author: Selim Gurun <sgurun@google.com>
Date:   Wed Nov 13 07:18:11 2013 -0800

    am c82c7db6: Merge "don\'t preserve 1xx responses in parser buffer" into klp-dev

    * commit 'c82c7db6366a318db6ef91c2a02e1061fb15a319':
      don't preserve 1xx responses in parser buffer

commit b988a91e08b2ab80e8dc8de2818b6fc3aae9aaa7
Merge: ae10b35 dec53b8
Author: Leon Scroggins III <scroggo@google.com>
Date:   Wed Nov 13 06:44:46 2013 -0800

    am dec53b83: Override drawRRect in fake SkBitmapDevices.

    * commit 'dec53b837df8fe3b285f9040e38f696fc09b6f1b':
      Override drawRRect in fake SkBitmapDevices.

commit ae10b35080e2330a1008b9423b75047748c58f38
Merge: 4230c23 3c29aab
Author: Ben Murdoch <benm@google.com>
Date:   Tue Nov 12 02:26:30 2013 -0800

    am 3c29aaba: Merge "Cherry Pick https://codereview.chromium.org/65273002/ PS 8" into klp-dev

    * commit '3c29aaba6387dabc55557bbec39b59e1cb008484':
      Cherry Pick https://codereview.chromium.org/65273002/ PS 8

commit 4230c23c20984bd969c130f21a15d6a39c36094b
Merge: e9d4d01 3d97cf5
Author: Martin Kosiba <mkosiba@google.com>
Date:   Tue Nov 12 02:26:27 2013 -0800

    am 3d97cf50: Merge "[android_webview] Fix UAF in request interception code." into klp-dev

    * commit '3d97cf500bea628863f9606668061e6bdd59d267':
      [android_webview] Fix UAF in request interception code.

commit e9d4d0137f6165f2f3e917e9e058ed8243794e89
Merge: 80dfa5e c906bf1
Author: Tao Bai <michaelbai@google.com>
Date:   Mon Nov 11 09:49:48 2013 -0800

    am c906bf1a: Merge "Cherry-pick: Create WindowAndroid to make PowerSave work." into klp-dev

    * commit 'c906bf1a11402847ea5c48e6d2199e6c2ee3404f':
      Cherry-pick: Create WindowAndroid to make PowerSave work.

commit 80dfa5e7fedd772cf499a33c71c427b3aa92059d
Merge: 3516e14 e1049c7
Author: Bo Liu <boliu@google.com>
Date:   Mon Nov 11 09:11:43 2013 -0800

    am e1049c79: Fix incorrect resolving of merge conflict causing graphics corruption

    * commit 'e1049c797e39f4f9f9753731b3c7054473db1b45':
      Fix incorrect resolving of merge conflict causing graphics corruption

commit 3516e14e417107ba8b1d0d6dfe64fd5082604644
Merge: 10a99cc 91e7787
Author: Selim Gurun <sgurun@google.com>
Date:   Mon Nov 11 09:11:41 2013 -0800

    am 91e7787f: Merge "Call correct shouldoverrideurlloading when popups are created." into klp-dev

    * commit '91e7787fa5338fc0eeb6cbf0c504d4dc187b16ce':
      Call correct shouldoverrideurlloading when popups are created.

commit 10a99cc9b56e6081acb094f84457b0172e38c660
Merge: 0dea1d6 7cf8cef
Author: Jonathan Dixon <joth@google.com>
Date:   Mon Nov 11 09:11:39 2013 -0800

    am 7cf8cef2: Merge "Cherry-pick "Fix a fd leak in NPChannelBase on Posix"" into klp-dev

    * commit '7cf8cef2daadffac251c9fb11a16be569e0355ed':
      Cherry-pick "Fix a fd leak in NPChannelBase on Posix"

commit 0dea1d65901f2b86b848b69c6859ff0fdf356967
Merge: 1646560 18760af
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Mon Nov 11 09:11:36 2013 -0800

    am 18760af8: Cherry-pick: [Android WebView] Null check syncOnNewPictureStateToNative

    * commit '18760af88a405ded53cf524d9a273b217e759807':
      Cherry-pick: [Android WebView] Null check syncOnNewPictureStateToNative

commit 15fa748eb859077205cfb7614ebb2dfd076d4f7e
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Nov 6 12:27:49 2013 +0000

    Record Chromium merge at DEPS revision 232870

    This commit was generated by merge_to_master.py.

    Change-Id: I52cd5b8bc1f6e6fa0dc3d267bdcc9a286a92bb79

commit 0f1bc08d4cfcc34181b0b5cbf065c40f687bf740
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Nov 6 12:27:47 2013 +0000

    Merge from Chromium at DEPS revision 232870

    This commit was generated by merge_to_master.py.

    Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d

commit 164656050ff18a23bb2620fe38c7f04a8bea8c87
Merge: d163266 2d28b99
Author: Bo Liu <boliu@google.com>
Date:   Tue Nov 5 18:56:54 2013 -0800

    am 2d28b99e: Merge "Cherry-pick: [Android WebView] Only throttle fallback tick" into klp-dev

    * commit '2d28b99e19858055810a156a17ba64b173f6e614':
      Cherry-pick: [Android WebView] Only throttle fallback tick

commit d1632665d2298198369ea4eb79aeefe7bc3ce926
Merge: 716f609 dc4f02f
Author: Tao Bai <michaelbai@google.com>
Date:   Tue Nov 5 15:49:24 2013 -0800

    am dc4f02f0: Merge "Cherry-pick: Block media loading when AwSettings.setBlockNetworkLoads is true." into klp-dev

    * commit 'dc4f02f03ac951145533721607d283ea627dd6fa':
      Cherry-pick: Block media loading when AwSettings.setBlockNetworkLoads is true.

commit 716f60956099fb9810b96e254fbebbd77be69d43
Merge: da2e089 493c03e
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Mon Nov 4 21:54:06 2013 -0800

    am 493c03e6: Cherry-pick: [Android WebView] Change tile size to 384

    * commit '493c03e651ed36e9a01c2ec2caeae079b3db7e8c':
      Cherry-pick: [Android WebView] Change tile size to 384

commit 25a43fa85587560ef6f2f4a13f20208bed97a06d
Merge: 3552b24 b175e69
Author: Baligh Uddin <baligh@google.com>
Date:   Fri Nov 1 16:00:52 2013 -0700

    Merge remote-tracking branch 'origin/kitkat-dev'

commit da2e0893eeeb5c11c5f779789aa15d4f4447898e
Merge: 693c5be b40c061
Author: Jonathan Dixon <joth@google.com>
Date:   Fri Nov 1 14:10:38 2013 -0700

    am b40c061f: Merge changes I3bfa9cdd,Ideb06f7d,I9ecff16e,I0c7677a4 into klp-dev

    * commit 'b40c061feaf4b9e4a6e7dcde888c70f97d34fa41':
      Cherry-pick: gpu: Add Will/DidUseTexImage to GLImage API.
      Cherry-pick: Work around broken GL_TEXTURE_BINDING_EXTERNAL_OES query
      Cherry-pick: CC: Ensure recycle tree contains no 'active' tiles.
      Cherry-pick: CC: Cap the size of the SOON_BIN.

commit 3552b24127a8a0105a2a66c1ed89a4e620e4f959
Author: Baligh Uddin <baligh@google.com>
Date:   Thu Oct 31 18:20:49 2013 +0000

    Initial empty repository

commit 693c5be8e8bb2bccc72f01ab019dc5f1f4a23d92
Merge: ce3ae6a f9bd2a0
Author: Martin Kosiba <mkosiba@google.com>
Date:   Thu Oct 31 10:13:06 2013 -0700

    am f9bd2a04: [android] Fire accessibility events when scrolling sublayers.

    * commit 'f9bd2a04aa7c6c1c64504e0d5c5f5b0a4eb48755':
      [android] Fire accessibility events when scrolling sublayers.

commit ce3ae6a641de67fb482dd77e7f3ed8039e47a88e
Merge: 7a01c51 e38e0d9
Author: Martin Kosiba <mkosiba@google.com>
Date:   Thu Oct 31 04:58:57 2013 -0700

    am e38e0d9c: Merge "Set a fixed layout size only if the container view has a WRAP_CONTENT layout mode." into klp-dev

    * commit 'e38e0d9caf5215dfad883e6934dc1aad1aa7635d':
      Set a fixed layout size only if the container view has a WRAP_CONTENT layout mode.

commit 0bdaf95291fc46702f274f40e8e5081e9ef23011
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Oct 31 11:16:30 2013 +0000

    Record Chromium merge at DEPS revision 232015

    This commit was generated by merge_to_master.py.

    Change-Id: I9772934500e51bb13a59e59395984d9ab0084325

commit 1e9bf3e0803691d0a228da41fc608347b6db4340
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Oct 31 11:16:26 2013 +0000

    Merge from Chromium at DEPS revision 232015

    This commit was generated by merge_to_master.py.

    Change-Id: If86767ad396b9e2e1a4c1e9df1427daea29703ef

commit 7a01c5105b5d965f50cd86a3cb314e2272b1c212
Merge: 069a3cc 040e397
Author: Bo Liu <boliu@google.com>
Date:   Wed Oct 30 10:35:34 2013 -0700

    am 040e397b: Fork: Skip gralloc unbind on all except NVIDIA

    * commit '040e397bbc0ecd017aa4c19ce9cd87953a60fc8e':
      Fork: Skip gralloc unbind on all except NVIDIA

commit 069a3cc7aa98e6eb015dbc313d4398243552138f
Merge: 2700558 ad8795d
Author: peter@chromium.org <peter@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Oct 29 11:41:11 2013 -0700

    am ad8795de: Cherry-pick "Android should be able to copy HTML snippets to the system clipboard."

    * commit 'ad8795de7da44277582b3b0fc9910193ca1e511e':
      Cherry-pick "Android should be able to copy HTML snippets to the system clipboard."

commit 2700558311677ffb6ecd0c23798d8cf96ebd5300
Merge: 2dc41da 3556c0a
Author: Torne (Richard Coles) <torne@google.com>
Date:   Mon Oct 28 03:33:04 2013 -0700

    am 3556c0ac: Merge "Disable NOTIMPLEMENTED() in release branch." into klp-dev

    * commit '3556c0ac9cef4c8808ca792bd3008dd517a0f2d1':
      Disable NOTIMPLEMENTED() in release branch.

commit 2dc41da5b83246aa22a48e24472709e612afebc2
Merge: c63b452 6e78fdd
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Oct 24 17:41:09 2013 -0700

    am 6e78fdd9: Merge "Cherry-pick "Reject rather than abort client certificates"" into klp-dev

    * commit '6e78fdd95ad40eef8b73cb62c6bec7e8136c31d3':
      Cherry-pick "Reject rather than abort client certificates"

commit c63b452598f969550ab1f15189e324f734a42b55
Merge: e40b873 c5ed0dd
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Oct 24 12:46:51 2013 -0700

    am c5ed0dd4: Cherry-pick with modification: cc: Fix CHECK failure in PictureLayerImpl::UpdateTilePriorities

    * commit 'c5ed0dd4a10d05b45470feb21d7f5e5d21b375db':
      Cherry-pick with modification: cc: Fix CHECK failure in PictureLayerImpl::UpdateTilePriorities

commit e40b873f639fec7e6b624a3d13d4e3c49042ed6d
Merge: ba32978 491c833
Author: Jonathan Dixon <joth@google.com>
Date:   Wed Oct 23 14:16:31 2013 -0700

    am 491c833c: Merge "Cherry-pick "Dynamically enable spatial navigation based on events"" into klp-dev

    * commit '491c833cfd4760ae9961acf48ed51e5b9fff8d09':
      Cherry-pick "Dynamically enable spatial navigation based on events"

commit ba329784fa4fd3b10dda8a2f9a00601ca8fbcccb
Merge: ca50eb8 2735d69
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Wed Oct 23 12:22:59 2013 -0700

    am 2735d698: Cherry-pick with modification: cc: PictureLayerImpl with empty bounds should not have tiles

    * commit '2735d698090c20cd68ed6849096a9a06c25832c8':
      Cherry-pick with modification: cc: PictureLayerImpl with empty bounds should not have tiles

commit ca50eb831cefa92d02f812984a0df4ba7e8d6d5b
Merge: 20348a8 2c3943e
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Oct 22 12:02:23 2013 -0700

    am 2c3943e4: Merge "Prevent log spam in autofill" into klp-dev

    * commit '2c3943e4a16b91cb1a8122a4f351b56364ba9f9b':
      Prevent log spam in autofill

commit 20348a88e70bcbf6a42f1ef16842bdbd9cdacbfc
Merge: c6879f8 f3dbc6e
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Oct 22 10:25:15 2013 -0700

    am f3dbc6e1: Merge "Do not exclude background images/colors when printing" into klp-dev

    * commit 'f3dbc6e198bec673f0ad01df3fd06a8b9adc5c41':
      Do not exclude background images/colors when printing

commit f10b58d5bc6ae3e74076fc4ccca14cbc57ef805c
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Oct 22 16:41:38 2013 +0100

    Record Chromium merge at DEPS revision 230120

    This commit was generated by merge_to_master.py.

    Change-Id: Ied3cc12d9d868b3437fc2b7ac827f18dbc87f759

commit 8bcbed890bc3ce4d7a057a8f32cab53fa534672e
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Oct 22 16:41:35 2013 +0100

    Merge from Chromium at DEPS revision 230120

    This commit was generated by merge_to_master.py.

    Change-Id: I54bc06b7ee8a07092e74ce3b68c6893508349042

commit c6879f88f0219abbfe73721278ef5323e57c3aa6
Merge: fc1f6f7 37fd82d
Author: Marcin Kosiba <mkosiba@google.com>
Date:   Tue Oct 22 02:40:02 2013 -0700

    am 37fd82dc: Merge "[android_webview] Fix crash in testCreateDestroy." into klp-dev

    * commit '37fd82dc6c57fc507cfff1b042001ff2b06d2300':
      [android_webview] Fix crash in testCreateDestroy.

commit fc1f6f7c2f49bd08c1b0ef5c5c96d83df4cee04f
Merge: 397b981 218d56e
Author: Bart Sears <bsears@google.com>
Date:   Mon Oct 21 12:19:18 2013 -0700

    am 218d56eb: Merge "Cherry pick  [Android] MediaPlayerBridge should pass Bridge to getAllowedOperations" into klp-dev

    * commit '218d56ebb43b3487ce1df57f971d82d8180dabbb':
      Cherry pick  [Android] MediaPlayerBridge should pass Bridge to getAllowedOperations

commit 397b9819bc60e42792a4c1ab9384d361492e7db7
Merge: 4cc4ebb a8e6223
Author: Torne (Richard Coles) <torne@google.com>
Date:   Mon Oct 21 05:06:16 2013 -0700

    am a8e6223c: Merge "Android WebView: use IO thread for cookie manager." into klp-dev

    * commit 'a8e6223cfbd5e2a25116645ec1527a04fca1044a':
      Android WebView: use IO thread for cookie manager.

commit 4cc4ebb007ad26ded97605809b12b865ae115e76
Merge: c1be817 3919f93
Author: Ben Murdoch <benm@google.com>
Date:   Mon Oct 21 03:36:08 2013 -0700

    am 3919f93d: Cherry pick android: fix base::Time::FromLocalExploded() crash.

    * commit '3919f93d03121151c87c504c3143d160806c4474':
      Cherry pick android: fix base::Time::FromLocalExploded() crash.

commit c1be817f9e16e904f39be8dfa885c89e8c0197f9
Merge: 8c13e3e eb7b227
Author: Ben Murdoch <benm@google.com>
Date:   Fri Oct 18 11:21:37 2013 -0700

    am eb7b2273: Cherry pick [Android] Hide handles when the containing view moves

    * commit 'eb7b2273e27c3bc50668efb83c31402500c6c8f1':
      Cherry pick [Android] Hide handles when the containing view moves

commit 8c13e3e15cf293b637262855248851e96fd62b8e
Merge: 6dfc281 00d67fb
Author: Ben Murdoch <benm@google.com>
Date:   Fri Oct 18 11:21:35 2013 -0700

    am 00d67fbe: Cherry pick [Android] Allow text handles to observe position of "parent" view

    * commit '00d67fbec31ea9c007c872d7605303593c83101e':
      Cherry pick [Android] Allow text handles to observe position of "parent" view

commit 116fa16b45c9efe30e785b9fc32f09780ca23bec
Author: Torne (Richard Coles) <torne@google.com>
Date:   Fri Oct 18 15:46:26 2013 +0100

    Record Chromium merge at DEPS revision 228962

    This commit was generated by merge_to_master.py.

    Change-Id: I636ddc3867f035180d032505f743dceeec39586e

commit 4e180b6a0b4720a9b8e9e959a882386f690f08ff
Author: Torne (Richard Coles) <torne@google.com>
Date:   Fri Oct 18 15:46:22 2013 +0100

    Merge from Chromium at DEPS revision 228962

    This commit was generated by merge_to_master.py.

    Change-Id: I23bd7d7766f213fd52f28ae5e1ecc6ae9df905ea

commit 6dfc2813bb4361726196fa559e7a26bccce44089
Merge: be966bc 2cabbb3
Author: Ben Murdoch <benm@google.com>
Date:   Fri Oct 18 03:54:10 2013 -0700

    am 2cabbb3b: Merge "Cherry Pick [Android] Properly handle cancelled scroll events" into klp-dev

    * commit '2cabbb3bae6df73db637a913562823306be613a8':
      Cherry Pick [Android] Properly handle cancelled scroll events

commit be966bc74ff9f1d539d77b991d8013b6a4bb94c1
Merge: 20a1630 d81d4fb
Author: Ben Murdoch <benm@google.com>
Date:   Fri Oct 18 03:54:07 2013 -0700

    am d81d4fb9: Merge "Cherry-pick "[Android] Don\'t hide text handles if they are being dragged"" into klp-dev

    * commit 'd81d4fb97fe99cc8ea3a20a3ceccb39294c0239f':
      Cherry-pick "[Android] Don't hide text handles if they are being dragged"

commit 20a16309141cd9d06fc19962deb8bef7cae0daf3
Merge: 982982d efe95cda
Author: Bo Liu <boliu@google.com>
Date:   Thu Oct 17 10:57:32 2013 -0700

    am efe95cda: Revert "Fork: Read and skip glBindRenderbufferEXT if no change"

    * commit 'efe95cda899c7ca656eaa82685a9cf0443020513':
      Revert "Fork: Read and skip glBindRenderbufferEXT if no change"

commit 982982d8220cac9a019ffd3901e4a3dfb9146eb9
Merge: 311703c cf0c1a0
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Oct 17 10:57:30 2013 -0700

    am cf0c1a0e: Cherry-pick: [Android WebView] Do not throttle if need picture listener

    * commit 'cf0c1a0e7d3ebad160824014d10c9524fba638ae':
      Cherry-pick: [Android WebView] Do not throttle if need picture listener

commit 311703cfcb02c62b6e6bd949b8aae0ad59ce33bc
Merge: 3d80e5a b175e69
Author: Ed Heyl <edheyl@google.com>
Date:   Wed Oct 16 17:51:59 2013 -0700

    am b175e69a: merge in klp-release (no-op)

    * commit 'b175e69a046cc5fa42171afcaf2d05a731121feb':
      [android_webview] Update fixed layout size on page scale changes.
      Cherry-pick: cc: Fix ideal_content_scale check in PictureImageLayerImpl
      Cherry-pick: [Android WebView] Check AwContentsIoThreadClient usage
      Split AwSettings contruction out of AwContents
      Android code should not assume main thread == UI thread.
      Cherry-pick: Early out if contentviewcore native side is null.
      Fixes to shouldoverrideurlloading for compatibility

commit 3d80e5ac884e19d034406aee0804d5b6e9303ca6
Merge: d95e742 11d030b
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Oct 16 14:29:26 2013 -0700

    am 11d030b3: Support a prebuilt WebView.

    * commit '11d030b31fde08e3d37b9a20cb00666ea6222aaf':
      Support a prebuilt WebView.

commit d95e742dc1d802a1216ab65cb4c415c3b4e2f6f5
Merge: a7e9d60 28e3c70
Author: Bo Liu <boliu@google.com>
Date:   Tue Oct 15 16:16:46 2013 -0700

    am 28e3c708: Fork: Skip unbind image to texture on ARM

    * commit '28e3c708edc98abce5b8c0be99e63ae752bd899c':
      Fork: Skip unbind image to texture on ARM

commit a7e9d60b8f3054066369d3ec505ac9654db0108e
Merge: 2b70b31 99d7eee
Author: Bo Liu <boliu@google.com>
Date:   Mon Oct 14 09:59:19 2013 -0700

    am 99d7eee1: Merge "Fork: Read and skip glBindRenderbufferEXT if no change" into klp-dev

    * commit '99d7eee1ddf8f5c8ef127f961c0f61f58879ca7c':
      Fork: Read and skip glBindRenderbufferEXT if no change

commit 2b70b3150289c9a7950f53e3880bad76adcd9cd8
Merge: c46a830 de8ca0a
Author: Torne (Richard Coles) <torne@google.com>
Date:   Mon Oct 14 08:47:04 2013 -0700

    am de8ca0a0: Merge "Make extra headers only apply to the main frame." into klp-dev

    * commit 'de8ca0a055d88e8ccf9950b0cdba763245993e4e':
      Make extra headers only apply to the main frame.

commit c46a830a4bc20f29241811414f224a867a87ea0b
Merge: b23c102 828d8c2
Author: Jonathan Dixon <joth@google.com>
Date:   Sun Oct 13 16:44:40 2013 -0700

    am 828d8c23: Merge "Wire up the quirk for merging multiple <meta viewport> tags" into klp-dev

    * commit '828d8c23d964560acf2a0e0aaf5d572d5aaf9b30':
      Wire up the quirk for merging multiple <meta viewport> tags

commit b23c102ba7edbdaca4742bf6fad905e92ed71f14
Merge: aeb31a1 fcd5c11
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Sun Oct 13 07:19:22 2013 -0700

    am fcd5c11b: Cherry-pick: [Android] Use getEventTime for long press timeout

    * commit 'fcd5c11bbf7f316110ea1f5435494ecfccf3c5fa':
      Cherry-pick: [Android] Use getEventTime for long press timeout

commit aeb31a144c474d3c67c0f23bd59126b6575abd4c
Merge: c5cb6b0 81db8d8
Author: Selim Gurun <sgurun@google.com>
Date:   Fri Oct 11 18:07:35 2013 -0700

    am 81db8d8d: Merge "Maintain a ref to Java objects while print in progress" into klp-dev

    * commit '81db8d8dc9a4a004ebed0f4e13fa8f927fc34d36':
      Maintain a ref to Java objects while print in progress

commit c5cb6b0c913dc2c8721f4e53338ff7444c4d8310
Merge: d029b0a 0aabc40
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Fri Oct 11 17:42:35 2013 -0700

    am 0aabc40a: Cherry-pick: [Android] Retry create StreamTextureProxy on play

    * commit '0aabc40ab6c782bed30450758afd0c2c71d9969f':
      Cherry-pick: [Android] Retry create StreamTextureProxy on play

commit d029b0a0cbde888746df2b3fc0a75269436e9499
Merge: 4fb70a3 ff02a59
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Fri Oct 11 15:07:01 2013 -0700

    am ff02a590: Cherry-pick with modifications: cc: Fix HeadsUpDisplayLayerImpl NPE after resource loss

    * commit 'ff02a5906993e65f5c8bf12b09245e7a673d8283':
      Cherry-pick with modifications: cc: Fix HeadsUpDisplayLayerImpl NPE after resource loss

commit 4fb70a37be354305ceffb024c45561d13f6c995e
Merge: 8957106 e3c7845
Author: Torne (Richard Coles) <torne@google.com>
Date:   Fri Oct 11 04:00:11 2013 -0700

    am e3c7845b: Record Chromium merge at DEPS revision 30.0.1599.101

    * commit 'e3c7845b168eba637e7b68fada7303e7835938e4':
      Record Chromium merge at DEPS revision 30.0.1599.101

commit 8957106d8ee749294117c206f80db64846716563
Merge: 030d018 f5936e5
Author: Torne (Richard Coles) <torne@google.com>
Date:   Fri Oct 11 04:00:10 2013 -0700

    am f5936e50: Merge from Chromium at DEPS revision 30.0.1599.101

    * commit 'f5936e50c9ec1155768565fb2a8c955b67d9b962':
      Merge from Chromium at DEPS revision 30.0.1599.101

commit 030d0181f4d031a2e2630d323a8168a19fcb0f15
Merge: c021d31 772f35d
Author: Richard Coles <torne@google.com>
Date:   Thu Oct 10 10:33:45 2013 -0700

    am 772f35d4: Merge "Cherry-pick: Android: disable 2d canvas AA in a different place." into klp-dev

    * commit '772f35d4a19c0c8865427dc75a445829eb132748':
      Cherry-pick: Android: disable 2d canvas AA in a different place.

commit c021d31e70f9219a622cf87f5301fe13874cc718
Merge: 7d86f6e 6d3352e
Author: Martin Kosiba <mkosiba@google.com>
Date:   Thu Oct 10 10:04:24 2013 -0700

    am 6d3352ed: [android_webview] Update fixed layout size on page scale changes.

    * commit '6d3352ed33733df11e4b78c98ab4dcfcb9a64279':
      [android_webview] Update fixed layout size on page scale changes.

commit 7d86f6e36a8160cf4fa3ae076305cfbcfc5e6011
Merge: 0f6c272 b76d682
Author: Mikhail Naganov <mnaganov@google.com>
Date:   Thu Oct 10 08:23:11 2013 -0700

    am b76d682e: Cherry-pick: [Android WebView] Enable the Blink quirk for returning screen sizes in physical pixels

    * commit 'b76d682e577a78ae238af2584c91351331c8ea61':
      Cherry-pick: [Android WebView] Enable the Blink quirk for returning screen sizes in physical pixels

commit 0f6c2726036eb1d2508bff636f45a1a8a615418f
Merge: 462be53 ab145de
Author: Jonathan Dixon <joth@google.com>
Date:   Wed Oct 9 23:26:38 2013 -0700

    am ab145de0: Merge "Workaround for apps expecting invalid URL resolutions" into klp-dev

    * commit 'ab145de0264be08630f38c48de5759cd9882b97b':
      Workaround for apps expecting invalid URL resolutions

commit 462be5396238a8312dec31f53991db748fddcb69
Merge: 3ccf1ab f24abfd
Author: Jonathan Dixon <joth@google.com>
Date:   Wed Oct 9 15:08:30 2013 -0700

    am f24abfd8: Merge "Use total page scale in the LayerScrollOffsetDelegate." into klp-dev

    * commit 'f24abfd8816a1b217a26172d71568bdad8d243fe':
      Use total page scale in the LayerScrollOffsetDelegate.

commit 3ccf1abdf1b9f6931c7c4d2b308dc1f7f88862b0
Merge: 0c1c990 431571a
Author: Bo Liu <boliu@chromium.org>
Date:   Wed Oct 9 10:48:43 2013 -0700

    am 431571a3: Fork: Do not clear document background in Android WebView

    * commit '431571a3a769041c098e15fed32e0a980b3029d2':
      Fork: Do not clear document background in Android WebView

commit 0c1c990abf97a7707b8548d6f39e2b51daafdcc6
Merge: b49f334 fbc84d9
Author: Jonathan Dixon <joth@google.com>
Date:   Wed Oct 9 09:57:52 2013 -0700

    am fbc84d90: Merge "Cherry-pick "Add --disable-compositor-touch-hit-testing flag"" into klp-dev

    * commit 'fbc84d90c9b42fb02bb9d81bada128d638b942e0':
      Cherry-pick "Add --disable-compositor-touch-hit-testing flag"

commit b49f33431f5221db0a78f0d521b40bb467a2792c
Merge: c76b8d9 5f8ef20
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Oct 9 03:21:44 2013 -0700

    am 5f8ef208: WebView: Fix CookieManager file:// scheme functions.

    * commit '5f8ef208b84e80afecf9821a90589487c851b400':
      WebView: Fix CookieManager file:// scheme functions.

commit c76b8d956647a09ca0300bfb8a0c62147a4d1385
Merge: 3d3e9b0 bb535fb
Author: Alexandre Elias <aelias@google.com>
Date:   Tue Oct 8 22:53:14 2013 -0700

    am bb535fb2: Merge "Cherry-pick http://crrev.com/25233002 "Make Android WebView filtering depend on scrolling status."" into klp-dev

    * commit 'bb535fb2ef23e55737a27cd974d4304a1e2e1f7a':
      Cherry-pick http://crrev.com/25233002 "Make Android WebView filtering depend on scrolling status."

commit 3d3e9b0eb714fa04e6606a89747aabb223537054
Merge: c747c9c 3d4c8d8
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Oct 8 17:30:07 2013 -0700

    am 3d4c8d8c: Merge "Fix shouldoverrideurlloading." into klp-dev

    * commit '3d4c8d8c8f66216ff316a70bc8e227830b23251f':
      Fix shouldoverrideurlloading.

commit c747c9c22e312eb7933a498db6b5bd247188e4b9
Merge: 6dcf375 6648600
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Oct 8 17:30:05 2013 -0700

    am 66486001: Merge "Revert "Further cleanup of shouldoverrideUrlloading change"" into klp-dev

    * commit '664860012f6b3a9cb016b515bde125fc190785c6':
      Revert "Further cleanup of shouldoverrideUrlloading change"

commit 6dcf375957520acb293fbe1a9288c3133df7c40b
Merge: 804cef2 b6c936b
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Oct 8 17:30:02 2013 -0700

    am b6c936bc: Merge "Revert "Complete Sync shouldoverrideurlloading by cleaning code"" into klp-dev

    * commit 'b6c936bc99117f4042bb9ff784fc444543fa83de':
      Revert "Complete Sync shouldoverrideurlloading by cleaning code"

commit 804cef2843187e4a0d2fa542e86dea4151c43aa5
Merge: b779fb0 ba09230
Author: Ed Heyl <edheyl@google.com>
Date:   Tue Oct 8 16:11:44 2013 -0700

    am ba09230b: merge in KFS78N (no-op)

    * commit 'ba09230ba6ad5cf4899bfb299beb1fdb17fe82ec':
      Cherry-pick http://crrev.com/23478022
      Revert "Patch in http://crrev.com/22903029"

commit b779fb01e4062baef16bbf2b06a7d831c9535150
Merge: 6017e26 dfb6ade
Author: Bo Liu <boliu@google.com>
Date:   Tue Oct 8 16:11:42 2013 -0700

    am dfb6aded: Merge "Cherry-pick: cc: Fix ideal_content_scale check in PictureImageLayerImpl" into klp-dev

    * commit 'dfb6aded03a43c65c029b57deedf4cb1fdab3fa7':
      Cherry-pick: cc: Fix ideal_content_scale check in PictureImageLayerImpl

commit 6017e26c238576cd239b79489db7cef532c393c0
Merge: c438901 2a31b71
Author: Ed Heyl <edheyl@google.com>
Date:   Tue Oct 8 15:45:50 2013 -0700

    am 2a31b712: merge in KQS81M

    * commit '2a31b7123aed21a8dd506113d4e03e0492137f7d':
      [android_webview] Fix layout in AT_MOST mode.
      Revert "Downstream Workaround for Qualcomm Bug 10205015"
      Manual cherry-pick of https://codereview.chromium.org/23623020
      Cherry-pick "Send Android accessibility "content changed" event for any change"
      Patch in http://crrev.com/22903029
      Patch in https://codereview.chromium.org/23018005/

commit c4389012889a6668beddd55fc858d4e15d127948
Merge: e59bcb3 2c5321a
Author: torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Oct 8 08:02:33 2013 -0700

    am 2c5321ad: Cherry-pick: Android WebView: post QuotaManager calls to UI thread.

    * commit '2c5321ad9e38e13db96aa452156b86271b6c4958':
      Cherry-pick: Android WebView: post QuotaManager calls to UI thread.

commit e59bcb370bee4fb00f23ba041e208bc130baf141
Merge: 1ccef68 1cca392
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Oct 8 06:35:15 2013 -0700

    am 1cca3922: Record Chromium merge at DEPS revision 30.0.1599.100

    * commit '1cca392207c98e41cc22bd242c6738f9ce2f5dd2':
      Record Chromium merge at DEPS revision 30.0.1599.100

commit 1ccef681aabf83ae71e8c003d59ac39639e2c9b2
Merge: fc8ba36 9ab648a
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Oct 8 06:35:13 2013 -0700

    am 9ab648a9: Merge from Chromium at DEPS revision 30.0.1599.100

    * commit '9ab648a9d8bb43f27cc0620387d8052a8485a5ee':
      Merge from Chromium at DEPS revision 30.0.1599.100

commit fc8ba36f21d0e13c516a000554dc7327cff9b9e3
Merge: ce7ac9b f1f5a61
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Mon Oct 7 09:26:09 2013 -0700

    am f1f5a614: Cherry-pick: [Android WebView] Disable shrinksStandaloneImagesToFit

    * commit 'f1f5a614c72ca11541bdec079819d75c98464177':
      Cherry-pick: [Android WebView] Disable shrinksStandaloneImagesToFit

commit ce7ac9be5ccae0e7088ccadda151e9791e8fbbf2
Merge: 8a75909 c93e859
Author: Ben Murdoch <benm@google.com>
Date:   Mon Oct 7 02:38:52 2013 -0700

    am c93e8595: Merge "Cherry pick [Android WebView] Disable WebRTC." into klp-dev

    * commit 'c93e8595cd8964d49e8fa9f82d5c40619cded71c':
      Cherry pick [Android WebView] Disable WebRTC.

commit 8a759098f692f59d2b29ce5a0e429b6be04f3f3d
Merge: c990aba 6d46f37
Author: Ben Murdoch <benm@google.com>
Date:   Mon Oct 7 02:38:50 2013 -0700

    am 6d46f372: Merge "Cherry Pick [Android WebView] Add an API to control favicon loading." into klp-dev

    * commit '6d46f372eaeefc05bad81b4ccbd4be041f6aad1b':
      Cherry Pick [Android WebView] Add an API to control favicon loading.

commit c990abaac8779c1d24ac5f90f9cd0e950b778b4d
Merge: 3e86d63 d3b04d9
Author: Bo Liu <boliu@google.com>
Date:   Fri Oct 4 18:39:50 2013 -0700

    am d3b04d94: Fork: Activation do not depend on BeginFrame

    * commit 'd3b04d94ac5d69bc004407623274e7b4f78fe950':
      Fork: Activation do not depend on BeginFrame

commit 3e86d63dfdc4140a5287784f7e6e6d10780d0d50
Merge: 05966d4 20a183a
Author: Torne (Richard Coles) <torne@google.com>
Date:   Fri Oct 4 09:41:43 2013 -0700

    am 20a183ad: Allow CookieManager to be used without starting Chromium.

    * commit '20a183ad098c05cd932b716c568006ea05000542':
      Allow CookieManager to be used without starting Chromium.

commit 05966d4bac9411de465d7b9274d3667be76e068f
Merge: e6f1907 1e62f0c
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Oct 3 22:15:14 2013 -0700

    am 1e62f0c0: Cherry-pick: [Android WebView] Check AwContentsIoThreadClient usage

    * commit '1e62f0c031cc1d397084dfe50a26162f857ae4c9':
      Cherry-pick: [Android WebView] Check AwContentsIoThreadClient usage

commit e6f19072a08e12a37b26b20838cdadbe206959d7
Merge: b937125 00bdd09
Author: Bo Liu <boliu@google.com>
Date:   Thu Oct 3 15:42:17 2013 -0700

    am 00bdd09e: Merge "Cherry-pick: [Android] Prevent re-entrance into ContentVideoView.exitFullscreen" into klp-dev

    * commit '00bdd09e0836be18c4253b10d2cf84dfba5cfd3f':
      Cherry-pick: [Android] Prevent re-entrance into ContentVideoView.exitFullscreen

commit b9371259bb6e495937b6f2ab4d21dc0b5b664a55
Merge: 7da5d83 e0f9243
Author: Bo Liu <boliu@google.com>
Date:   Thu Oct 3 15:42:14 2013 -0700

    am e0f9243d: Merge "Cherry-pick: [Android WebView] Change default tile size to 512x512" into klp-dev

    * commit 'e0f9243d15bc8219966c275be63014ac035046e8':
      Cherry-pick: [Android WebView] Change default tile size to 512x512

commit 7da5d838ec7123c14102279d9b552ad615938bef
Merge: b6be751 e61eb14
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Oct 3 15:38:35 2013 -0700

    am e61eb146: Split AwSettings contruction out of AwContents

    * commit 'e61eb146503996483746547b385915c34528d838':
      Split AwSettings contruction out of AwContents

commit b6be751718f4af376340ac0dce2370b8ae3456ad
Merge: 1cef9f7 c7bc415
Author: Ben Murdoch <benm@google.com>
Date:   Thu Oct 3 15:38:32 2013 -0700

    am c7bc4150: Android code should not assume main thread == UI thread.

    * commit 'c7bc4150c7dee00c658772863a771d00102e00fb':
      Android code should not assume main thread == UI thread.

commit 1cef9f7e92ffbb4cc2bfa75f4a8a9ddc6d569fa8
Merge: 91d63e6 d3df597
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Oct 3 15:38:30 2013 -0700

    am d3df597f: Cherry-pick: [Android WebView] Fix invalidate corner case

    * commit 'd3df597fc02afb0e88fef13c90cd425c2065bbf6':
      Cherry-pick: [Android WebView] Fix invalidate corner case

commit 91d63e665872b8400d535373f5fe3b9627e60724
Merge: ffb0f12 7211bb1
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Oct 3 15:38:28 2013 -0700

    am 7211bb13: Cherry-pick: [Android WebView] OnMemoryPressure to drop tile memory

    * commit '7211bb133f06cafe148e28f08fbfe0b90c4b1b78':
      Cherry-pick: [Android WebView] OnMemoryPressure to drop tile memory

commit ffb0f123253b2249457f07c557e4dc4221bdd8e3
Merge: 51e8264 83f0adc
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Thu Oct 3 15:38:26 2013 -0700

    am 83f0adcf: Cherry-pick: [Android] Restore EGL Context after collecting GPU info

    * commit '83f0adcf664daf43b691f703508068b17b86196d':
      Cherry-pick: [Android] Restore EGL Context after collecting GPU info

commit 51e8264a6ceecd86b6c94489d679e2efdffc2f1c
Merge: 8de333e b95a50b
Author: Bo Liu <boliu@google.com>
Date:   Wed Oct 2 09:47:21 2013 -0700

    am b95a50b8: Merge "Cherry-pick: [Android WebView] Fix fallback tick corner cases" into klp-dev

    * commit 'b95a50b8fad87211d89087a3e78cf12c8f873f9c':
      Cherry-pick: [Android WebView] Fix fallback tick corner cases

commit 8de333ea7e65c549a0d4493d2701826c0d876fff
Merge: 29da34b 5294690
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Wed Oct 2 09:47:19 2013 -0700

    am 52946908: Cherry-pick: [Android WebView] Use CUTOFF_ALLOW_NICE_TO_HAVE

    * commit '52946908e7f3d7793093ef8cda46dbe61175eb3e':
      Cherry-pick: [Android WebView] Use CUTOFF_ALLOW_NICE_TO_HAVE

commit 29da34bfb2275bb0f78d4b016ed72d30badbcb5b
Merge: 17512eb a78ae86
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Oct 2 09:37:48 2013 -0700

    am a78ae862: Record Chromium merge at DEPS revision 30.0.1599.85

    * commit 'a78ae8624443df8a00c2ea634e92faa4c4164cbf':
      Record Chromium merge at DEPS revision 30.0.1599.85

commit 17512eba2f11a0e94d5afe786e6d4f9cfbcc9ed0
Merge: 70a5b5a 762b2f2
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Oct 2 09:37:45 2013 -0700

    am 762b2f21: Merge from Chromium at DEPS revision 30.0.1599.85

    * commit '762b2f2129a215bc851e73887244c3a82a892731':
      Merge from Chromium at DEPS revision 30.0.1599.85

commit 70a5b5afadccb276303231b41df659f5f3044195
Merge: 9f899bd 331ba8b
Author: primiano@chromium.org <primiano@chromium.org>
Date:   Wed Oct 2 09:37:43 2013 -0700

    am 331ba8b1: Cherry-pick: CC: Fix call order of ScrollOffsetDelegate in ActivatePendingTree.

    * commit '331ba8b17b62dfe7ec9544bbfc1203a2ba03c0c3':
      Cherry-pick: CC: Fix call order of ScrollOffsetDelegate in ActivatePendingTree.

commit 9f899bd36ec25fd33c416971cd82bb135e1915c2
Merge: b500f4e 3f1a192
Author: Selim Gurun <sgurun@google.com>
Date:   Wed Oct 2 09:36:08 2013 -0700

    am 3f1a192d: Cherry-pick: Early out if contentviewcore native side is null.

    * commit '3f1a192d4cbcd79827e1efe187d4520c4e7df64c':
      Cherry-pick: Early out if contentviewcore native side is null.

commit b500f4edb58a227c473cf9a720df377a8681f5ba
Merge: a38f505 58b78f9
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Mon Sep 30 17:32:39 2013 -0700

    am 58b78f98: Cherry-pick: [Android WebView] Hook up MemoryPressureListener

    * commit '58b78f98549d67d69dd93ae7384d8b499bbcba71':
      Cherry-pick: [Android WebView] Hook up MemoryPressureListener

commit a38f505d0c1accb318f8f6dde54802af9172345c
Merge: 96679ad 58a2f6b
Author: Alexandre Elias <aelias@google.com>
Date:   Mon Sep 30 17:09:29 2013 -0700

    am 58a2f6b8: Merge "Cherry-pick http://crrev.com/24280009" into klp-dev

    * commit '58a2f6b8fd2c42a65d95955e071e72ca7f0ac9b5':
      Cherry-pick http://crrev.com/24280009

commit 96679adfff5e335f4feac521cd872f3958288627
Merge: fc1e1af ad048f7
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Mon Sep 30 17:09:26 2013 -0700

    am ad048f7a: Cherry-pick: [Android WebView] Tweak gpu memory for low end devices

    * commit 'ad048f7a97bef13992a090518199eebadb06006d':
      Cherry-pick: [Android WebView] Tweak gpu memory for low end devices

commit fc1e1af18c67f89b54e1f29fc55043ba5124a213
Merge: 639d504 9c54b5e
Author: Bo Liu <boliu@google.com>
Date:   Mon Sep 30 17:08:16 2013 -0700

    am 9c54b5e6: Merge "Cherry-pick: [Android WebView] Fix NPE in video when context creation fails" into klp-dev

    * commit '9c54b5e6ab85ca15242bff6b268963384b34b525':
      Cherry-pick: [Android WebView] Fix NPE in video when context creation fails

commit 639d504134b6026be034824d7be161c3b4d3cc75
Merge: 010272e a5bfe74
Author: Ben Murdoch <benm@google.com>
Date:   Mon Sep 30 17:07:47 2013 -0700

    am a5bfe74f: Merge "Cherry pick [Android WebView] Populate WebKit WebPreferences correctly in browser" into klp-dev

    * commit 'a5bfe74f6f71a95c561a5a16074f9174acb4884a':
      Cherry pick [Android WebView] Populate WebKit WebPreferences correctly in browser

commit 010272e3eebac5835594222224ab1c982c23180c
Merge: c176e4d e4d11e1
Author: Ben Murdoch <benm@google.com>
Date:   Mon Sep 30 17:07:46 2013 -0700

    am e4d11e16: Merge "Cherry pick [Android] When toggling AX script inject, also set native AX state." into klp-dev

    * commit 'e4d11e16722809ba0916c1820c48ba7de74ec064':
      Cherry pick [Android] When toggling AX script inject, also set native AX state.

commit c176e4d27e3179641d0b3afb3897de33f7bac193
Merge: 289c0fb 9117cf2
Author: Torne (Richard Coles) <torne@google.com>
Date:   Mon Sep 30 17:07:43 2013 -0700

    am 9117cf27: Record Chromium merge at DEPS revision 30.0.1599.82

    * commit '9117cf272bd1ff977e53f13cf09f28553ecb34fb':
      Record Chromium merge at DEPS revision 30.0.1599.82

commit 289c0fb437e41350d75658f09840928f2d263e46
Merge: 35c11fe f4c09e4
Author: Torne (Richard Coles) <torne@google.com>
Date:   Mon Sep 30 17:07:41 2013 -0700

    am f4c09e4d: Merge from Chromium at DEPS revision 30.0.1599.82

    * commit 'f4c09e4da90034483afafd74218d4788668d380a':
      Merge from Chromium at DEPS revision 30.0.1599.82

commit 35c11fefa26cf38fe8bffc6f0c40f1f83bf31eda
Merge: f8e7e59 e103615
Author: Ben Murdoch <benm@google.com>
Date:   Mon Sep 30 17:07:39 2013 -0700

    am e1036150: Fix the build

    * commit 'e1036150613fa1c175b7e73ca03d6ed3af68b757':
      Fix the build

commit f8e7e59b91c721bd5d802e759af06af6f351d4c9
Merge: 19196cb b82173f
Author: Ben Murdoch <benm@google.com>
Date:   Mon Sep 30 17:07:37 2013 -0700

    am b82173f6: Merge "Revert "Cherry pick [Android WebView] Populate WebKit WebPreferences correctly in browser"" into klp-dev

    * commit 'b82173f679ea4ba11f50f1c3e7f4b204e43eb506':
      Revert "Cherry pick [Android WebView] Populate WebKit WebPreferences correctly in browser"

commit 19196cbfa11cabdc175e97772055b4461cb47b48
Merge: 0153217 141c408
Author: Ben Murdoch <benm@google.com>
Date:   Mon Sep 30 17:07:35 2013 -0700

    am 141c4083: Merge "Revert "Cherry pick [Android] When toggling AX script inject, also set native AX state."" into klp-dev

    * commit '141c4083c258e442d40031cc44e00edf98deec64':
      Revert "Cherry pick [Android] When toggling AX script inject, also set native AX state."

commit 015321797590a90cf805207556da3127c510b865
Merge: 2b42565 ba27900
Author: Ben Murdoch <benm@google.com>
Date:   Mon Sep 30 17:07:33 2013 -0700

    am ba279007: Merge "Cherry pick [Android WebView] Populate WebKit WebPreferences correctly in browser" into klp-dev

    * commit 'ba27900735408ce0c0c3ba3d0fa810f995d1978d':
      Cherry pick [Android WebView] Populate WebKit WebPreferences correctly in browser

commit 2b425653aeccfbca35f28f914902e3f16e309ccd
Merge: c7c4551 e6ed347
Author: Ben Murdoch <benm@google.com>
Date:   Mon Sep 30 17:07:31 2013 -0700

    am e6ed3473: Merge "Cherry pick [Android] When toggling AX script inject, also set native AX state." into klp-dev

    * commit 'e6ed34736639962b89b0c094de7b5543013e1a12':
      Cherry pick [Android] When toggling AX script inject, also set native AX state.

commit c7c4551497fab6bd92b64398f4358a469f74ad4b
Merge: 73db176 2a0dedf
Author: aurimas@chromium.org <aurimas@chromium.org@0039d316-1c4b-4281-b951-d872>
Date:   Mon Sep 30 17:07:29 2013 -0700

    am 2a0dedf6: Cherry-pick: A workaround of LatinIME using targetAPI < 15.

    * commit '2a0dedf6d7182f889f42011a4ae94b6bf4740e77':
      Cherry-pick: A workaround of LatinIME using targetAPI < 15.

commit 73db176f4859e09dd12b0bccaad3d9a7d0dbb2b6
Merge: c3de095 e6cbc2f
Author: Ben Murdoch <benm@google.com>
Date:   Thu Sep 26 14:22:47 2013 -0700

    am e6cbc2f9: Merge "Always send DidOverscroll callback for android_webview." into klp-dev

    * commit 'e6cbc2f94a2f388b78abafebdd1ad870c96de2fd':
      Always send DidOverscroll callback for android_webview.

commit c3de095d788988fcf3af19dd43d76fe55de1eea9
Merge: 0b067a5 8a1f3c1
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Sep 26 07:42:57 2013 -0700

    am 8a1f3c12: Merge "Fixes to shouldoverrideurlloading for compatibility" into klp-dev

    * commit '8a1f3c1247c941882a63a52e8ef66149fa99469a':
      Fixes to shouldoverrideurlloading for compatibility

commit 0b067a57d3669f8d8f0f3f3f9d19e0a17b3e9abf
Merge: a8159f2 19c7886
Author: Ben Murdoch <benm@google.com>
Date:   Thu Sep 26 06:00:20 2013 -0700

    am 19c7886e: Merge "Work around thread unsafety in NPChannelBase." into klp-dev

    * commit '19c7886ea9fa9a4a10e0a8dcc751499d8fd8e823':
      Work around thread unsafety in NPChannelBase.

commit a8159f224e725be8c1c035016cecbff5c3f9bd92
Merge: 1c3505c e4a023b
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Sep 26 06:00:18 2013 -0700

    am e4a023bf: Record Chromium merge at DEPS revision 30.0.1599.80

    * commit 'e4a023bf9cca3553b8e28a678ab2c356fee11551':
      Record Chromium merge at DEPS revision 30.0.1599.80

commit 1c3505cf3f3a0b5e8cbdc8bf593b8b95dd004441
Merge: 336a2b6 6f2f9e2
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Sep 26 06:00:16 2013 -0700

    am 6f2f9e25: Merge from Chromium at DEPS revision 30.0.1599.80

    * commit '6f2f9e25f2f6cffbef085af97c00a639a2ce488e':
      Merge from Chromium at DEPS revision 30.0.1599.80

commit 336a2b6dca75a5d483f320e96daa6102f9c0e9ec
Merge: 3fb12f3 030a55e
Author: Ben Murdoch <benm@google.com>
Date:   Thu Sep 26 06:00:14 2013 -0700

    am 030a55ef: Merge "[android_webview] Use a fraction to calculate scroll offset." into klp-dev

    * commit '030a55ef698a4dfb1a4ff344c2b8c20840d5c097':
      [android_webview] Use a fraction to calculate scroll offset.

commit 1179b92b08db0c652a0cf003ab4d89b31ce3610f
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Sep 26 13:24:59 2013 +0100

    Record Chromium merge at DEPS revision 225410

    This commit was generated by merge_to_master.py.

    Change-Id: I8a5c84a7aedef48c8125638b625d8bd15ea1f199

commit 68043e1e95eeb07d5cae7aca370b26518b0867d6
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Sep 26 13:24:57 2013 +0100

    Merge from Chromium at DEPS revision 225410

    This commit was generated by merge_to_master.py.

    Change-Id: Ifa1539ca216abb163295ee7a77f81bb67f52e178

commit 3fb12f3a348f3b1da58c9dc1bb5a4de2990dd59d
Merge: 10eef2a 4214a89
Author: Bo Liu <boliu@google.com>
Date:   Wed Sep 25 14:03:51 2013 -0700

    am 4214a892: Merge "Cherry-pick: cc: Set needs update draw properties during renderer creation" into klp-dev

    * commit '4214a89295d23872c8479704983163857b9b516c':
      Cherry-pick: cc: Set needs update draw properties during renderer creation

commit 10eef2aaf9641bb53eb3ff019d4f6d2f2f4c8a80
Merge: 01ed8b5 6fd053b
Author: Alexandre Elias <aelias@google.com>
Date:   Wed Sep 25 13:58:25 2013 -0700

    am 6fd053bb: Merge "Cherry-pick r218169 "cc: Layer::SetTouchEventHandlerRegion should SetNeedsCommit"" into klp-dev

    * commit '6fd053bb727424cdba15469c192d1cb8ec0ce055':
      Cherry-pick r218169 "cc: Layer::SetTouchEventHandlerRegion should SetNeedsCommit"

commit 01ed8b568cde08d63ea2369d17e047beb0b4a651
Merge: 5c47a22 2a82f7b
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Sep 25 08:11:27 2013 -0700

    am 2a82f7b6: Merge "Extend WebView useragent to mention Chrome version." into klp-dev

    * commit '2a82f7b6afb1a853945edd13f4c224aee0afdb93':
      Extend WebView useragent to mention Chrome version.

commit 5c47a220da80133b8eba0416c2924d81209ca6e2
Merge: 5a799df 7283965
Author: Ben Murdoch <benm@google.com>
Date:   Wed Sep 25 08:11:25 2013 -0700

    am 7283965d: Merge "Merge [Android] Inflate Select Action Bar from XML." into klp-dev

    * commit '7283965d90df8b6f72a5ff21380791e2dd972ebb':
      Merge [Android] Inflate Select Action Bar from XML.

commit 5a799dfa49e568bf85ed5ca2cc559d125db22e24
Merge: 99bccbd f265c47
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Sep 25 08:11:23 2013 -0700

    am f265c479: Record Chromium merge at DEPS revision 30.0.1599.61

    * commit 'f265c47927521085214ed8bbdd469582dc9af6ef':
      Record Chromium merge at DEPS revision 30.0.1599.61

commit 99bccbdbe1cdc4048aa8eedc77731935266872fc
Merge: d92bb20 cd5e610
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Sep 25 08:11:20 2013 -0700

    am cd5e6109: Merge from Chromium at DEPS revision 30.0.1599.61

    * commit 'cd5e610960f56ebe90672a265e596c5097594f65':
      Merge from Chromium at DEPS revision 30.0.1599.61

commit d92bb2054ee2fadcdf4de4938add208523d3cc30
Merge: 34ec37a c838ef4
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Sep 24 14:33:52 2013 -0700

    am c838ef4c: Merge "Further cleanup of shouldoverrideUrlloading change" into klp-dev

    * commit 'c838ef4ccec74c6514dac67c3c5fe4ba78b60610':
      Further cleanup of shouldoverrideUrlloading change

commit 34ec37a5d6dece1a84cafcc39e159ca8bcc8634f
Merge: cfaff75 06797e4
Author: Jonathan Dixon <joth@google.com>
Date:   Tue Sep 24 08:48:23 2013 -0700

    am 06797e42: Cherry-pick "Support URL fragment resolution againt non-hierarchical schemes"

    * commit '06797e4204bbdcbd3b7f455e312b54c656b4f6b2':
      Cherry-pick "Support URL fragment resolution againt non-hierarchical schemes"

commit cfaff75b37564acfc7b1931e47a2a5625217ccd9
Merge: 8a6c26d de1bd3e
Author: Jonathan Dixon <joth@google.com>
Date:   Tue Sep 24 08:48:20 2013 -0700

    am de1bd3eb: Cherry-pick "Preparing to support fragment resolution against non-hierarchical schemes"

    * commit 'de1bd3ebc0808574e846315a068b6935d3e72d5f':
      Cherry-pick "Preparing to support fragment resolution against non-hierarchical schemes"

commit 8a6c26d7a74f34a458d1c7a785a2689c4e93b131
Merge: 8b8015c e5b9a41
Author: Jonathan Dixon <joth@google.com>
Date:   Tue Sep 24 08:48:18 2013 -0700

    am e5b9a41b: Revert "Work-around for URL fragments resolving against about:blank"

    * commit 'e5b9a41b031181f3290329292e84a19acc979e52':
      Revert "Work-around for URL fragments resolving against about:blank"

commit 8b8015c8c4ae7787ac94196e91233c6706dc8c94
Merge: f57cbda 824b33e
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Sep 24 03:05:37 2013 -0700

    am 824b33ec: Record Chromium merge at DEPS revision 30.0.1599.58

    * commit '824b33ec54c36368d9d4da34eff7eef6542f3df7':
      Record Chromium merge at DEPS revision 30.0.1599.58

commit f57cbda30ad004513ae4fea065bcb0e28ec055f7
Merge: 45d098f c6a03b6
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Sep 24 03:05:34 2013 -0700

    am c6a03b66: Merge from Chromium at DEPS revision 30.0.1599.58

    * commit 'c6a03b665d27bf9b307170479657cbbf1b5bfe17':
      Merge from Chromium at DEPS revision 30.0.1599.58

commit 45d098f24bfb2417d772178d366d3f81f30d584b
Merge: 3668ddd 58efff2
Author: Alexandre Elias <aelias@google.com>
Date:   Mon Sep 23 19:41:08 2013 -0700

    am 58efff2e: Merge "[Android WebView] Wire up ignoreMainFrameOverflowHiddenQuirk." into klp-dev

    * commit '58efff2ea0c9395e850b762f2f0a25c920f925b3':
      [Android WebView] Wire up ignoreMainFrameOverflowHiddenQuirk.

commit 3668ddd309fc389c4f8d5cae1adbb617eb167f38
Merge: d706af7 5024ed2
Author: Selim Gurun <sgurun@google.com>
Date:   Mon Sep 23 19:00:57 2013 -0700

    am 5024ed27: Merge "Call onPageStarted and onPageFinished in a message on the UI thread" into klp-dev

    * commit '5024ed279c9dc5c90b543bacea8bd5d1766dc4f2':
      Call onPageStarted and onPageFinished in a message on the UI thread

commit d706af7f6ed7aa39a5ecd03fcc2e98420e5baac9
Merge: 5ae3c85 341c793
Author: Kristian Monsen <kristianm@google.com>
Date:   Mon Sep 23 19:00:27 2013 -0700

    am 341c7932: Merge "Allow all mixed content" into klp-dev

    * commit '341c793236359232d7626ec28ae9393eac2f5a70':
      Allow all mixed content

commit 5ae3c8516cb79162349f09ce6f7324673d18a0d1
Merge: 86cbe88 dd8a361
Author: Kristian Monsen <kristianm@google.com>
Date:   Mon Sep 23 18:59:19 2013 -0700

    am dd8a3616: Merge "Cherry-pick: Implement clearView to match classic" into klp-dev

    * commit 'dd8a3616cb66368eb531642a80aa39e6a356fa20':
      Cherry-pick: Implement clearView to match classic

commit 86cbe889d1abb833afe23108235761b12fb8475d
Merge: 314de3c b95ebc0
Author: Bo Liu <boliu@google.com>
Date:   Mon Sep 23 18:58:58 2013 -0700

    am b95ebc05: Merge "Cherry-pick: [Android WebView] Set initial visiblity" into klp-dev

    * commit 'b95ebc05b860fae4158722b8232ef0a3098a1d53':
      Cherry-pick: [Android WebView] Set initial visiblity

commit 314de3cf67d4748728cc7df9aa285041373ece15
Merge: f5470a9 4797c25
Author: Torne (Richard Coles) <torne@google.com>
Date:   Mon Sep 23 05:50:52 2013 -0700

    am 4797c25b: Record Chromium merge at DEPS revision 30.0.1599.56

    * commit '4797c25b2a114adb58f4ef6e45e404a036497152':
      Record Chromium merge at DEPS revision 30.0.1599.56

commit f5470a946947a68385b9a7839e4e04e28c8d971e
Merge: 17f9f06 810e1dd
Author: Torne (Richard Coles) <torne@google.com>
Date:   Mon Sep 23 05:50:45 2013 -0700

    am 810e1ddb: Merge from Chromium at DEPS revision 30.0.1599.56

    * commit '810e1ddbe56b57afdcdf66369cbed8e1ec967838':
      Merge from Chromium at DEPS revision 30.0.1599.56

commit 17f9f0687d41eddc1f9e48f7e584c702cbce82f2
Merge: e505483 63d0ac2
Author: Bo Liu <boliu@google.com>
Date:   Sat Sep 21 16:56:22 2013 -0700

    am 63d0ac2a: Chromium Fork: Increase URL length limit to 20MB

    * commit '63d0ac2aede27ad7d7414a87427221dadf8d859b':
      Chromium Fork: Increase URL length limit to 20MB

commit e505483fafd0659893d570bf555fd72fba0431ff
Merge: 090d69f 663642a
Author: Mikhail Naganov <mnaganov@google.com>
Date:   Fri Sep 20 20:44:23 2013 -0700

    am 663642a4: [Android WebView] Make web contents debugging controllable

    * commit '663642a4ae028fa80519079a6358042ecb4800f7':
      [Android WebView] Make web contents debugging controllable

commit 090d69f315cee10d16afcda921ca550e7982ae51
Merge: d4df036 01d3471
Author: Ben Murdoch <benm@google.com>
Date:   Fri Sep 20 16:42:57 2013 -0700

    am 01d3471d: Merge "Revert "[Android WebView] Make web contents debugging controllable"" into klp-dev

    * commit '01d3471d9dcf00aee75b1d9d298b779d831c5790':
      Revert "[Android WebView] Make web contents debugging controllable"

commit d4df0360d3941381ec3f8ee46a71e451ac6a691c
Merge: 20bc8ca 89c370b
Author: Ben Murdoch <benm@google.com>
Date:   Fri Sep 20 16:23:56 2013 -0700

    am 89c370b6: Merge "[Android WebView] Make web contents debugging controllable" into klp-dev

    * commit '89c370b6977ebe69965b441c896e3c94a7864547':
      [Android WebView] Make web contents debugging controllable

commit 20bc8ca030bda524333ea2cc01e8de36e31890c5
Merge: f4075cf dff2b32
Author: Jared Duke <jdduke@google.com>
Date:   Fri Sep 20 14:25:32 2013 -0700

    am dff2b325: Merge "Cherry-pick: Restrict the assumption that the OSK will trigger a resize" into klp-dev

    * commit 'dff2b3253b6f0868816d15d5f52b08e211585d9f':
      Cherry-pick: Restrict the assumption that the OSK will trigger a resize

commit f4075cfad1010c2237b4761ad529d401a2e13e18
Merge: eaafa0d 6685899
Author: Bo Liu <boliu@google.com>
Date:   Fri Sep 20 14:25:30 2013 -0700

    am 66858998: Merge "Cherry-pick: [Android WebView] Early out DrawGL if not attached to window" into klp-dev

    * commit '668589984e077f7c39f5491fc1d77fdb9690c693':
      Cherry-pick: [Android WebView] Early out DrawGL if not attached to window

commit eaafa0d88eaa34faea7e788f93c84752d8204528
Merge: d035f93 822f024
Author: Ben Murdoch <benm@google.com>
Date:   Fri Sep 20 10:47:18 2013 -0700

    am 822f024c: Merge "Cherry pick [Android] Decouple pausing video from RenderView pause." into klp-dev

    * commit '822f024cb97780a1aaaf4ee34f85696ce8083aa4':
      Cherry pick [Android] Decouple pausing video from RenderView pause.

commit d035f937b0470333701a8afdad177fb4b923baba
Merge: 39c3b54 0a8f47f
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Sep 19 19:17:46 2013 -0700

    am 0a8f47fb: Complete Sync shouldoverrideurlloading by cleaning code

    * commit '0a8f47fbce7f94803320e0340e8fe7855159e31a':
      Complete Sync shouldoverrideurlloading by cleaning code

commit 39c3b54c396ccda911426a7a92060771c1e70ae8
Merge: f0f53f6 77ceb71
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Sep 19 17:46:48 2013 -0700

    am 77ceb718: Implement ShouldOverrideUrlLoading using a Sync IPC

    * commit '77ceb7188d76b2f05feb0f0b0ee08a2d7a181d16':
      Implement ShouldOverrideUrlLoading using a Sync IPC

commit cede44592cfb9ec370925d10c2df733349a94a82
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Sep 19 22:36:53 2013 +0100

    Record Chromium merge at DEPS revision 224184

    This commit was generated by merge_to_master.py.

    Change-Id: If0316b08763d06801e3b33baadbf5b2e912fcd46

commit d0247b1b59f9c528cb6df88b4f2b9afaf80d181e
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Sep 19 22:36:51 2013 +0100

    Merge from Chromium at DEPS revision 224184

    This commit was generated by merge_to_master.py.

    Change-Id: Ia3424df5abed9bea642c522b9e2358dceabd8423

commit f0f53f65865861ccf7123d68109e1f70cb799ac9
Merge: a91609d 95ef9ff
Author: Primiano Tucci <primiano@google.com>
Date:   Thu Sep 19 10:52:54 2013 -0700

    am 95ef9ffb: Merge "Cherry-pick: [Android WebView] Make InputStreamImpl::Read fill the IOBuffer." into klp-dev

    * commit '95ef9ffb889b48ea23c6d69fbcadd030bf5d9961':
      Cherry-pick: [Android WebView] Make InputStreamImpl::Read fill the IOBuffer.

commit a91609d40aa0a9d2241a6855db90cff66dee1761
Merge: ec624b5 d28fd5b
Author: epenner@chromium.org <epenner@chromium.org@0039d316-1c4b-4281-b951-d872>
Date:   Thu Sep 19 10:49:30 2013 -0700

    am d28fd5bf: Cherry-pick: CC: Fix polling in sync compositor.

    * commit 'd28fd5bffa874f8f8d9661101e707f67b6f0c879':
      Cherry-pick: CC: Fix polling in sync compositor.

commit ec624b57407e73168abd7401ed348b1e64e0d0f6
Merge: 42e75ae 6b2e666
Author: Martin Kosiba <mkosiba@google.com>
Date:   Thu Sep 19 09:23:32 2013 -0700

    am 6b2e6666: [android_webview] Fix layout in AT_MOST mode.

    * commit '6b2e66668f5d1fb61bc2c766573bef8a2dd2bc70':
      [android_webview] Fix layout in AT_MOST mode.

commit 42e75ae68e7c91e765fdf43f57388366a50c06df
Merge: 7a42e8f 314c266
Author: Martin Kosiba <mkosiba@google.com>
Date:   Wed Sep 18 19:56:00 2013 -0700

    am 314c2667: Remove accidentally checked in spammy log from ContentViewCore.

    * commit '314c26674cfbacb5a47bf556f66f8ad51c3a8faa':
      Remove accidentally checked in spammy log from ContentViewCore.

commit 7a42e8fee27f90d3f360a24eeb8963b865f35d27
Merge: 830c012 1e34f59
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Sep 18 17:45:34 2013 -0700

    am 1e34f592: Record Chromium merge at DEPS revision 30.0.1599.50

    * commit '1e34f5927907084b1c396fec18f004b6748c5afa':
      Record Chromium merge at DEPS revision 30.0.1599.50

commit 830c0127aa518c2a2f4d324a9ca6ef895fefbafe
Merge: ffae626 4686f8b
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Sep 18 17:45:32 2013 -0700

    am 4686f8b2: Merge from Chromium at DEPS revision 30.0.1599.50

    * commit '4686f8b28a3a02b3943b29defafde045ca342ced':
      Merge from Chromium at DEPS revision 30.0.1599.50

commit ffae626fdeba479ec784fbd7d127c5cfb3ecb8cd
Merge: 6d91a64 ba732bd
Author: Martin Kosiba <mkosiba@google.com>
Date:   Wed Sep 18 16:28:35 2013 -0700

    am ba732bd5: Merge "[cherry-pick] Use contents size for android_webview layout size." into klp-dev

    * commit 'ba732bd572b31112fcf35a1b3b494383daabf90a':
      [cherry-pick] Use contents size for android_webview layout size.

commit 6d91a6476f7b828331a712dc987cb3da602776ef
Merge: 7c857d7 7a6d53f
Author: Tao Bai <michaelbai@google.com>
Date:   Wed Sep 18 15:18:26 2013 -0700

    am 7a6d53f1: Merge "Cherry-pick: [Android WebView] Make evaluateJavaScript return with no-op." into klp-dev

    * commit '7a6d53f1ab1766f450b0ed3c653fb903bc221f1f':
      Cherry-pick: [Android WebView] Make evaluateJavaScript return with no-op.

commit 7c857d7b30e7f0ac779ea9893f7306942c4e7b8f
Merge: 81e1380 53f28f4
Author: Selim Gurun <sgurun@google.com>
Date:   Wed Sep 18 12:40:15 2013 -0700

    am 53f28f4a: Merge "Cherry-pick: Reuse webview classic cookies file" into klp-dev

    * commit '53f28f4a44dea5bffcbddfff2830ea8542b4b755':
      Cherry-pick: Reuse webview classic cookies file

commit 81e13806e9ba74fa9941971a769fd7f9e3a08ee0
Merge: 58206f2 2c8786f
Author: Marcin Kosiba <mkosiba@google.com>
Date:   Wed Sep 18 12:07:45 2013 -0700

    am 2c8786fd: Merge "Cherry-pick: Defer scrolls until provided a valid content size" into klp-dev

    * commit '2c8786fde4b6064ed2662f02e8b7565ad8f69b9e':
      Cherry-pick: Defer scrolls until provided a valid content size

commit 58206f279c27869b2e5e452e116245d1842744e1
Merge: 4f1df81 97162f9
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Sep 18 12:00:58 2013 -0700

    am 97162f9b: Record Chromium merge at DEPS revision 30.0.1599.48

    * commit '97162f9b37915ad40bfd66ab09e1815decb2a644':
      Record Chromium merge at DEPS revision 30.0.1599.48

commit 4f1df8149f424e254d4c92ca0207949565cd8473
Merge: a94b51e b32343c
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Sep 18 12:00:56 2013 -0700

    am b32343c9: Merge from Chromium at DEPS revision 30.0.1599.48

    * commit 'b32343c9b70645bd3e272fe2a92d87e22bc2cca8':
      Merge from Chromium at DEPS revision 30.0.1599.48

commit a94b51e1e8ed4054de2c0d09a804310dc6e6bae5
Merge: 46f4ed8 652dfbe
Author: Ben Murdoch <benm@google.com>
Date:   Wed Sep 18 00:07:50 2013 -0700

    am 652dfbe8: Merge "Cherry pick of [Android] Update RenderWidgetHostView focus state on creation." into klp-dev

    * commit '652dfbe87329f7bdf2148f2633ba0698e802d861':
      Cherry pick of [Android] Update RenderWidgetHostView focus state on creation.

commit 46f4ed8af232e51cd81247b1db98dc945dfba14e
Merge: daac6be b82f98e
Author: cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d87>
Date:   Tue Sep 17 17:24:50 2013 -0700

    am b82f98ed: Cherry-pick: [Android] Fix vibrate on select text

    * commit 'b82f98ed67f72d8a3739d03c4c945bfe9426ef9f':
      Cherry-pick: [Android] Fix vibrate on select text

commit daac6bee4aca69fb3aaa4ee3da4c8f602afb4d9f
Merge: 167b7d9 2366fa9
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Sep 17 13:06:53 2013 -0700

    am 2366fa9d: Record Chromium merge at DEPS revision 30.0.1599.46

    * commit '2366fa9d0828f6d2bf1bfb9b67e77b28df18398b':
      Record Chromium merge at DEPS revision 30.0.1599.46

commit 167b7d97da782c46c3bbe6a9edb40c59f004886d
Merge: 322fa41 4d551d5
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Sep 17 13:06:51 2013 -0700

    am 4d551d56: Merge from Chromium at DEPS revision 30.0.1599.46

    * commit '4d551d56ad0f44a3bcc2b10614207fdae059b960':
      Merge from Chromium at DEPS revision 30.0.1599.46

commit 322fa4191450050699fc8d93d782e1c50f351b75
Merge: 789a4d4 4f6117d
Author: Jonathan Dixon <joth@google.com>
Date:   Tue Sep 17 12:44:46 2013 -0700

    am 4f6117de: Merge "Work-around for URL fragments resolving against about:blank" into klp-dev

    * commit '4f6117de31af6a6080786ddc6c03e9cb41a8c0c9':
      Work-around for URL fragments resolving against about:blank

commit 789a4d4f798934d0615621923564fff09d30776c
Merge: 2e24b77 30c9e02
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Sep 17 10:27:50 2013 -0700

    am 30c9e02f: Record Chromium merge at DEPS revision 30.0.1599.44

    * commit '30c9e02fa40e1ad2b19710dd5e309d5a37ce0c9b':
      Record Chromium merge at DEPS revision 30.0.1599.44

commit 2e24b775f0cb8738d0fd0ba797f876226f1993b2
Merge: cd63ffd 4c53377
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Sep 17 10:27:47 2013 -0700

    am 4c533772: Merge from Chromium at DEPS revision 30.0.1599.44

    * commit '4c5337722b0050dc1a8f04eaa6e8dcdb69c14334':
      Merge from Chromium at DEPS revision 30.0.1599.44

commit cd63ffd5512aa1caad20bcc822e87422b6e55573
Merge: eb3fbf9 c42723f
Author: Primiano Tucci <primiano@google.com>
Date:   Mon Sep 16 17:19:43 2013 -0700

    am c42723f8: Merge "Cherry-pick: [Android WebView] Pass absolute URL to requestFocusNodeHref." into klp-dev

    * commit 'c42723f8dcfa6ca4d8dfeca2a687417b66a9a9c4':
      Cherry-pick: [Android WebView] Pass absolute URL to requestFocusNodeHref.

commit eb3fbf94ee9b5084e4b1385eeb3129fbd441d63f
Merge: 6cb9026 845ed6b
Author: Torne (Richard Coles) <torne@google.com>
Date:   Mon Sep 16 15:39:48 2013 -0700

    am 845ed6b2: Minimise logging/tracing in release builds.

    * commit '845ed6b237087326efa8302fe2b3384aa65b1212':
      Minimise logging/tracing in release builds.

commit 6cb9026e1e0054bb89316320040a5d1382d61fcc
Merge: 44655c4 ebaa810
Author: Torne (Richard Coles) <torne@google.com>
Date:   Mon Sep 16 12:37:55 2013 -0700

    am ebaa8109: Record Chromium merge at DEPS revision 30.0.1599.41

    * commit 'ebaa81098a62149c027a4c120769867b9c7f3cf4':
      Record Chromium merge at DEPS revision 30.0.1599.41

commit 44655c402df3988d6737ac99764bff68d4242868
Merge: c3fb693 f7530a7
Author: Torne (Richard Coles) <torne@google.com>
Date:   Mon Sep 16 12:37:54 2013 -0700

    am f7530a7a: Merge from Chromium at DEPS revision 30.0.1599.41

    * commit 'f7530a7a2b0c81a081d469940714dcf4d3f2505e':
      Merge from Chromium at DEPS revision 30.0.1599.41

commit c3fb69360bc456eb3757d419d066000a316f75fe
Merge: ce3807e ed1701e
Author: Jonathan Dixon <joth@google.com>
Date:   Sun Sep 15 20:08:56 2013 -0700

    am ed1701ee: Merge "Cherry-pick Add CONTENT_EXPORT to some swtiches needed for WebView" into klp-dev

    * commit 'ed1701ee79a7744de87155c76ecafb87dcc62653':
      Cherry-pick Add CONTENT_EXPORT to some swtiches needed for WebView

commit ce3807e2ad47f4b6d1f2d1890c5074a648f563f2
Merge: 064b682 690201e
Author: Qiwen Zhao <zhao@google.com>
Date:   Sun Sep 15 20:02:17 2013 -0700

    am 690201eb: Revert "Revert "Downstream Workaround for Qualcomm Bug 10205015""

    * commit '690201eb9854b589e6151bf802e50262a392a3d3':
      Revert "Revert "Downstream Workaround for Qualcomm Bug 10205015""

commit 064b68268088d94b50b2ed2b427c66ae022ddfcb
Merge: c39220b 6607c8f
Author: Martin Kosiba <mkosiba@google.com>
Date:   Sun Sep 15 19:54:34 2013 -0700

    am 6607c8fe: Merge "Cherry-pick http://crrev.com/23478022" into klp-dev

    * commit '6607c8fed94169dc3e4b93b9a0287b71da8f5e8a':
      Cherry-pick http://crrev.com/23478022

commit c39220b5dad683109b13f1bffe1362316ea6def0
Merge: 2306930 0c3a0d0
Author: Qiwen Zhao <zhao@google.com>
Date:   Sun Sep 15 19:54:32 2013 -0700

    am 0c3a0d0c: Merge "Revert "Downstream Workaround for Qualcomm Bug 10205015"" into klp-dev

    * commit '0c3a0d0cf8ac86d4f4ca90dad425358c5a10cfbe':
      Revert "Downstream Workaround for Qualcomm Bug 10205015"

commit 230693084d7c0a56a4ed9c4bed3a04006531adfe
Merge: 376e230 406a4f8
Author: Martin Kosiba <mkosiba@google.com>
Date:   Sun Sep 15 19:45:49 2013 -0700

    am 406a4f85: Merge "Revert "Patch in http://crrev.com/22903029"" into klp-dev

    * commit '406a4f852bddf83975718a1e4fbbec8904f5e66c':
      Revert "Patch in http://crrev.com/22903029"

commit 376e2305b2f4a2fe97e6204b22e906445aac830f
Merge: 3cda62b 85b0a63
Author: Kristian Monsen <kristianm@google.com>
Date:   Sun Sep 15 18:33:52 2013 -0700

    am 85b0a633: Merge "Cherry-pick: Adding a getter for base url" into klp-dev

    * commit '85b0a633a8568fba6f4fc81d56dcc0d9e952486a':
      Cherry-pick: Adding a getter for base url

commit 3cda62b3fc1a8f355be972b91260c8356987c0c5
Merge: c340736 66cb5b9
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Sun Sep 15 13:09:38 2013 -0700

    am 66cb5b9b: Cherry-pick: [Android WebView] Match chrome font settings

    * commit '66cb5b9b21b9e7a3ad902333b276cada24fbceb3':
      Cherry-pick: [Android WebView] Match chrome font settings

commit c3407362bf564bbc420df88d3c4e452d83d0109c
Merge: e3b2fd2 99f7c4a
Author: boliu@chromium.org <boliu@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Sat Sep 14 11:16:45 2013 -0700

    am 99f7c4a5: Cherry-pick: [Android WebView] Do not interfere with requests after destroy

    * commit '99f7c4a593b7d80fbb6d61c46de477f48bd137ed':
      Cherry-pick: [Android WebView] Do not interfere with requests after destroy

commit e3b2fd29ad75262ac1835008f9759d7a56b1def2
Merge: b490545 adbec73
Author: Bo Liu <boliu@google.com>
Date:   Fri Sep 13 17:14:41 2013 -0700

    am adbec73f: Merge "Cherry-pick: [Android WebView] First cut memory management" into klp-dev

    * commit 'adbec73fbcc003fbfe001892a2937f5c677213b4':
      Cherry-pick: [Android WebView] First cut memory management

commit b4905453ecaa67fe77347025249f32ad4800cba5
Merge: a9859a9 b2ce313
Author: brianderson@chromium.org <brianderson@chromium.org@0039d316-1c4b-4281-b951->
Date:   Fri Sep 13 17:14:18 2013 -0700

    am b2ce3138: Cherry-pick: cc: Poll for state that triggers draws (synchronous compositor only)

    * commit 'b2ce3138cd0d9813fd7196e3aa78ce90d29b6368':
      Cherry-pick: cc: Poll for state that triggers draws (synchronous compositor only)

commit a9859a9206f252fdafe1a5c115687cb9b1aa70dc
Merge: 910024f 4ce9541
Author: Torne (Richard Coles) <torne@google.com>
Date:   Fri Sep 13 13:20:08 2013 -0700

    am 4ce95411: Record Chromium merge at DEPS revision 30.0.1599.40

    * commit '4ce95411a0a4ad8d03edcb6c31529de17016c7dc':
      Record Chromium merge at DEPS revision 30.0.1599.40

commit 910024f4f83da230dd8d7b028733aa6357b7729c
Merge: c6fec18 0f5d368
Author: Torne (Richard Coles) <torne@google.com>
Date:   Fri Sep 13 13:20:05 2013 -0700

    am 0f5d3685: Merge from Chromium at DEPS revision 30.0.1599.40

    * commit '0f5d3685b7a827596ac694c0b9e29b9ace5e7ef2':
      Merge from Chromium at DEPS revision 30.0.1599.40

commit c6fec187bd39dfd14ff5f524882eca8831f0c11d
Merge: 818590d 5825184
Author: Svetoslav <svetoslavganov@google.com>
Date:   Thu Sep 12 21:37:41 2013 -0700

    am 58251847: Update AwPrintDocumentAdapter due to API changes

    * commit '58251847c017e39855226d3c125df2487208cc07':
      Update AwPrintDocumentAdapter due to API changes

commit 818590d5541b252166813b4a3bea6ec0a4cd104a
Merge: cd33f03 9e24fc0
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Sep 12 21:36:59 2013 -0700

    am 9e24fc07: Merge "Reflect printAPI changes." into klp-dev

    * commit '9e24fc0754463786f91d25485aebf991601c021f':
      Reflect printAPI changes.

commit cd33f03b17807fce0d73248fe14dd679a89fa999
Merge: acdcd9e 4c87edc
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Sep 12 11:45:42 2013 -0700

    am 4c87edc0: Merge "Cherry-pick "Switch AwPixelInfo to wrap SkCanvasLayerState"" into klp-dev

    * commit '4c87edc050e2fa04c8451ada680a39b8b46ebed1':
      Cherry-pick "Switch AwPixelInfo to wrap SkCanvasLayerState"

commit acdcd9e382e0391dcf3b413ba8156503ea2b4acc
Merge: 91c1b4d 05375ba
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Sep 12 09:16:43 2013 -0700

    am 05375ba3: Record Chromium merge at DEPS revision 30.0.1599.39

    * commit '05375ba3f38bf1a36e0aff649784874c2a638a61':
      Record Chromium merge at DEPS revision 30.0.1599.39

commit 91c1b4d3ecd26e5fc4e1d8802226095415a8ae98
Merge: ca8cc12 389f891
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Sep 12 09:16:42 2013 -0700

    am 389f8918: Merge from Chromium at DEPS revision 30.0.1599.39

    * commit '389f89184187a18e6314d543397f72960e900659':
      Merge from Chromium at DEPS revision 30.0.1599.39

commit f7571f5f07547e2f3e0addf48d1f2a7ec3632957
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Sep 12 12:10:25 2013 +0100

    Record Chromium merge at DEPS revision 222756

    This commit was generated by merge_to_master.py.

    Change-Id: I82faf1db865b5990abeaf253d128bd846c305e71

commit 58537e28ecd584eab876aee8be7156509866d23a
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Sep 12 12:10:22 2013 +0100

    Merge from Chromium at DEPS revision 222756

    This commit was generated by merge_to_master.py.

    Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e

commit ca8cc127386a08e0bae9cd0c39f42b78eef09a41
Merge: bc4b00f 6053403
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Sep 11 04:12:38 2013 -0700

    am 60534036: Record Chromium merge at DEPS revision 30.0.1599.38

    * commit '60534036bfd190fb2f74172c3a43099d7c50888a':
      Record Chromium merge at DEPS revision 30.0.1599.38

commit bc4b00f23371fe42ce2de775add7402e0b2579da
Merge: 45f6dbb bffa568
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Sep 11 04:12:37 2013 -0700

    am bffa5683: Merge from Chromium at DEPS revision 30.0.1599.38

    * commit 'bffa56837bb88af19413f59d410b5854f3dd01c3':
      Merge from Chromium at DEPS revision 30.0.1599.38

commit 45f6dbb333fcb5a8cf7782b04c58e303aabeb5af
Merge: 785b89e f76851f
Author: Ben Murdoch <benm@google.com>
Date:   Wed Sep 11 03:08:58 2013 -0700

    am f76851f0: Merge "Cherry pick from upstream Chromium to ease merge from M30." into klp-dev

    * commit 'f76851f04911c4cf95028939f6071c7917c76d6f':
      Cherry pick from upstream Chromium to ease merge from M30.

commit 785b89eb7bd6405e41a6571a826b6b74bc156f39
Merge: 49da357 cbc64c0
Author: Kristian Monsen <kristianm@google.com>
Date:   Tue Sep 10 15:32:17 2013 -0700

    am cbc64c0b: Manual cherry-pick of https://codereview.chromium.org/23623020

    * commit 'cbc64c0be3b310fda39ba08409e70f94954e19c8':
      Manual cherry-pick of https://codereview.chromium.org/23623020

commit 49da3570487056b7d8f654e66fb6aee06d18d4e2
Merge: 3e7d576 06a2785
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Sep 10 01:55:02 2013 -0700

    am 06a27858: Record Chromium merge at DEPS revision 30.0.1599.36

    * commit '06a2785875a3a088f5e49861dbcd42a3aff4258d':
      Record Chromium merge at DEPS revision 30.0.1599.36

commit 3e7d576b4c045d018f310775b4c44a122465d44d
Merge: a1b174f 76ea596
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Sep 10 01:54:59 2013 -0700

    am 76ea5963: Merge from Chromium at DEPS revision 30.0.1599.36

    * commit '76ea5963b934569e221bccdb339c95301a7a7440':
      Merge from Chromium at DEPS revision 30.0.1599.36

commit a1b174fd4524f22aca122665477d20498e5ce776
Merge: 19e1d71 5d58f32
Author: Torne (Richard Coles) <torne@google.com>
Date:   Mon Sep 9 06:03:45 2013 -0700

    am 5d58f322: Record Chromium merge at DEPS revision 30.0.1599.35

    * commit '5d58f322b0fdc3b2940b7626872ed7d8f31740ca':
      Record Chromium merge at DEPS revision 30.0.1599.35

commit 19e1d71dd8b91222d4b21436a8e76f2dad73b1dc
Merge: 74a0652 4d47668
Author: Torne (Richard Coles) <torne@google.com>
Date:   Mon Sep 9 06:03:43 2013 -0700

    am 4d476689: Merge from Chromium at DEPS revision 30.0.1599.35

    * commit '4d476689bb589148ddf278a6fe754e4a1c44a04f':
      Merge from Chromium at DEPS revision 30.0.1599.35

commit 74a0652415c8995343ee3bf70551cbb4229d039e
Merge: 3263682 c37b93f
Author: Bo Liu <boliu@google.com>
Date:   Sun Sep 8 12:44:29 2013 -0700

    am c37b93fe: Merge "Cherry-pick: Fix video in software mode" into klp-dev

    * commit 'c37b93feb04c7bbd8189355d9cc2d54b5430eb12':
      Cherry-pick: Fix video in software mode

commit 326368202f71405f01751a6e151c5f1219c5bba4
Merge: dc5582b a02260b
Author: Jonathan Dixon <joth@google.com>
Date:   Fri Sep 6 15:33:55 2013 -0700

    am a02260b3: Merge "Cherry-pick "Send Android accessibility "content changed" event for any change"" into klp-dev

    * commit 'a02260b357ae16877b65d044f139069c86898d58':
      Cherry-pick "Send Android accessibility "content changed" event for any change"

commit dc5582bd1a2b771b38c28c0d86e4135bf51b07f7
Merge: 0e70f44 162276c
Author: Torne (Richard Coles) <torne@google.com>
Date:   Fri Sep 6 09:36:03 2013 -0700

    am 162276c9: Record Chromium merge at DEPS revision 30.0.1599.32

    * commit '162276c993c405176e1f486c44463a86eb38e693':
      Record Chromium merge at DEPS revision 30.0.1599.32

commit 0e70f44e07596a1c29d274f8b4d8fc7d3c98261b
Merge: cd7901b 7879b4e
Author: Torne (Richard Coles) <torne@google.com>
Date:   Fri Sep 6 09:36:00 2013 -0700

    am 7879b4e3: Merge from Chromium at DEPS revision 30.0.1599.32

    * commit '7879b4e35bc0616056661d21ed48d28e6cecd0a0':
      Merge from Chromium at DEPS revision 30.0.1599.32

commit cd7901b506298d1eed0128d796d22781f1f60eab
Merge: 79fa022 3dff3ed
Author: Torne (Richard Coles) <torne@google.com>
Date:   Fri Sep 6 08:35:29 2013 -0700

    am 3dff3ed7: Disable fatal linker warnings on x86.

    * commit '3dff3ed757013f499bb2dcd83c4f3667c6ed443e':
      Disable fatal linker warnings on x86.

commit 79fa022f72445ac8a0414a6fd7ef2dc14447d95c
Merge: f2372de 819cc77
Author: Ben Murdoch <benm@google.com>
Date:   Fri Sep 6 02:22:03 2013 -0700

    am 819cc77b: Merge "Cherry pick https://chromiumcodereview.appspot.com/23503020 PS3" into klp-dev

    * commit '819cc77bacfd1ed31ef5e7c514c1e61394f8c571':
      Cherry pick https://chromiumcodereview.appspot.com/23503020 PS3

commit f2372de962e3400f1fa0a04d792198aa993e8d57
Merge: 62284fb b25cc19
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Sep 5 09:48:44 2013 -0700

    am b25cc192: Record Chromium merge at DEPS revision 30.0.1599.31

    * commit 'b25cc192032bec93d7d029ea5714605478d983b8':
      Record Chromium merge at DEPS revision 30.0.1599.31

commit 62284fbea6499c89a3cc765d1fcce1c01dbc86a0
Merge: 3d371e7 13a64a3
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Sep 5 09:48:42 2013 -0700

    am 13a64a3c: Merge from Chromium at DEPS revision 30.0.1599.31

    * commit '13a64a3c22259028b75c5b293d2eaed26080c490':
      Merge from Chromium at DEPS revision 30.0.1599.31

commit 3d371e7417ab667bba5f1e0b4bda1e488fd08999
Merge: f83341f e1f7496
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Sep 4 05:05:52 2013 -0700

    am e1f7496c: Record Chromium merge at DEPS revision 30.0.1599.30

    * commit 'e1f7496c3c11ddb4cf1a28a7cd618da11008982a':
      Record Chromium merge at DEPS revision 30.0.1599.30

commit f83341f3ef47f88cbe8dad68e7b4c2b60c5d1634
Merge: 02cca2a eee4ebd
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Sep 4 05:05:49 2013 -0700

    am eee4ebda: Merge from Chromium at DEPS revision 30.0.1599.30

    * commit 'eee4ebda36ebfcb751dd752751c071ef22e33b33':
      Merge from Chromium at DEPS revision 30.0.1599.30

commit 02cca2a5d49fe348a4b5cfb209fbdd5c42fa0b77
Merge: 4173ac8 bbcd892
Author: Torne (Richard Coles) <torne@google.com>
Date:   Mon Sep 2 03:31:36 2013 -0700

    am bbcd8928: Record Chromium merge at DEPS revision 30.0.1599.26

    * commit 'bbcd89285585caf04c0adc6b3b3b9c058d2864a5':
      Record Chromium merge at DEPS revision 30.0.1599.26

commit 4173ac81fcc999936f8900fe30eb9c921a8d4a35
Merge: 39cae7d 6594c20
Author: Torne (Richard Coles) <torne@google.com>
Date:   Mon Sep 2 03:31:32 2013 -0700

    am 6594c208: Merge from Chromium at DEPS revision 30.0.1599.26

    * commit '6594c20851cf76932a014f0efe01d79c6ba6eed1':
      Merge from Chromium at DEPS revision 30.0.1599.26

commit 39cae7d0074d779eb3fbf136405aeb91593a72de
Merge: 7eec145 a0ac924
Author: Selim Gurun <sgurun@google.com>
Date:   Fri Aug 30 14:05:19 2013 -0700

    am a0ac9246: Merge "Do not close file descriptor." into klp-dev

    * commit 'a0ac92460f9ade728cedb5693a34068d4aa2e46e':
      Do not close file descriptor.

commit 7eec145f8f70b47c9436e7a2fafbc6e48f1ad630
Merge: 01e5f22 7ba7d82
Author: Selim Gurun <sgurun@google.com>
Date:   Fri Aug 30 10:19:42 2013 -0700

    am 7ba7d829: Merge "The generated makefiles for printing" into klp-dev

    * commit '7ba7d829bd114f49f7225775972cdaf7c8992949':
      The generated makefiles for printing

commit 01e5f224b6f9feee225129a9d8779318d04422d7
Merge: 6140769 8e502b6
Author: Selim Gurun <sgurun@google.com>
Date:   Fri Aug 30 10:12:43 2013 -0700

    am 8e502b6b: Merge "Printing changes for page layout" into klp-dev

    * commit '8e502b6b4304d7e73f45e488c4824ea91782ff16':
      Printing changes for page layout

commit 614076957dd4936395ef4816c2a509bece9716c8
Merge: 198cc94 af85e71
Author: Selim Gurun <sgurun@google.com>
Date:   Fri Aug 30 10:12:42 2013 -0700

    am af85e71a: Merge "Copied files from chrome to android." into klp-dev

    * commit 'af85e71a16545efd27b33233f4bd2420d43b271b':
      Copied files from chrome to android.

commit 0a1b11dee8e5cb2520121c300858fea6138e3c54
Author: Torne (Richard Coles) <torne@google.com>
Date:   Fri Aug 30 15:14:51 2013 +0100

    Record Chromium merge at DEPS revision r220549

    This commit was generated by merge_to_master.py.

    Change-Id: If5a6d4dc91ff46bb9f4b8284df732c3ccbbaa5d7

commit 424c4d7b64af9d0d8fd9624f381f469654d5e3d2
Author: Torne (Richard Coles) <torne@google.com>
Date:   Fri Aug 30 15:14:49 2013 +0100

    Merge from Chromium at DEPS revision r220549

    This commit was generated by merge_to_master.py.

    Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9

commit 198cc940b7bad75b71073359cbcd378fa840e40c
Merge: 6c5c364 86e43a2
Author: Torne (Richard Coles) <torne@google.com>
Date:   Fri Aug 30 03:45:15 2013 -0700

    am 86e43a2a: Record Chromium merge at DEPS revision 30.0.1599.25

    * commit '86e43a2a4cdb3da88d99e7956c5ede4226adb504':
      Record Chromium merge at DEPS revision 30.0.1599.25

commit 6c5c364db3d80a3853a946135bc0d5541e08730f
Merge: 1411513 5db5c4e
Author: Torne (Richard Coles) <torne@google.com>
Date:   Fri Aug 30 03:45:13 2013 -0700

    am 5db5c4ec: Merge from Chromium at DEPS revision 30.0.1599.25

    * commit '5db5c4ec98571177cc4dec6df1ad33269f632543':
      Merge from Chromium at DEPS revision 30.0.1599.25

commit 1411513211b2852a3bcce0cf88a087d084de27b2
Merge: 42914c6 e0b60a7
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Aug 29 03:50:14 2013 -0700

    am e0b60a77: Record Chromium merge at DEPS revision 30.0.1599.24

    * commit 'e0b60a777766c8d2c7b09c912b2dff192f6cb8fa':
      Record Chromium merge at DEPS revision 30.0.1599.24

commit 42914c69443234f3a99478bcc78ceddb8556d622
Merge: 9b734c0 bfebf9c
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Aug 29 03:50:12 2013 -0700

    am bfebf9c5: Merge from Chromium at DEPS revision 30.0.1599.24

    * commit 'bfebf9c5f0206a13e1fdcf6343cc432a1d5fe776':
      Merge from Chromium at DEPS revision 30.0.1599.24

commit 9b734c0d9ace4105eb274d249a702ce04b02aec3
Merge: 55d7d3a 3b557aa
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Aug 28 04:46:20 2013 -0700

    am 3b557aa7: Record Chromium merge at DEPS revision 30.0.1599.23

    * commit '3b557aa707c327d76640e4503adc67de00ef80ef':
      Record Chromium merge at DEPS revision 30.0.1599.23

commit 55d7d3ae5171b793dc952dae590189c30ff4ead1
Merge: d2e5f2b 6bda25f
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Aug 28 04:46:19 2013 -0700

    am 6bda25ff: Merge from Chromium at DEPS revision 30.0.1599.23

    * commit '6bda25ffe15103e73b1811c624157f45962839de':
      Merge from Chromium at DEPS revision 30.0.1599.23

commit d2e5f2be683482718d7bc9adadf5bed038828dde
Merge: 7c18d97 bdacb80
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Aug 27 03:46:15 2013 -0700

    am bdacb801: Record Chromium merge at DEPS revision 30.0.1599.21

    * commit 'bdacb801f880b53c3a75d687a919a7c6e7d4bcf6':
      Record Chromium merge at DEPS revision 30.0.1599.21

commit 7c18d9772a29d31f8d9346dee1530891e4a8cf6b
Merge: 6b20965 1347ae4
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Aug 27 03:46:13 2013 -0700

    am 1347ae41: Merge from Chromium at DEPS revision 30.0.1599.21

    * commit '1347ae41cdcd6a32dafcda3a178e53b6d8e88f2c':
      Merge from Chromium at DEPS revision 30.0.1599.21

commit 6b2096584301a160de633de9f93e7d16998c8671
Merge: 67e16c2 4dc0716
Author: Bo Liu <boliu@google.com>
Date:   Mon Aug 26 15:04:48 2013 -0700

    am 4dc0716f: Merge "Cherry-pick "Use visible rect instead of clip to make tile management decisions."" into klp-dev

    * commit '4dc0716fc1d8ecc2b9ca11e523880525af2a6674':
      Cherry-pick "Use visible rect instead of clip to make tile management decisions."

commit 67e16c2f03dec6f72e1315c8dc2b0a9bef5ef79f
Merge: 13bea18 7c68f9d
Author: Bo Liu <boliu@google.com>
Date:   Mon Aug 26 15:04:05 2013 -0700

    am 7c68f9d6: Cherry-pick of https://codereview.chromium.org/22887048/

    * commit '7c68f9d6a6730f159e9598ee26c0f40c7f7542be':
      Cherry-pick of https://codereview.chromium.org/22887048/

commit 13bea18db20438df607ff65640ef4096d6709e8d
Merge: a150018 cbed202
Author: Martin Kosiba <mkosiba@google.com>
Date:   Mon Aug 26 15:01:16 2013 -0700

    am cbed202c: Patch in http://crrev.com/22903029

    * commit 'cbed202c2db561056f0a509ecdc209bfb003c29b':
      Patch in http://crrev.com/22903029

commit c70ef2906f891fe7d218980660e4cda465717916
Author: Torne (Richard Coles) <torne@google.com>
Date:   Fri Aug 23 16:39:18 2013 +0100

    Record Chromium merge at DEPS revision r219274

    This commit was generated by merge_to_master.py.

    Change-Id: I5b1b38cb659856d7aa18a2d8b5624ac5dc397b44

commit 3551c9c881056c480085172ff9840cab31610854
Author: Torne (Richard Coles) <torne@google.com>
Date:   Fri Aug 23 16:39:15 2013 +0100

    Merge from Chromium at DEPS revision r219274

    This commit was generated by merge_to_master.py.

    Change-Id: Ibb7f41396cadf4071e89153e1913c986d126f65d

commit a1500182ef173da0763fca56af9d217558fc2e5a
Merge: 919ca23 b0c7a65
Author: Torne (Richard Coles) <torne@google.com>
Date:   Fri Aug 23 03:38:21 2013 -0700

    am b0c7a653: Record Chromium merge at DEPS revision 30.0.1599.18

    * commit 'b0c7a653e58dc6df667b21156a3333c9621354c5':
      Record Chromium merge at DEPS revision 30.0.1599.18

commit 919ca238fba1debe2cc5875dd29e4701cd323f85
Merge: bb0fb54 68dded9
Author: Torne (Richard Coles) <torne@google.com>
Date:   Fri Aug 23 03:38:18 2013 -0700

    am 68dded96: Merge from Chromium at DEPS revision 30.0.1599.18

    * commit '68dded969729681d695306eb2b5a6e13c4f06498':
      Merge from Chromium at DEPS revision 30.0.1599.18

commit bb0fb54985af2587cabab426e518d62785395983
Merge: 662d111 fc0b34a
Author: Selim Gurun <sgurun@google.com>
Date:   Thu Aug 22 20:32:58 2013 -0700

    am fc0b34a8: Merge "Fix crash due to a null pointer." into klp-dev

    * commit 'fc0b34a8b1ee0bac5bffe18a6bd743007167727c':
      Fix crash due to a null pointer.

commit 662d1116999c3a2595364b2bac16a567cd5b90d2
Merge: 88572eb 40f22e4
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Aug 22 12:20:14 2013 -0700

    am 40f22e4d: Merge "Patch in https://codereview.chromium.org/23018005/" into klp-dev

    * commit '40f22e4d6919a45ce6a861184431309ba13d4958':
      Patch in https://codereview.chromium.org/23018005/

commit 88572eb6979a377d3b2450bbc5b42a53038a6d62
Merge: 529ec0d 8df386a
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Aug 22 04:58:45 2013 -0700

    am 8df386a7: Patch in https://codereview.chromium.org/23060021

    * commit '8df386a7f401e6e94b362e4d095699e14dc0a644':
      Patch in https://codereview.chromium.org/23060021

commit 529ec0dfd8a452ae0cbe4d33870a7869220b34fa
Merge: 84e2bde a2c6a87
Author: Ben Murdoch <benm@google.com>
Date:   Thu Aug 22 04:50:15 2013 -0700

    am a2c6a870: Merge changes I2a5e86ed,Ib2f598c0 into klp-dev

    * commit 'a2c6a8706246c1ab9529db64aebf193ea23261ad':
      Patch in https://codereview.chromium.org/23234003
      patch in https://codereview.chromium.org/23072008

commit 84e2bdec1d6cd92ea22167d6ee5d951e58f81c7a
Merge: 4744388 22a04df
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Aug 22 04:44:45 2013 -0700

    am 22a04df7: Record Chromium merge at DEPS revision 30.0.1599.16

    * commit '22a04df71a9a6564db99156a1605810f837ee165':
      Record Chromium merge at DEPS revision 30.0.1599.16

commit 47443886bc0409da89a082b63b7b053753befbbb
Merge: 40ed7f5 f3ce491
Author: Torne (Richard Coles) <torne@google.com>
Date:   Thu Aug 22 04:44:43 2013 -0700

    am f3ce491c: Merge from Chromium at DEPS revision 30.0.1599.16

    * commit 'f3ce491c3623b9924dccab3703a43e03157e988a':
      Merge from Chromium at DEPS revision 30.0.1599.16

commit 40ed7f533c3f89d5c62e2e998c24b7c20a1134e7
Merge: 018bafa d6abc66
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Aug 21 03:00:05 2013 -0700

    am d6abc66f: Record Chromium merge at DEPS revision 30.0.1599.14

    * commit 'd6abc66f79bf9f8ee189e80aad7acf69535650c5':
      Record Chromium merge at DEPS revision 30.0.1599.14

commit 018bafae36f434d09b4ed8c14e7765428bc75e28
Merge: ae4c3c7 7c720b7
Author: Torne (Richard Coles) <torne@google.com>
Date:   Wed Aug 21 03:00:02 2013 -0700

    am 7c720b74: Merge from Chromium at DEPS revision 30.0.1599.14

    * commit '7c720b7466665b17575e0fd6976f9321c6bff489':
      Merge from Chromium at DEPS revision 30.0.1599.14

commit ae4c3c7d0d170d545ae67059f4f312743997b137
Merge: 90874f1 1af4903
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Aug 20 16:46:22 2013 -0700

    am 1af4903a: Fix build for mac.

    * commit '1af4903a31e040cf65e23f429f14ef1ee857a52a':
      Fix build for mac.

commit 90874f1e3e9de2e74ede4317d5db8bde4f8321ec
Merge: da3e673 be2b67a
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Aug 20 16:13:19 2013 -0700

    am be2b67ad: Fix broken build due to files ignored by git

    * commit 'be2b67ad05bfde6a179b51be143d1abe0c294db8':
      Fix broken build due to files ignored by git

commit da3e6738ede4ab2dd687854f172ce1e2b29e1348
Merge: dcf1fc2 5d5be6d
Author: Selim Gurun <sgurun@google.com>
Date:   Tue Aug 20 15:44:41 2013 -0700

    am 5d5be6dc: A first cut to printing.

    * commit '5d5be6dc8a24d729a037d5b76e0d1fa711ece471':
      A first cut to printing.

commit dcf1fc2bdf13e112928f76746892fa3669e9aa06
Merge: 546f35a 1ec4546
Author: Torne (Richard Coles) <torne@google.com>
Date:   Tue Aug 20 05:20:40 2013 -0700

    am 1ec45469: Enable use_system_skia.

    * commit '1ec45469dfb6c95f1341f572461043760c6eee5f':
      Enable use_system_skia.

commit 546f35a7e3d14348577eb1f0839a63e0f0f8a8eb
Merge: c757c3e 678c483
Author: torne@chromium.org <torne@chromium.org@0039d316-1c4b-4281-b951-d872f2>
Date:   Tue Aug 20 05:20:37 2013 -0700

    am 678c4834: Cherrypick r218021: Android WebView: build fixes for use_system_skia.

    * commit '678c4834910532646cef5bdf036973f8f3df8970':
      Cherrypick r218021: Android WebView: build fixes for use_system_skia.

commit c757c3e14c5e9a448264d940ab1c7618ecd43102
Merge: 30ed19a 8349e63
Author: The Android Open Source Project <initial-contribution@android.com>
Date:   Wed Aug 14 15:10:05 2013 -0700

    Reconcile with klp-release - do not merge

    Change-Id: Iac2a86adb3d67a8a59f6301e3852fdcf6c5934fe

commit 4e9d9adbbb6cf287125ca44a0823791a570472f5
Author: Ben Murdoch <benm@google.com>
Date:   Wed Aug 14 11:51:44 2013 +0100

    Record Chromium merge at DEPS revision r217147

    This commit was generated by merge_to_master.py.

    Change-Id: I3fc64b7017ad4aae1aaacf4b4e8b436f29c22c84

commit c2db58bd994c04d98e4ee2cd7565b71548655fe3
Author: Ben Murdoch <benm@google.com>
Date:   Wed Aug 14 11:51:42 2013 +0100

    Merge from Chromium at DEPS revision r217147

    This commit was generated by merge_to_master.py.

    Change-Id: Ifa927da4997e49ab95edfc5def5ee5615a76b1be

commit fc9d5208680b35b576f64623b0e38c14bc0e97dd
Author: Ben Murdoch <benm@google.com>
Date:   Mon Aug 12 14:20:21 2013 +0100

    Record Chromium merge at DEPS revision r216972

    This commit was generated by merge_to_master.py.

    Change-Id: I16c5ea610d958ec3569bdeaabccac88db2908127

commit ba5b9a6411cb1792fd21f0a078d7a25cd1ceec16
Author: Ben Murdoch <benm@google.com>
Date:   Mon Aug 12 14:20:17 2013 +0100

    Merge from Chromium at DEPS revision r216972

    This commit was generated by merge_to_master.py.

    Change-Id: I01cb28d94e3fcf99e3624d75cafa50d929787ddd

commit f7fa989080f1e63c6a8aa24d5434922d52d9f51e
Merge: ba1358b 422c734
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Aug 8 22:44:40 2013 +0000

    Merge "Revert "Downstream Workaround for Qualcomm Bug 10205015""

commit 422c7341507ced659d3d2346d74347126498d675
Author: Jonathan Dixon <joth@google.com>
Date:   Thu Aug 8 22:44:11 2013 +0000

    Revert "Downstream Workaround for Qualcomm Bug 10205015"

    Now that klp-dev has branched revert this change from master to return it to matching upstream.

    This reverts commit c95505573d864f17cabf515e32f5b8e0831ae237.

    Change-Id: Ia5081c02cc69cee031bbf8df46df6056f28e5a9f

Change-Id: I0eb6e3604ac2fc65c6f07d126227d2b49006ff56