summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-08-19Merge from Chromium at DEPS revision 290040Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I694ec52d1e0b553f163c2faf4373d63270ab1aac
2014-08-12Record Chromium merge at DEPS revision 288042Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I69c1c98fd1de188e46d4a787df25cbb57e27bce7
2014-08-12Merge from Chromium at DEPS revision 288042Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I583602ff16d735199f1810565c9296e970ce2854
2014-07-20Record Chromium merge at DEPS revision 284076Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I0623b8c250d66d05d70d1cc78c33efad8966c450
2014-07-20Merge from Chromium at DEPS revision 284076Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I9a279485b02fe7ceddcd32d992a714ff132e99ae
2014-07-18Cherry pick crrev.com/281310Ben Murdoch
Fix the build in master. Original description: [Android WebView] Supress focus change when temporarily detached. The AwContents container view may be "temporarily detached" by the view system during certain layout operations e.g. if it is a child of a ListView. In this case, we should ignore changes to focus to avoid unnecessary churn and loss of state, e.g. when text is selction the focus toggle results in an action bar toggle and loss of the text selection. BUG=391282 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=281310 Change-Id: I1ccd6600da05c991a68256bf08d10448afdbb015
2014-07-01Cherrypick: [android_webview] Fix Android.mk module dependencies.mkosiba@chromium.org
Cherrypick Chromium r280319 to fix constant rebuilds of android_webview_java: > LOCAL_ADDITIONAL_DEPENDENCIES works on the file level, not phony > target level, so the current rule results in rebuilding the > android_webview_java target whenever we run make. > > BUG=389534 > TEST=compile on android_aosp bot > NOTRY=true > > Review URL: https://codereview.chromium.org/332343007 > > git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280319 0039d316-1c4b-4281-b951-d872f2087c98 Bug: 15598761 Change-Id: I6a1da1a1ee829e962ada76107fb0109aac0c8da5
2014-06-25Fix build break on mirror-aosp-masterJeff Tinker
Handle ResourceBusyException generically, as is being done upstream, so the addition doesn't break mirror-aosp-master. bug: 13792521 Change-Id: I0ee09f7e1274503bff8a3b17cdea0baf700c9343
2014-06-25Merge "Handle ResourceBusyException from MediaDrm.openSession"Jeff Tinker
2014-06-25Cherry-pick: cc: Update draw if external draw constraints changeboliu@chromium.org
Cherry-pick of chromium r279497 BUG: 15771111 Change-Id: I64ab8eb88df737ab5b9f40a6113efd9a20984c5b
2014-06-25Record merge of cherrypicked r279402.Torne (Richard Coles)
Change-Id: I4b23ef54138d4fbbbf3568632e4c758a90f21e17
2014-06-25Merge cherrypicked r279402 to fix checkbuild.Torne (Richard Coles)
Change-Id: I903284c842b92ff0c41ba257d654f6c15037bb15
2014-06-25Record Chromium merge at DEPS revision 278856Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ie1194b85b7623586fb60c833079804a980ac4fe9
2014-06-25Merge from Chromium at DEPS revision 278856Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
2014-06-23Handle ResourceBusyException from MediaDrm.openSessionJeff Tinker
bug: 13792521 Change-Id: I123083f60b1af3b7030978bb3ca50b73b4a71daa
2014-06-20Record Chromium merge at DEPS revision 278205Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I84d3495e3078c96740b1d3831b959702b8a8270f
2014-06-20Merge from Chromium at DEPS revision 278205Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
2014-06-09Record Chromium merge at DEPS revision 275586Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ibb07a5b1a142827e6180486055012f6ff7c663b4
2014-06-09Merge from Chromium at DEPS revision 275586Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ief3a0ffd810858bfddbe0ec5931e3ee90d53f78c
2014-06-03Record Chromium merge at DEPS revision 273901Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ib458e3529c563112182d0de32f82bd7cf99d15d9
2014-06-03Merge from Chromium at DEPS revision 273901Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I45745444894df927ffc1045ab8de88b9e52636a3
2014-05-15Record Chromium merge at DEPS revision 269467Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ia54dac0ca1731464f335e65ec34cfe89ace7bde3
2014-05-15Merge from Chromium at DEPS revision 269467Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Id6c03d44b5ad8b098017a943eb9ec8d804dfed99
2014-05-14Record Chromium merge at DEPS revision 269336Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ib93a52e6d88bd64d802b3215bc21cd13dd477ef1
2014-05-14Merge from Chromium at DEPS revision 269336Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
2014-05-08Cherry pick: [Android] Ignore isSystemKey from the framework.Primiano Tucci
BUG: 14438911 Upstream bug description: [Android] Ignore isSystemKey from the framework. Force isSystemKey flag to false as the Android framework is changing this behavior and this is breaking DPAD keys. Review URL: https://codereview.chromium.org/267903005/ Change-Id: Ic0711886412640696ad9cfca04877046a6b588bb
2014-05-01Record Chromium merge at DEPS revision 267519Bo Liu
This commit was generated by merge_to_master.py. Change-Id: I6eb7fca1258141c890d874b8d8323a28844ea65d
2014-05-01Merge from Chromium at DEPS revision 267519Bo Liu
This commit was generated by merge_to_master.py. Change-Id: I6002987b71e09742c68bad9c834ae800ff531f25
2014-04-24Record Chromium merge at DEPS revision 265802Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: Icb0aebd0dc2404f267828aed562eadc42abec196
2014-04-24Merge from Chromium at DEPS revision 265802Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I6fac2dbbce472b18ca943b6e6f247835b0bd6281
2014-04-16Record Chromium merge at DEPS revision 263965Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I760ba2dcd4649666ee884efc2aba9988d9ab5b1c
2014-04-16Merge from Chromium at DEPS revision 263965Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: Ia1121eddd985123f160afde6372525c3d25975bf
2014-04-10Record Chromium merge at DEPS revision 262940Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I1358168b2282cf7879bd411b282d7388359df36e
2014-04-10Merge from Chromium at DEPS revision 262940Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I9a3fddbb29857fa8f68a18c6a0115862b65f84d1
2014-04-03Build fix for arm64.Torne (Richard Coles)
Temporarily land part of the multilib makefile changes to fix the 32-bit webrtc build for arm64 devices. Change-Id: Id8e11c46cc3538462e264fdc1a3dc5a35b440f9e
2014-04-03Record Chromium merge at DEPS revision 261286Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I354b4ee324ca6815fb36f003d48095fc50042ac6
2014-04-03Merge from Chromium at DEPS revision 261286Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: Iea9643ce91618057f128e9a5b62c07be152f2b89
2014-04-01Record Chromium merge at DEPS revision 260540Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: Ia63046153d8a5677d968e2e0c5cc5675b738600c
2014-04-01Merge from Chromium at DEPS revision 260540Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I10b8e4931992bb84eb4da800a337bbd0a52f6588
2014-03-31Record Chromium merge at DEPS revision 260458Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: Ibfa57fd5cfbed5946037837208613409d67e7acb
2014-03-31Merge from Chromium at DEPS revision 260458Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
2014-03-28am e59035f6: (-s ours) am aae83847: Merge "Update makefiles following gyp ↵Torne (Richard Coles)
r1857 cherrypick." * commit 'e59035f6c67d799b8ccb94cd820516f913ec19f6': Update makefiles following gyp r1857 cherrypick.
2014-03-25am 4ff61be6: (-s ours) am e30cd064: Merge "external/chromium_org: add dummy ↵Colin Cross
arm64 makefile" * commit '4ff61be6c6433b4a753f41135998ff53bc6e1dd1': external/chromium_org: add dummy arm64 makefile
2014-03-21Record Chromium merge at DEPS revision 258528Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: If044de5ce66330789e678d8d4a60f57f3cabf446
2014-03-21Merge from Chromium at DEPS revision 258528Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Id197cbdde2c2881915f096c0426c741416884783
2014-03-18Record Chromium merge at DEPS revision 257591Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Iff99a605ab8e02af4fc85e3ec6e7695b04505ae7
2014-03-18Merge from Chromium at DEPS revision 257591Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
2014-02-25am aae83847: Merge "Update makefiles following gyp r1857 cherrypick."Torne (Richard Coles)
* commit 'aae83847a4027579ec1d3bf1f52530de51636491': Update makefiles following gyp r1857 cherrypick.
2014-02-25Merge "Update makefiles following gyp r1857 cherrypick."Torne (Richard Coles)
2014-02-25Update makefiles following gyp r1857 cherrypick.Torne (Richard Coles)
gyp r1857 was cherrypicked to fix an issue with assembly source files on 64-bit hosts; regenerate the makefiles. Change-Id: I6587253cb18082c8ced3a5d735b06ca328ab34bf
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 22:54:20 +0000