summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-05-01Keep LTR selection within the text range.android-4.3_r3.1android-4.3_r3android-4.3_r2.3android-4.3_r2.2android-4.3_r2.1android-4.3_r2android-4.3_r1.1android-4.3_r1android-4.3_r0.9.1android-4.3_r0.9android-4.3.1_r1jb-mr2.0.0-releasejb-mr2.0-releasejb-mr2-releaseGeorge Mount
Bug 8556162 The end caret position for LTR text can be one beyond the range of the text. This change places the selection region back into the text so that the proper text is selected. Change-Id: I470ee5e3438190aab9f5fb12deca95249d9d887e
2013-04-09Add liblogYing Wang
Bug: 8580410 Change-Id: I17bdc7cec475a9d730d08b96ffbedd5401f5da56
2013-04-05Switch to prebuilt bisonYing Wang
Now we have prebuilt bison 2.7 for both Linux and Mac OS X. We don't need the LOCAL_BISON or LOCAL_YACC any more. Bug: 8517572 Change-Id: I11319b7e154bbfe6355c98bd1d7f5f22ed727f85
2013-04-04Rename old chromium logtag to chromium_netKristian Monsen
This is to make it easier to see what is from the chromium library and what is from the chromium_net library. Change-Id: Idb3a660aa7d864d68691743bd15f0ce59cd4dae2
2013-04-04Build fix with newer bison 2.6Wink Saville
From: http://trac.webkit.org/changeset/124099 Bug: 8517572 Change-Id: Iaead93f01d6a86180c21e320ef56a4620619ce00
2013-04-01DO NOT MERGE Fix memory leak when creating SkBitmapProcShaderBjörn Isaksson
cherry pick from AOSP/master A SkShader is ref counted, but the first but unref() was never called for the local reference in PlatformGraphicsContextSkia::drawBitmapPattern(). Change-Id: I2d1a2e95eeaf479e332a2dbd4e1e9f1b8baac0f7
2013-03-26Ignore d6f13da9Jean-Baptiste Queru
2013-03-26am 30ca089e: Merge "Tweaks for forward compatibility"Jean-Baptiste Queru
* commit '30ca089e04a091c4eea95d62185d120a61f0e0ba': Tweaks for forward compatibility
2013-03-26Merge "Tweaks for forward compatibility"Jean-Baptiste Queru
2013-03-11am d5a63fb6: am 1ea06700: am cf076e61: (-s ours) am 61c04aad: (-s ours) ↵Jean-Baptiste Queru
Reconcile with jb-mr1-release - do not merge * commit 'd5a63fb6d763551b31f0dd9563ccc17e4652094b':
2013-03-11am 1ea06700: am cf076e61: (-s ours) am 61c04aad: (-s ours) Reconcile with ↵Jean-Baptiste Queru
jb-mr1-release - do not merge * commit '1ea067001d14ae1a5eb52c9e8c27a9fd9b109c78':
2013-03-11am cf076e61: (-s ours) am 61c04aad: (-s ours) Reconcile with jb-mr1-release ↵Jean-Baptiste Queru
- do not merge * commit 'cf076e61dbf727a931a6be1cc2811d795a165f77':
2013-03-11am 61c04aad: (-s ours) Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru
* commit '61c04aad1e2313a22822173f3776b85d664984ae':
2013-03-11Reconcile with jb-mr1-release - do not mergeJean-Baptiste Queru
2013-03-07Remove reference to ganeshJean-Baptiste Queru
Change-Id: I26c5f6348cea0018a8129e0e6ffdb3b0cfe61d82
2013-03-06Tweaks for forward compatibilityJean-Baptiste Queru
Change-Id: I136fcbbc14072ee5f5281d09445f28d083ed3ce1
2013-03-05am 59ef364a: Merge "Tracking libcore change to use longs instead of ints to ↵Brian Carlstrom
store pointers in OpenSSL binding" * commit '59ef364a8888ce8ec05d55f9093536ecf6d43aa6': Tracking libcore change to use longs instead of ints to store pointers in OpenSSL binding
2013-03-04Merge "Tracking libcore change to use longs instead of ints to store ↵Brian Carlstrom
pointers in OpenSSL binding"
2013-02-27Tracking libcore change to use longs instead of ints to store pointers in ↵Brian Carlstrom
OpenSSL binding Change-Id: I819170e26536bdf8f37fda4986506b029be5ebd3
2013-02-22Fix assignment type.Ying Wang
Actually I need a new commit to kick the build cache scheduler :-). Change-Id: Icecda566e3d2f5a12be29580c6ce83a5be8dbb3c
2013-02-22Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'Derek Sollenberger
bug: 6906025
2013-02-21Update SkCanvas subclass to override the proper superclass virtuals.Derek Sollenberger
bug: 8167188 Change-Id: Ica8d741cfde62a161e24f3558471d2c190f7fe5e
2013-02-20am 8f409a96: Merge remote-tracking branch \'goog/jb-mr2-release\'Ed Heyl
* commit '8f409a964f8ece608f4eb34fe5c7d23ec16c8687': Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE
2013-02-20Merge remote-tracking branch 'goog/jb-mr2-release'Ed Heyl
2013-02-19merge in jb-mr2-release history after reset to masterThe Android Automerger
2013-02-15am fcc2b346: fix build: SurfaceTextureClient to Surface renameMathias Agopian
* commit 'fcc2b346069b347a4a2fc2615c548ad5f01808c0': fix build: SurfaceTextureClient to Surface rename
2013-02-15fix build: SurfaceTextureClient to Surface renameMathias Agopian
Change-Id: I4fffda5c0ad18b8693e731427a98a98d8270cf76
2013-02-15am 50dbebbe: fix build: SurfaceTextureClient to Surface renameMathias Agopian
* commit '50dbebbe7b246a0756c750ff18d5b77d6e4a2a68': fix build: SurfaceTextureClient to Surface rename
2013-02-15fix build: SurfaceTextureClient to Surface renameMathias Agopian
Change-Id: I47f20c1df5c6427c37b0b276f86ba3cca1cb0caa
2013-02-15am 4533237f: Refactoring: Rename SurfaceTextureClient to SurfaceMathias Agopian
* commit '4533237f156ff61f2486d0e6d748eafa8ce4d3d3': Refactoring: Rename SurfaceTextureClient to Surface
2013-02-14am 5b2c15ff: [build fix] fallout from getting rid of ANDROID_VIEW_SURFACE_JNI_IDMathias Agopian
# Via Mathias Agopian * commit '5b2c15ff431547571fa3964c3cae937b657efe60': [build fix] fallout from getting rid of ANDROID_VIEW_SURFACE_JNI_ID
2013-02-14Refactoring: Rename SurfaceTextureClient to SurfaceMathias Agopian
Change-Id: I41134fe88716917ce4327293335fa116f44fabe3
2013-02-14[build fix] fallout from getting rid of ANDROID_VIEW_SURFACE_JNI_IDMathias Agopian
Change-Id: Ic7cc4d48587079cd57ac9f3afefccd9a003247c1
2013-02-13Revert "Merge remote-tracking branch 'goog/master-chromium' into ↵Chris Craik
'goog/master'" DO NOT MERGE This reverts commit 77437f7411c2a1b6eed9e8635cd1d79c216064af, reversing changes made to 97df262f2fd351a399bc757d3f7e7c7bb3b00065. Change-Id: I594d7f423efce65f02b7ac14aff875aa22742ad0
2013-02-13am 455b1078: (-s ours) Revert "Merge remote-tracking branch ↵Chris Craik
\'goog/master-chromium\' into \'goog/master\'" DO NOT MERGE # Via Chris Craik * commit '455b107800e69ea7615ffad1a83bb250d699f6ae': Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE
2013-02-13Revert "Merge remote-tracking branch 'goog/master-chromium' into ↵Chris Craik
'goog/master'" DO NOT MERGE This reverts commit 77437f7411c2a1b6eed9e8635cd1d79c216064af, reversing changes made to 97df262f2fd351a399bc757d3f7e7c7bb3b00065. Change-Id: I594d7f423efce65f02b7ac14aff875aa22742ad0
2013-02-12am e6057f8f: Merge "Fix compilation warning for list of initialization ↵John Reck
constructor arguments after bae7aeaa87." # By Oleg Smirnov # Via Gerrit Code Review (1) and Oleg Smirnov (1) * commit 'e6057f8fac4f62027696d0be56dd77cbe8d7b00d': Fix compilation warning for list of initialization constructor arguments after bae7aeaa87.
2013-02-12Merge "Fix compilation warning for list of initialization constructor ↵John Reck
arguments after bae7aeaa87."
2013-02-11Fix compilation warning for list of initialization constructor argumentsOleg Smirnov
after bae7aeaa87. Change-Id: I75716404cfeb76d2d79efb94c82d57345e3e9932
2013-02-05Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'Derek Sollenberger
bug: 6906025
2013-02-04Changes needed to roll Skia to r7527.Derek Sollenberger
Change-Id: Icf9f0a42d8c84385a70b15a72d2d040eb96d942a
2013-01-30am 97df262f: am b6cb93cf: am ae0bf538: Merge "Avoid members with the same ↵John Reck
base name in ar\'s archives" # By dvshkurk # Via Android Git Automerger (2) and others * commit '97df262f2fd351a399bc757d3f7e7c7bb3b00065': Avoid members with the same base name in ar's archives
2013-01-30am b6cb93cf: am ae0bf538: Merge "Avoid members with the same base name in ↵John Reck
ar\'s archives" # By dvshkurk # Via Android Git Automerger (1) and others * commit 'b6cb93cfb62e26168298b6f6e606af379350b064': Avoid members with the same base name in ar's archives
2013-01-30am ae0bf538: Merge "Avoid members with the same base name in ar\'s archives"John Reck
# By dvshkurk # Via Gerrit Code Review (1) and Shuo Gao (1) * commit 'ae0bf538d04d4d64cec2d753dc633a731cf45daa': Avoid members with the same base name in ar's archives
2013-01-30Merge "Avoid members with the same base name in ar's archives"jb-mr1-dev-plus-aospJohn Reck
2013-01-29Avoid members with the same base name in ar's archivesdvshkurk
Change-Id: I4f45bba09476b9e8fbc5c73761addcec964962d4 Author: Dmitry Shkurko <Dmitry.V.Shkurko@intel.com> Signed-off-by: Dmitry Shkurko <Dmitry.V.Shkurko@intel.com> Singed-off-by: Shuo Gao <shuo.gao@intel.com> Signed-off-by: Bruce Beare <bruce.j.beare@intel.com> Signed-off-by: Jack Ren <jack.ren@intel.com> Author-tracking-BZ:47091
2013-01-22fix for broken merge resolution in Ia2c5Derek Sollenberger
Change-Id: Id65f22a7e972511047feb06d3d382819e63c9d7d
2013-01-22Merge "resolved conflicts for merge of 9dbf86ac to master-chromium" into ↵Derek Sollenberger
master-chromium
2013-01-22resolved conflicts for merge of 9dbf86ac to master-chromiumDerek Sollenberger
Change-Id: Ia2c5a9c5c4cfc280b46ca7b403599059131f8d7c
2013-01-22Fix for API change between versions of Skia.Derek Sollenberger
Change-Id: Ibec874144d382f1e4ce60f923eab3adcc1d642e0
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-26 19:41:30 +0000