summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Publish DEPS for Chromium 42.0.2311.8542.0.2311.85chrome-tpm2015-04-082-790/+1490
|
* Incrementing VERSION to 42.0.2311.85chrome-tpm2015-04-091-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2311@{#467} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* [Ozone] VAAPI wrapper should open its own render node.Haixia Shi2015-04-093-4/+13
| | | | | | | | | | | | | | | | | | | | | | | This prevents a double-close problem that arises when libva uses the same drm fd as gbm. TODO(hshi): refactor VAAPI wrapper's management of drm file (crbug.com/475250). BUG=462459 BUG=464628 TEST=verify that video acceleration works and the netflix hang is fixed R=jorgelo@chromium.org, piman@chromium.org TBR=hshi@chromium.org Review URL: https://codereview.chromium.org/1073653003 Cr-Commit-Position: refs/heads/master@{#324329} (cherry picked from commit b46fe98550d339b8a5e2a56ce77d712499537539) Review URL: https://codereview.chromium.org/1076683002 Cr-Commit-Position: refs/branch-heads/2311@{#466} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Incrementing VERSION to 42.0.2311.84chrome-tpm2015-04-081-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2311@{#465} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Record add to homescreen events with URL from the owning web contents.Ben Wells2015-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | This change fixes a bug in 42 which is triggered if the start URL from the manifest is not the same as the current page. In this case, the fact that the shortcut was added is not remembered, causing the banner to come up in future. Merged from main branch. TBR=bauerb@chromium.org BUG=474631 Review URL: https://codereview.chromium.org/1065153002 Cr-Commit-Position: refs/heads/master@{#324198} (cherry picked from commit ee0b4d8b42ca2da99dd6ea1dac62690fa0a747bc) Review URL: https://codereview.chromium.org/1077443002 Cr-Commit-Position: refs/branch-heads/2311@{#464} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* ozone: evdev: Fix repeating the same key after r324081Michael Spang2015-04-081-0/+1
| | | | | | | | | | | | | | | | | | | | We broke repeating the same key twice in a row in r324081. Cancelling repeat must update the repeated key, so that we can tell that we need to start a new repeat for that key in UpdateKeyRepeat if it's pressed again. TEST=Repeat the same key twice in a row on link BUG=473446 Review URL: https://codereview.chromium.org/1074503002 Cr-Commit-Position: refs/heads/master@{#324263} (cherry picked from commit 57d2aaf3f94ef2228cabfbda58e64389ee65b6db) Review URL: https://codereview.chromium.org/1071683003 Cr-Commit-Position: refs/branch-heads/2311@{#463} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* ozone: evdev: Make cancellation of repeats on key up more robustMichael Spang2015-04-082-21/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Key releases enqueue a task on KeyboardEvdev that dispatches the release ui::Event as well as cancels any scheduled repeats for that key. The release itself is enqueued from the dedicated evdev thread and so can be expected to arrive in a timely manner. Unfotunately, due to the way base::Timer works, this is not robust when the UI thread is very busy. The base::Timer object posts a delayed task, and upon running checks to see if enough real time has passed (see Timer::RunScheduledTask). If so, it runs the timer callback immediately. This is fine, except that base::Timer also reuses scheduled tasks from previous calls to Start() if they are still in the future (see Timer::Reset). This can mean the timeout callback runs from a task that was scheduled before the current timer was started. The net effect of this is that the timer task may run first even if (initial timer start + delay) > (key release task timestamp). The message loop queue itself would have run the tasks in the correct order. So, if we simply use PostDelayedTask() ourselves, there's no cleverness in base::Timer to worry about and the tasks run in the needed order. BUG=473446 TEST=Press Ctrl-W to close a tab with lots of activity (multiple copies of gmail loading, etc). Only one tab closes. Also tested with simulated jank (1s delay in tab closure). Review URL: https://codereview.chromium.org/1052273006 Cr-Commit-Position: refs/heads/master@{#324081} (cherry picked from commit 50e43d96539246fe55b282e5e161b12ed39c42eb) Review URL: https://codereview.chromium.org/1074453002 Cr-Commit-Position: refs/branch-heads/2311@{#462} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Whitelist OverDrive for use in public sessionsBartosz Fabianowski2015-04-081-0/+1
| | | | | | | | | | | | | | | | | | | | This CL whitelists the OverDrive app that has been approved for use in public sessions. BUG=457683 TEST=None Review URL: https://codereview.chromium.org/1048033002 Cr-Commit-Position: refs/heads/master@{#323014} (cherry picked from commit 3e71b80fa910601bdb5813cfb48ae04d274e4608) TBR=finnur Review URL: https://codereview.chromium.org/1069383002 Cr-Commit-Position: refs/branch-heads/2311@{#461} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Incrementing VERSION to 42.0.2311.83chrome-tpm2015-04-081-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2311@{#460} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Allow fullscreen manager and control container to be nullChangwan Ryu2015-04-081-16/+13
| | | | | | | | | | | | | | | | | | | (This is a partial merge to fix crbug.com/473240. Only tab_layer.cc is merged.) Also fixes webapp top controls flashing issue which sprang back after this change. BUG=430635,463957 Review URL: https://codereview.chromium.org/986963002 Cr-Commit-Position: refs/heads/master@{#321253} (cherry picked from commit 5e148eb4f7679c85daa8e0d314dfd636f739b0d8) Review URL: https://codereview.chromium.org/1069593002 Cr-Commit-Position: refs/branch-heads/2311@{#459} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Disable display settings for 3+ displays (M42 merge)Michael Giuffrida2015-04-085-7/+49
| | | | | | | | | | | | | | | | | | | Disable display settings because they do not work as expected for 3+ displays. BUG=467195 Review URL: https://codereview.chromium.org/1055473005 Cr-Commit-Position: refs/heads/master@{#323706} (cherry picked from commit 516b0ba31533a5d72c717480f5bfdb5aa476a98f) R=dbeam@chromium.org, oshima@chromium.org Review URL: https://codereview.chromium.org/1063833002 Cr-Commit-Position: refs/branch-heads/2311@{#458} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Incrementing VERSION to 42.0.2311.82chrome-tpm2015-04-081-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2311@{#457} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Fixed browser options pagematthewyuan2015-04-071-1/+1
| | | | | | | | | | | | | | | | | | Before/Now comparison: http://imgur.com/a/4Nivx BUG=467790 Review URL: https://codereview.chromium.org/1037483005 Cr-Commit-Position: refs/heads/master@{#322186} (cherry picked from commit fc16bb92a76642191940441db1bd9b99b3f7ec46) R=beaufort.francois@gmail.com, stevenjb@chromium.org Review URL: https://codereview.chromium.org/1065043003 Cr-Commit-Position: refs/branch-heads/2311@{#456} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Whitelist CNNIC certsRyan Sleevi2015-04-075-0/+6207
| | | | | | | | | | | | | | | | | | | | | | | BUG=473408 Review URL: https://codereview.chromium.org/1067723002 Cr-Commit-Position: refs/heads/master@{#324119} (cherry picked from commit ad0863803901e6c477f976de0e6218b154fee6d5) Implement the ability to whitelist leaf-certs that chain to specific issuers. BUG=473408 Review URL: https://codereview.chromium.org/1042973002 Cr-Commit-Position: refs/heads/master@{#323661} (cherry picked from commit cbca7459bce1e95df013543ccba88fa0aa914252) Review URL: https://codereview.chromium.org/1065033002 Cr-Commit-Position: refs/branch-heads/2311@{#455} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Change the Android page info security summary phrase to reflect SHA-1 ↵Alex Mineer2015-04-075-1/+66
| | | | | | | | | | | | | | | | | deprecation. ToolbarModelAndroid::IsDeprecatedSHA1Present() is meant to be a temporary measure for Android on M42. The accompanying string was landed in https://codereview.chromium.org/1034863003 BUG=469853 Review URL: https://codereview.chromium.org/1036193002 (cherry picked from commit 7b677da37b6dfc5e56fe330ddcbb0cfcf000c363) Cr-Original-Commit-Position: refs/heads/master@{#323604} Cr-Commit-Position: refs/branch-heads/2311@{#454} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Merge: Update Flash minimum secure versions.Will Harris2015-04-072-4/+4
| | | | | | | | | | | | | | BUG=412078 Review URL: https://codereview.chromium.org/1065753002 Cr-Commit-Position: refs/heads/master@{#323994} (cherry picked from commit 58ad0fbee07df0880a99e23d3935dad9c464a6d8) Review URL: https://codereview.chromium.org/1067023004 Cr-Commit-Position: refs/branch-heads/2311@{#453} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Refactor delegated scrolling in LayerImplHui Shu2015-04-077-376/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the root layer scroll offset delegate's scroll offset is bigger than that of the outer viewport scroll layer, the root scroll offset is distributed between inner and outer viewport scroll layer. However, the layer that gets assigned a new scroll offset first will immediately update the root layer delegate scroll offset without waiting for the rest of the undistributed scrolls to be assigned to other layer. This causes the associated bug 470360. This CL simplified the logic around delegated scrolling by removing LayerImpl::ScrollOffsetDelegate. LayerImpl will always have the most recent and correct scroll offset. LTHI and LTI still delegate the root layer scroll to an external source (Android WebView). There are 2 cases for a LayerImpl to change its scroll offset: 1. When the root layer scroll delegate scrolls, the new scroll offset will be synchronously distributed to the inner and outer viewport scroll layer. 2. The LayerImpl scrolls by itself, like ScrollBy() or PushScrollOffset(). In this case, root layer scroll delegate will be updated with the new scroll offset. BUG=470360 Review URL: https://codereview.chromium.org/1038173002 Cr-Commit-Position: refs/heads/master@{#324012} (cherry picked from commit 33370e19d3c6a43d0cb7c87f90aadb79d44dd741) Conflicts: cc/trees/layer_tree_impl.cc cc/trees/layer_tree_impl.h Review URL: https://codereview.chromium.org/1060403002 Cr-Commit-Position: refs/branch-heads/2311@{#452} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Refresh Public Suffix List to the latest versionRyan Sleevi2015-04-073-25/+264
| | | | | | | | | | | | | | | | | | | | | | This updates to the following revision: 4f90008545e0 (2015-04-02 03:34 -0400) It includes changes from revision bad2a08db205 (2015-02-17 17:53 +0000) to revision 4f90008545e0 (2015-04-02 03:34 -0400), listed at http://hg.mozilla.org/mozilla-central/log/4f90008545e0/netwerk/dns/effective_tld_names.dat R=pkasting@chromium.org BUG=37436 Review URL: https://codereview.chromium.org/1056383002 Cr-Commit-Position: refs/heads/master@{#323933} (cherry picked from commit 7faf645e3ebfe310cfbd5b2dbc5b459e4af93cb2) Review URL: https://codereview.chromium.org/1061383002 Cr-Commit-Position: refs/branch-heads/2311@{#451} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Disable Win32k Lockdown if NPAPI is enabled.Will Harris2015-04-071-0/+3
| | | | | | | | | | BUG=343192 R=jschuh@chromium.org Review URL: https://codereview.chromium.org/1061963003 Cr-Commit-Position: refs/branch-heads/2311@{#450} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* [chromedriver] Disable Timeline by default in performance logsSam Uong2015-04-075-8/+8
| | | | | | | | | | | | | | | BUG= TBR=stgao@chromium.org Review URL: https://codereview.chromium.org/985243002 Cr-Commit-Position: refs/heads/master@{#319582} (cherry picked from commit 547831fb0f49045bf3af52482ee4ce1f58a832f2) Review URL: https://codereview.chromium.org/1064083002 Cr-Commit-Position: refs/branch-heads/2311@{#449} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* [Ozone-Drm] Block initialization of DrmDevices on taking DRM masterAlex Sakhartchouk2015-04-071-0/+28
| | | | | | | | | | | | | | | | | | | | | | | During GPU process restarts (possibly caused by GPU crashes) it is possible to have the new GPU process trying to take DRM master before the old one has released all DRM resources. The file lock isn't sufficient since the kernel may release opened files in a different order than what we'd like. BUG=461396 TEST=Ran Chrome on Link without drm_master_relax enabled and verified that 1) it stats up normally 2) if another process is authenticated Chrome waits for it to release master Review URL: https://codereview.chromium.org/1053803002 Cr-Commit-Position: refs/heads/master@{#323622} (cherry picked from commit 603aab92420707a94db0646c21c2d8e8d992ab8f) R=spang@chromium.org, ynovikov@chromium.org Review URL: https://codereview.chromium.org/1062183002 Cr-Commit-Position: refs/branch-heads/2311@{#448} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Updating XTBs based on .GRDs from branch 2311Alex Mineer2015-04-079-14/+16
| | | | | Cr-Commit-Position: refs/branch-heads/2311@{#447} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Reschedule redraw if hardware draw failsBo Liu2015-04-071-2/+1
| | | | | | | | | | | | | | | | | | | | Direct change to branch 2311 since trunk has been massively refactored. Currently the only way hardware draw fails is during initial load before the first commit in the compositor. In this case, compositor SetNeedsBeginFrame to true throughout the load, but android webview gets into a livelock when both the corresponding onDraw and the fallback tick fail and skips rescheduling draws due to hardware draw failing. Fix by always rescheduling draws even if a draw fails. BUG=474167 R=hush@chromium.org Review URL: https://codereview.chromium.org/1061063002 Cr-Commit-Position: refs/branch-heads/2311@{#446} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Delete UserMediaRequestInfo before blink is notified of gUM success/failure. ↵Alex Mineer2015-04-071-4/+12
| | | | | | | | | | | | This changes ther order UserMediaClientImpl::OnCreateNativeTracksCompleted deletes UserMediaRequestInfo to fix a problem where the frame may have been deleted before the UserMediaRequestInfo has been deleted. BUG=472617 Review URL: https://codereview.chromium.org/1058843002 (cherry picked from commit 21fb2a2b683dfbe19b3be215df423a8f42bf2c64) Cr-Original-Commit-Position: refs/heads/master@{#323583} Cr-Commit-Position: refs/branch-heads/2311@{#445} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* SkPDF Metafile: fix recording canvas scalingAlex Mineer2015-04-071-10/+16
| | | | | | | | | | | | | | | Scale the recording canvas's page size, not it's canvas matrix. This allows getTotalMatrix() to return the identity matrix. BUG=469656 Review URL: https://codereview.chromium.org/1060603003 (cherry picked from commit 5baa8fb45970fbc343e130c8d14ba528b3dd934a) Cr-Original-Commit-Position: refs/heads/master@{#323820} Cr-Commit-Position: refs/branch-heads/2311@{#444} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Incrementing VERSION to 42.0.2311.81chrome-tpm2015-04-071-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2311@{#443} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* content: ozone: Limit web cursor size to 64x64Michael Spang2015-04-071-2/+13
| | | | | | | | | | | | | | | | | | | | | This is the maximum some Chrome OS hardware can support and the maximum that we historically allowed in X11 builds (see SkBitmapToXcursorImage). This gives us consistent behavior to what we had before (except that it only scales once instead of twice). BUG=471357 TEST=davidwalsh.name/demo/css-custom-cursor.php on link & inspector color picker cursors are scaled down instead of cropped Review URL: https://codereview.chromium.org/1055533006 Cr-Commit-Position: refs/heads/master@{#323549} (cherry picked from commit 9b580384b806134526d7baf6f5f6eff19a8eafdd) Review URL: https://codereview.chromium.org/1064023002 Cr-Commit-Position: refs/branch-heads/2311@{#442} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Fix deadlock in ChildProcessService.onDestroy()Daniel Sievers2015-04-071-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | onCreate() spawns the CrMain thread. onDestroy() can happen quickly after onCreate() (for example if the browser crashes), so we have to be careful about blocking on any semaphores wrt the CrMain thread. The existing cmdline check did not cover all of that. In addition we have to avoid deadlocks between nativeShutdownMainThread()and us actually not having ever entered native main(). (ChildThreadImpl::Shutdown() on Android waits on a condition variable.) BUG=448549,457406,457914 NOTRY=True Review URL: https://codereview.chromium.org/1052133002 Cr-Commit-Position: refs/heads/master@{#323567} Review URL: https://codereview.chromium.org/1061133004 Cr-Commit-Position: refs/branch-heads/2311@{#441} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Merge: Don't use --check-cloud-print-connector-policy on MACVitaly Buka2015-04-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | OSX crashes if --check-cloud-print-connector-policy is set. Policy check on service side is unnecessary as policy can be update by browser only. In this case browser will enforce the policy from own side. This is small fix in case we want merge. Subsequent CLs will remove all related code. BUG=469770 Review URL: https://codereview.chromium.org/1055453004 Cr-Commit-Position: refs/heads/master@{#323812} (cherry picked from commit f847d4b419ee4f03a23dafb732dfdabde76e562b) Review URL: https://codereview.chromium.org/1064713004 Cr-Commit-Position: refs/branch-heads/2311@{#440} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Incrementing VERSION to 42.0.2311.80chrome-tpm2015-04-071-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2311@{#439} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Merge: Don't crash service process on start initializing V8Vitaly Buka2015-04-061-1/+2
| | | | | | | | | | | | | | | | | | | https://codereview.chromium.org/944913002 wrongly assumes that non empty --type means a child process. This is a quick fix for merging into Chrome 42. We need better solution for 43. Content does not know about "service" process and does not include "service" constant from chrome. BUG=466917 Review URL: https://codereview.chromium.org/1055413002 Cr-Commit-Position: refs/heads/master@{#323758} (cherry picked from commit 1a16f9bf016a616d12be7003ebe84fb1aebc748e) Review URL: https://codereview.chromium.org/1065723004 Cr-Commit-Position: refs/branch-heads/2311@{#438} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* [OSX] Fix focus behavior for permission bubble.Rachel Blum2015-04-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | We want permission bubbles to steal focus, so they are keyboard accessible. We however do not want any UI elements to be the default focus when the bubble pops up, so that we don't focus steal and an accidental enter/space is interpreted as a user decision. Code modifies key loop to nil->allow->"x"->deny->allow->... BUG=455142 TBR=rsesek@chromium.org Review URL: https://codereview.chromium.org/1058843004 Cr-Commit-Position: refs/heads/master@{#323677} (cherry picked from commit d8c1ad8bd49c1361eaafa614e8ec30084ff1b6ee) Review URL: https://codereview.chromium.org/1062023002 Cr-Commit-Position: refs/branch-heads/2311@{#437} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Revert changes of sharing a page with EXTRA_STREAMJaekyun Seok2015-04-064-235/+44
| | | | | | | | | | | | | | - revert 70b1fff1334bfd6879c47c2ea395594e391088bc - revert b9d025fb7a30a1e8111f0d5d24041ad740e8dec2 - revert 5523a258ffe874a67e839559ae902d94b55fd69c BUG=455996 TBR=tedchoc@chromium.org Review URL: https://codereview.chromium.org/1063623002 Cr-Commit-Position: refs/branch-heads/2311@{#436} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Fix up merge in r317474.Adam Langley2015-04-064-32/+12
| | | | | | | | | | | | | | I got my gyp flags in a tangle and thought that I was building and testing use_openssl=1 when I wasn't. The original merged change pulled in a lot more BoringSSL changes than were merged to the BoringSSL 2311 branch and included build changes that don't work on the branch. Also, fix a couple of tests that don't exist on trunk any longer. BUG=474254 Cr-Commit-Position: refs/branch-heads/2311@{#435} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Fix the startup sequence for in-process mode.Bo Liu2015-04-061-7/+7
| | | | | | | | | | | | | | | | | The GpuDataManager should be initialized before SetRunRendererInProcess to ensure the gpu features/blacklists are correctly set for renderer. BUG=468150 Review URL: https://codereview.chromium.org/1015633003 Cr-Commit-Position: refs/heads/master@{#321258} TBR=sievers@chromium.org Review URL: https://codereview.chromium.org/1057203002 Cr-Commit-Position: refs/branch-heads/2311@{#434} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Merge:Fix an exception caused by toast running on background threadqinmin@google.com2015-04-064-12/+26
| | | | | | | | | | | | | | | | | | | | | | Chrome uses an AsyncTask to post the download notifications. For completed downloads, Android DownloadManager will help us post the notification. However, if DownloadManager failed to enqueue a download, an exception will be thrown to show a toast. But toast cannot be run on a background thread, we need to use the UI thread to show a toast. This change fixes the issue by using AsyncTask.onPostExecute to show the toast on. BUG=469576 Review URL: https://codereview.chromium.org/1052313002 Cr-Commit-Position: refs/heads/master@{#323763} (cherry picked from commit 1f5c3284e19a242b55ca9a4501286277733a67a5) TBR=dtrainor@chromium.org Review URL: https://codereview.chromium.org/1066653002 Cr-Commit-Position: refs/branch-heads/2311@{#433} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Require ECDHE for False Start.Adam Langley2015-04-0619-76/+826
| | | | | | | | | | | | | | | | | This adds just enough of an implementation of ECDHE_RSA to tlslite to support it on the server side. Branch DEPS for BoringSSL were updated in r71429. That pulls in the corresponding BoringSSL change. BUG=474254 Review URL: https://codereview.chromium.org/1057733002 (cherry picked from commit 8f7efab800fc6987499c5365fce22349e3a4ef50) Cr-Commit-Position: refs/branch-heads/2311@{#432} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Update NowLauncher experiment name in settingsmatthewyuan2015-04-061-1/+1
| | | | | | | | | | | | | | | | BUG=473667 Review URL: https://codereview.chromium.org/1052643005 Cr-Commit-Position: refs/heads/master@{#323790} (cherry picked from commit 6ef191534c27726bff8fab3194ca99a84f6053f1) R=skare@chromium.org Review URL: https://codereview.chromium.org/1065703002 Cr-Commit-Position: refs/branch-heads/2311@{#431} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Read Now pref from userprefs. It currently reads from local state, which is ↵matthewyuan2015-04-061-4/+5
| | | | | | | | | | | | | | | | | | not where the pref is recorded. BUG=408152 Review URL: https://codereview.chromium.org/1053893003 Cr-Commit-Position: refs/heads/master@{#323431} (cherry picked from commit 15a16244bd70fdd1f9cd27cb73dd5e981d5aa379) R=skare@chromium.org Review URL: https://codereview.chromium.org/1061073002 Cr-Commit-Position: refs/branch-heads/2311@{#430} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* More specific HSTS rules override less specific regardless of includeSubDomains.David Benjamin2015-04-063-13/+74
| | | | | | | | | | | | | | | | | | This restores the behavior prior to https://codereview.chromium.org/826423009 BUG=469957 Review URL: https://codereview.chromium.org/1035573003 Cr-Commit-Position: refs/heads/master@{#323591} (cherry picked from commit 65a9ba813535028404d962494f847d74b4795891) TBR=rsleevi@chromium.org Review URL: https://codereview.chromium.org/1066623002 Cr-Commit-Position: refs/branch-heads/2311@{#429} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Have launcher page instantiation read Now-enabled pref.matthewyuan2015-04-061-0/+11
| | | | | | | | | | | | | | | | BUG=408152 Review URL: https://codereview.chromium.org/946513002 Cr-Commit-Position: refs/heads/master@{#320601} (cherry picked from commit 563658b3d68b39fc2d5e8109c3e0b5b1b53f6409) R=skare@chromium.org Review URL: https://codereview.chromium.org/1060083003 Cr-Commit-Position: refs/branch-heads/2311@{#428} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Incrementing VERSION to 42.0.2311.79chrome-tpm2015-04-061-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2311@{#427} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* cc: Don't background tick for needs redrawChristopher Cameron2015-04-062-2/+68
| | | | | | | | | | | | | | BUG=472237 Review URL: https://codereview.chromium.org/1047343002 Cr-Commit-Position: refs/heads/master@{#323334} (cherry picked from commit f36e727e15ab6ee2154ad5b2abe5639b1dafdf2e) Review URL: https://codereview.chromium.org/1063783002 Cr-Commit-Position: refs/branch-heads/2311@{#426} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Make cc::Scheduler::BeginFrameNeeded be false when commits deferredChristopher Cameron2015-04-064-19/+24
| | | | | | | | | | | | | | | | | | | | | | | If this is not the case, then the scheduler will tick its |frame_source_| until commits are re-enabled. This is problematic because (on Mac) ui::Compositors that are not visible because they are occluded by other NSWindows have commits deferred until they are un-occluded. In the unintended endings department, this makes the use of occlusion, intended to save power, end up consuming more substantially more power. BUG=471863 Review URL: https://codereview.chromium.org/1047173003 Cr-Commit-Position: refs/heads/master@{#323320} (cherry picked from commit 05840e8b1330f1bf19ca81a873616b75cc04a874) Review URL: https://codereview.chromium.org/1063763002 Cr-Commit-Position: refs/branch-heads/2311@{#425} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Incrementing VERSION to 42.0.2311.78chrome-tpm2015-04-061-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2311@{#424} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Incrementing VERSION to 42.0.2311.77chrome-tpm2015-04-051-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2311@{#423} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Incrementing VERSION to 42.0.2311.76chrome-tpm2015-04-041-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2311@{#422} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Incrementing VERSION to 42.0.2311.75chrome-tpm2015-04-031-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2311@{#421} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* ServiceWorker: Fix wrong UMA labelHiroki Nakagawa2015-04-031-2/+2
| | | | | | | | | | | | | | | BUG=468926,469971 TEST=n/a Review URL: https://codereview.chromium.org/1058693002 Cr-Commit-Position: refs/heads/master@{#323425} (cherry picked from commit b031bf991077918ecbedf6b8672a4edf1cd701ce) Review URL: https://codereview.chromium.org/1057293002 Cr-Commit-Position: refs/branch-heads/2311@{#420} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
* Accept cross origins Manifest if they have valid Access Controls headers.Mounir Lamouri2015-04-034-9/+59
| | | | | | | | | | | | | | | BUG=471236 TBR=mlamouri@chromium.org Review URL: https://codereview.chromium.org/1038383004 Cr-Commit-Position: refs/heads/master@{#323244} (cherry picked from commit bd3f00cdecccf692a458e7c33ae2fa05ddf77308) Review URL: https://codereview.chromium.org/1056093002 Cr-Commit-Position: refs/branch-heads/2311@{#419} Cr-Branched-From: 09b7de5dd7254947cd4306de907274fa63373d48-refs/heads/master@{#317474}
generated by cgit v1.1 at 2024-06-09 05:52:39 +0000