summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Publish DEPS for Chromium 40.0.2214.6240.0.2214.62chrome-tpm2014-12-312-783/+1468
|
* Incrementing VERSION to 40.0.2214.62chrome-tpm2015-01-011-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2214@{#368} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Avoid using the data reduction proxy for websockets.Ben Greenstein2014-12-312-65/+91
| | | | | | | | | | | | | | | | | This change adds a rule to not use the data reduction proxy for ws:// or wss:// URLs. BUG=439254 Review URL: https://codereview.chromium.org/828803002 Cr-Commit-Position: refs/heads/master@{#309738} (cherry picked from commit 42e8ccad72ea98a2eaa9efc85cddc075ae6084ee) Review URL: https://codereview.chromium.org/828923002 Cr-Commit-Position: refs/branch-heads/2214@{#367} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Incrementing VERSION to 40.0.2214.61chrome-tpm2014-12-311-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2214@{#366} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Merge a harfbuzz 2-line patch to M40 branchJungshik Shin (jungshik at google)2014-12-313-0/+24
| | | | | | | | | | | | | | | | BUG=443274 TEST=See the bug TBR=behdad Review URL: https://codereview.chromium.org/795393003 Cr-Commit-Position: refs/heads/master@{#308894} (cherry picked from commit 6c59b0e9e526fb55146c8c458e7ef5d984e2bf7e) Review URL: https://codereview.chromium.org/814293006 Cr-Commit-Position: refs/branch-heads/2214@{#365} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Incrementing VERSION to 40.0.2214.60chrome-tpm2014-12-301-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2214@{#364} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Incrementing VERSION to 40.0.2214.59chrome-tpm2014-12-291-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2214@{#363} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Incrementing VERSION to 40.0.2214.58chrome-tpm2014-12-281-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2214@{#362} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Incrementing VERSION to 40.0.2214.57chrome-tpm2014-12-271-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2214@{#361} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Incrementing VERSION to 40.0.2214.56chrome-tpm2014-12-261-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2214@{#360} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Incrementing VERSION to 40.0.2214.55chrome-tpm2014-12-261-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2214@{#359} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Do not emit indexed header fields first in HpackEncoder.Bence Béky2014-12-253-29/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In HpackEncoder, do not emit regular headers that can be found in the dynamic table before the ones that cannot in fear of evicting one that could have been indexed. Instead, go through the header fields "in order". Note that since HpackEncoder takes the header block as a map, order is still not guaranteed. In particular, different keys will be sorted alphabetically. However, this change guarantees order of headers with identical keys. Such headers are passed as "key: value0\0value1" to HpackEncoder, but sent as two separate header fields "key: value0" and "key: value1" on the wire. Before this CL, order could have got changed depending on which fields were in the dynamic table. This CL lands server side change 82356409 by bnc. BUG=443570 TBR=rch Review URL: https://codereview.chromium.org/803843004 Cr-Commit-Position: refs/heads/master@{#309064} (cherry picked from commit 540eba1e09561a3ba2ff663e26607d7bfc1397b5) Review URL: https://codereview.chromium.org/789163007 Cr-Commit-Position: refs/branch-heads/2214@{#358} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Incrementing VERSION to 40.0.2214.54chrome-tpm2014-12-251-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2214@{#357} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Incrementing VERSION to 40.0.2214.53chrome-tpm2014-12-241-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2214@{#356} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Fix content scripts to wait for response before calling window.close().Sergey Ulanov2014-12-245-9/+21
| | | | | | | | | | | | | | | | | | | | | | Chrome may not always deliver messages if window is closed soon after sendMessage() was called. Now content scripts wait for response from the main page before calling window.close(). This is a workaround for crbug.com/444130 BUG=444127 Review URL: https://codereview.chromium.org/803463003 Cr-Commit-Position: refs/heads/master@{#309287} (cherry picked from commit 16e83f5222d52d53e30f54fb960da49aaa15fb8c) TBR=sergeyu@chromium.org Review URL: https://codereview.chromium.org/789613006 Cr-Commit-Position: refs/branch-heads/2214@{#355} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Increase FontConfig cache capacityJun Mukai2014-12-231-1/+1
| | | | | | | | | | | | | | | | BUG=440551 TBR=asvitkine@chromium.org, ckocagil@chromium.org, NOTRY=true Review URL: https://codereview.chromium.org/792853003 Cr-Commit-Position: refs/heads/master@{#309058} (cherry picked from commit f7a6293f6f48257134a5e68d6f9494531c8c9bfd) Review URL: https://codereview.chromium.org/811523004 Cr-Commit-Position: refs/branch-heads/2214@{#354} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Incrementing VERSION to 40.0.2214.52chrome-tpm2014-12-231-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2214@{#353} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Merge: Never display unauthorized plugin info bar.Will Harris2014-12-238-256/+13
| | | | | | | | | | | | | | | | | | The IPC still needs to be sent because it's used by the webview permission helper to permit PPAPI plugins to run inside a webview. Remove all the code that backed this, including UMA actions, and a test. The NPAPI purge, begun, it has. BUG=439972 Review URL: https://codereview.chromium.org/801053003 Cr-Commit-Position: refs/heads/master@{#308433} (cherry picked from commit 4ecfe306cc14acd30a2206bc04d203281ed1d3f3) Review URL: https://codereview.chromium.org/788053004 Cr-Commit-Position: refs/branch-heads/2214@{#352} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* events: devices: Fix i2c device detection in IsTouchscreenInternalYufeng Shen2014-12-221-21/+20
| | | | | | | | | | | | | | | | | | | | | | | | The current logic is wrong, since it does not look deeply enough for child input class devices. To fix the current approach, we'd need a recursive search, but let's not do that. Instead, find the device path and check the subsystem of each ancestor device. If it's an i2c device, one of those will be the i2c subsytem. BUG=chrome-os-partner:34013 TEST=Check calibration on link_freon & rush_ryu TBR=sadrul@chromium.org Review URL: https://codereview.chromium.org/750713002 Cr-Commit-Position: refs/heads/master@{#305504} (cherry picked from commit 0035518ae14df18d28d86a3dffe07d33b23394fa) Review URL: https://codereview.chromium.org/819933002 Cr-Commit-Position: refs/branch-heads/2214@{#351} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Incrementing VERSION to 40.0.2214.51chrome-tpm2014-12-221-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2214@{#350} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Incrementing VERSION to 40.0.2214.50chrome-tpm2014-12-211-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2214@{#349} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Incrementing VERSION to 40.0.2214.49chrome-tpm2014-12-201-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2214@{#348} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Revert "Merge to M40: Fix threading bugs in product label UI."Steven Bennetts2014-12-194-76/+62
| | | | | | | | | | | | This reverts commit ce05dc42c482c5dab270a6cc405175a99f2a4fba. TBR=michaelpg@chromium.org BUG=438953 Review URL: https://codereview.chromium.org/814343002 Cr-Commit-Position: refs/branch-heads/2214@{#347} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Merge to M40: Fix threading bugs in product label UI.Michael Giuffrida2014-12-194-62/+76
| | | | | | | | | | | | | | | | | | As mentioned in https://codereview.chromium.org/680393002/#msg6, the current code had some threading issues. BUG=438953 R=dbeam@chromium.org, satorux@chromium.org CC=stevenjb@chromium.org Review URL: https://codereview.chromium.org/780203002 Cr-Commit-Position: refs/heads/master@{#307640} (cherry picked from commit ec5c21a2672ecf15f25ce7020393df21976a2d35) Review URL: https://codereview.chromium.org/810383002 Cr-Commit-Position: refs/branch-heads/2214@{#346} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Incrementing VERSION to 40.0.2214.48chrome-tpm2014-12-191-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2214@{#345} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* M40 branch Header file inlucde compile error fix.Kibeom Kim2014-12-191-1/+1
| | | | | | | | | | base/metrics/histogram_macros.h didn't exist on M40 and it was base/metrics/histogram.h Review URL: https://codereview.chromium.org/817023002 Cr-Commit-Position: refs/branch-heads/2214@{#344} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* [New Tab Page] Fix a problem with spacebar navigation on NTPMathieu Perreault2014-12-191-1/+4
| | | | | | | | | | | | | | BUG=439243 Review URL: https://codereview.chromium.org/808173003 Cr-Commit-Position: refs/heads/master@{#309065} (cherry picked from commit 9ae0f356b6d5747f8e47fd4a96571d621fcfb3f9) Review URL: https://codereview.chromium.org/819663002 Cr-Commit-Position: refs/branch-heads/2214@{#343} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Don't return a favicon for native pages.David Trainor2014-12-193-8/+14
| | | | | | | | | | | | | | | | | | The default favicon that chrome returns is not necessarily the one we want to use on Android for native pages. TBR=tedchoc@chromium.org BUG=411155 Review URL: https://codereview.chromium.org/797083002 Cr-Commit-Position: refs/heads/master@{#308732} (cherry picked from commit a6919b05f71dfbe8d741c0b58b5369298c122684) Review URL: https://codereview.chromium.org/792253003 Cr-Commit-Position: refs/branch-heads/2214@{#342} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Fix release build break.Christopher Cameron2014-12-191-1/+1
| | | | | | | | | | | Use surface_.get() instead of surface_ in boolean expressions. BUG=444097 Review URL: https://codereview.chromium.org/813373004 Cr-Commit-Position: refs/branch-heads/2214@{#341} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Add a glBegin/End pair to make glBindFramebuffer workChristopher Cameron2014-12-197-1/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that this fixes the issue where rendered contents wouldn't appear on the screen. I say "it appears" because this bug is very difficult to repro, and so I can never say it's actually gone, just that I wasn't able to make it happen anymore. I can come up with a line of reasoning that the glBegin/End causes the driver to go and validate its internal state. Perhaps sometimes the dirty bit for the FBO is missed (and doing the glBegin/End immediately after changing the FBO ensure it's picked up). Ultimately it is just a guess. This workaround was discovered by accident through the following sequence of steps when debugging: 1. Draw a triangle to the CAOpenGLLayer after drawing the texture, to ensure that we are actually getting draw calls - This appeared and kept updating even when the texture stopped updating 2. Draw a triangle to the FBO's texture from the CAOpenGLLayer's context, to make sure changes to the texture would go through - This appeared and kept updating even when the textures topped updating (so it's probably a problem with the command buffer context). 3. Draw a triangle to the FBO's texture from the command buffer's context just before glSwapBuffers - This triangle never appeared, so I tried the next experiment. 4. Draw a triangle to the FBO's texture right after it is bound using glBindFramebufferEXT - Suddenly the bug went away (and I never saw the triangle, because it was drawn over). 5. Just do a glBegin/End with program 0, since we found this was enough to work around driver bugs in the past. - Still couldn't repro the bug with this. BUG=435786 Review URL: https://codereview.chromium.org/797533002 Cr-Commit-Position: refs/heads/master@{#308166} (cherry picked from commit 4ff12a73e3ec88084f1803f3fbbe998e079d5c8e) Conflicts: gpu/config/gpu_driver_bug_list_json.cc gpu/config/gpu_driver_bug_workaround_type.h Review URL: https://codereview.chromium.org/789163005 Cr-Commit-Position: refs/branch-heads/2214@{#340} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* [Android WebView] Generate the OSS licenses notice using jinja2Mikhail Naganov2014-12-192-7/+76
| | | | | | | | | | | | | | | | | | | Now the page looks similar to Android's "Open source licenses" page. Also fixed the script to use an absolute path to the Chromium's license file, to make it work downstream. BUG=443619 Review URL: https://codereview.chromium.org/786323004 Cr-Commit-Position: refs/heads/master@{#309195} (cherry picked from commit 488ccc526af98c97013b8e71b289180110bb6d52) Review URL: https://codereview.chromium.org/818723002 Cr-Commit-Position: refs/branch-heads/2214@{#339} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* [WebView] Move external video surface across container views.Ignacio Solla2014-12-196-51/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When transitioning from/to fullscreen the WebView replaces the container view. We need to move the ExternalVideoSurfaceContainer across container views when this happens. Note that in fullscreen the video may still be embedded in the page if the element in fullscreen is, for example, a <div> containing the <video>. BUG=440774,398485 TEST=Manual 1. Force use of external surface (set needs_external_surface_ to true in webmediaplayer_android.cc) 2. Load the following url on a test app using a WebView: http://robnyman.github.io/fullscreen/ 3. Test with 2 different actions here: a. Go fullscreen on the <video> element by clicking on the fullscreen video control b. Go fullscreen on the <div> element by clicking on the “Fullscreen” button 4. Notice: video continues in fullscreen without frozen video and in the case of b the video still scrolls with the page Review URL: https://codereview.chromium.org/799953002 Cr-Commit-Position: refs/heads/master@{#309000} (cherry picked from commit 5eba22cd252a34432d26649b06fa4e574fc84528) Review URL: https://codereview.chromium.org/815933002 Cr-Commit-Position: refs/branch-heads/2214@{#338} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Incrementing VERSION to 40.0.2214.47chrome-tpm2014-12-191-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2214@{#337} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Merge to M40: Catch failure to capture collection information from IOHIDDevice.Reilly Grant2014-12-181-9/+22
| | | | | | | | | | | | | | | | | | | This is another case where OS X can report failure and we do not properly check the return code from an IOHIDDevice function before using the value. BUG=442360 Review URL: https://codereview.chromium.org/807063002 Cr-Commit-Position: refs/heads/master@{#308616} R=rpaquay@chromium.org Review URL: https://codereview.chromium.org/799753004 Cr-Commit-Position: refs/branch-heads/2214@{#336} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* [Android] Sanitze referrer for context menu downloads.Ted Choc2014-12-181-3/+6
| | | | | | | | | BUG=435479 Review URL: https://codereview.chromium.org/807063005 Cr-Commit-Position: refs/branch-heads/2214@{#335} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* [Android] Add AppMenu touch duration metric.Kibeom Kim2014-12-186-1/+47
| | | | | | | | | | | | | | | | | We want to monitor touch duration on AppMenu to decide optimal timeout for single tap vs dragging. BUG=434501 TBR=tedchoc Review URL: https://codereview.chromium.org/763253005 Cr-Commit-Position: refs/heads/master@{#308663} (cherry picked from commit 52b622f3041de604765f5320b86b5558223e4172) Review URL: https://codereview.chromium.org/794363003 Cr-Commit-Position: refs/branch-heads/2214@{#334} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Revert "Revert "[Android] Make menu-dragging less sensitive.""Kibeom Kim2014-12-183-37/+45
| | | | | | | | | | | This reverts commit 33a646ca31dcedc6dca3f991442278969b959af6. BUG=434501 Review URL: https://codereview.chromium.org/798233004 Cr-Commit-Position: refs/branch-heads/2214@{#333} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Revert "[Android] Make menu-dragging less sensitive."Kibeom Kim2014-12-183-45/+37
| | | | | | | | | | | This reverts commit a11ead6a3cae7d2b56f17deced6d9854cd7e80a4. BUG=434501 Review URL: https://codereview.chromium.org/814923002 Cr-Commit-Position: refs/branch-heads/2214@{#332} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* [Android] Make menu-dragging less sensitive.Kibeom Kim2014-12-183-37/+45
| | | | | | | | | | | | | | | | | | | It was easy to trigger menu-dragging logic when user just intends to tap on the menu button. Changed the logic so that it matches ListPopupWindow#ForwardingListener implementation and less sensitive. BUG=434501 TBR=tedchoc Review URL: https://codereview.chromium.org/752683004 Cr-Commit-Position: refs/heads/master@{#305383} (cherry picked from commit 24022d99b8447f4699bf6ea57fff299d1d2f8702) Review URL: https://codereview.chromium.org/815833002 Cr-Commit-Position: refs/branch-heads/2214@{#331} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Rebuild the TSS binary with the correct version of the tool.Adam Langley2014-12-181-1114/+1114
| | | | | | | | | | | | | | When landing f0a097f1 I built the binary lump with the wrong version of the tool for this old branch. (Comes from Go not being allowed in the repo ☹.) This change updates the binary lump with the correct tool version and makes the unittests pass again. BUG=443022,443521 Cr-Commit-Position: refs/branch-heads/2214@{#330} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Fix canvas to webgl sharing in android webviewBo Liu2014-12-181-1/+1
| | | | | | | | | | | | | | | | | | A small and safe workaround to get some failing webgl conformance tests passing in android webview. BUG=443464 Review URL: https://codereview.chromium.org/808323002 Cr-Commit-Position: refs/heads/master@{#308944} (cherry picked from commit 7476088d404e3b04f2cf805f3e0622283606ea77) TBR=boliu@chromium.org Review URL: https://codereview.chromium.org/784363004 Cr-Commit-Position: refs/branch-heads/2214@{#329} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Incrementing VERSION to 40.0.2214.46chrome-tpm2014-12-181-1/+1
| | | | | Cr-Commit-Position: refs/branch-heads/2214@{#328} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Merge: Add debugging logs.Tomasz Mikolajewski2014-12-181-0/+9
| | | | | | | | | | | | | | | | | | | In order to find the root cause of the infinite spinner this CL adds some temporary logs. TBR=fukino@chromium.org TEST=Tested manually. BUG=429044 Review URL: https://codereview.chromium.org/712903002 Cr-Commit-Position: refs/heads/master@{#303420} (cherry picked from commit e6ee53287e8a5e85610b87e2216bd024dbe6cba4) Review URL: https://codereview.chromium.org/809223002 Cr-Commit-Position: refs/branch-heads/2214@{#327} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Merge of cc: Use GetSize instead of recorded_viewport_ to 40hendrikw2014-12-181-3/+4
| | | | | | | | | | | | | | | | | | | cc: Use GetSize instead of recorded_viewport_ recorded_viewport_ doesn't always reflect the layer size, and as a result the solid color analysis wasn't being run correctly when recorded_viewport_ was cleared. https://codereview.chromium.org/792143003 TBR=enne BUG=435187 Committed: https://chromium.googlesource.com/chromium/src/+/d556c81d09739f403edc1ac825edbec024ae197b Review URL: https://codereview.chromium.org/807923003 Cr-Commit-Position: refs/branch-heads/2214@{#326} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Safebrowsing download protection: handle data URIsMatt Mueller2014-12-183-7/+114
| | | | | | | | | | | | | | BUG=440572 Review URL: https://codereview.chromium.org/792283002 Cr-Commit-Position: refs/heads/master@{#308157} (cherry picked from commit 4124592f09a6deee04c19740a4e603d5adc5a907) Review URL: https://codereview.chromium.org/814703002 Cr-Commit-Position: refs/branch-heads/2214@{#325} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Merge: [fsp] Promote file system provider to stable.Tomasz Mikolajewski2014-12-185-12/+6
| | | | | | | | | | | | | | | | | | This patch cleans up the IDL and promotes the API to stable. TBR=fukino@chromium.org TEST=browser_tests: *FileSystemProvider* BUG=248427 Review URL: https://codereview.chromium.org/706153002 Cr-Commit-Position: refs/heads/master@{#303975} (cherry picked from commit 4d752f9dc097c5f1f08e610aabbe2abf475d4072) Review URL: https://codereview.chromium.org/810213002 Cr-Commit-Position: refs/branch-heads/2214@{#324} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Revert "Merge of cc: Use GetSize instead of recorded_viewport_ to 40" cl is ↵matthewyuan2014-12-171-4/+3
| | | | | | | | | | | | | | breaking the compile step. This reverts commit d556c81d09739f403edc1ac825edbec024ae197b. R=hendrikw@chromium.org BUG= Review URL: https://codereview.chromium.org/812763004 Cr-Commit-Position: refs/branch-heads/2214@{#323} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Merge to M40: Reenable the CryptoToken extension in guest mode.Reilly Grant2014-12-171-1/+2
| | | | | | | | | | | | | | | BUG=442783 Review URL: https://codereview.chromium.org/807663004 Cr-Commit-Position: refs/heads/master@{#308692} R=juanlang@chromium.org, xiyuan@chromium.org Review URL: https://codereview.chromium.org/808223003 Cr-Commit-Position: refs/branch-heads/2214@{#322} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* IndexedDB: Fixed cursor/blob use-after-free bugChris Mumford2014-12-173-41/+61
| | | | | | | | | | | | | | | | | | | | | | | | The IndexedDBDispatcherHost maintains a map of BLOB UUID's to BLOBs, but if two (or more) cursors are both active and referencing the same BLOB then two (or more) BLOBs would exist with the same UUID, and their keys would collide in this map. This change reference counts these BLOBs to avoid duplication. Also, access to the existing map was not synchronized and was accessed on two different threads. BUG=435880,436137 Review URL: https://codereview.chromium.org/774593004 Cr-Commit-Position: refs/heads/master@{#307063} (cherry picked from commit 2d74497dfa5e6fd6ddddc93248c322a57dd8dd2c) R=jsbell@chromium.org Review URL: https://codereview.chromium.org/816533003 Cr-Commit-Position: refs/branch-heads/2214@{#321} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
* Fix mis-merge back to earlier signature for SdchManager::IsInSupportedDomain().Randy Smith2014-12-171-4/+4
| | | | | | | | | | BUG=437794 R=matthewyuan@chromium.org Review URL: https://codereview.chromium.org/814653002 Cr-Commit-Position: refs/branch-heads/2214@{#320} Cr-Branched-From: 03655fd3f6d72165dc3c9bd2c89807305316fe6c-refs/heads/master@{#303346}
generated by cgit v1.1 at 2024-12-22 18:53:42 +0000