summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "add missing include"Mathias Agopian2012-03-231-0/+1
|\
| * add missing includeMathias Agopian2012-03-231-0/+1
* | Fix TilesManager race conditionJohn Reck2012-03-234-29/+13
|/
* Merge "reimplement BaseLayerAndroid as a LayerAndroid subclass"Chris Craik2012-03-2347-1756/+311
|\
| * reimplement BaseLayerAndroid as a LayerAndroid subclassChris Craik2012-03-2247-1756/+311
* | Merge "Null out m_canvas if HTMLCanvasElement is destroyed"John Reck2012-03-223-16/+25
|\ \
| * | Null out m_canvas if HTMLCanvasElement is destroyedJohn Reck2012-03-223-16/+25
| |/
* | Add missing null checkJohn Reck2012-03-221-1/+1
|/
* Fix pure color check to be performed pre-visual indicatorJohn Reck2012-03-218-9/+25
* Merge "Visual Indicator tweaks"John Reck2012-03-2110-287/+33
|\
| * Visual Indicator tweaksJohn Reck2012-03-2110-287/+33
* | Fix location of selection handles on rotated text.George Mount2012-03-211-1/+19
* | Merge "Make paste window and caret handle show up at the right time."George Mount2012-03-212-14/+20
|\ \
| * | Make paste window and caret handle show up at the right time.George Mount2012-03-202-14/+20
* | | Plumb WebView and WebViewCore thru to MediaLayerJonathan Dixon2012-03-216-28/+23
* | | Merge "Attempt to fix the GPL build"John Reck2012-03-201-2/+1
|\ \ \
| * | | Attempt to fix the GPL buildJohn Reck2012-03-201-2/+1
| | |/ | |/|
* | | Remove unnecessary invertedTileSwitchJohn Reck2012-03-205-27/+1
|/ /
* | Merge "Canvas on a texture"John Reck2012-03-2015-34/+697
|\ \
| * | Canvas on a textureJohn Reck2012-03-2015-34/+697
* | | Fix scrolling on sites that use <frame>sMangesh Ghiware2012-03-192-4/+17
* | | Merge "Draw vertical text using by setting verticalText flag in SkPaint."Derek Sollenberger2012-03-191-19/+20
|\ \ \
| * | | Draw vertical text using by setting verticalText flag in SkPaint.Derek Sollenberger2012-03-141-19/+20
* | | | Merge "Fix selection positioning for RTL languages"Russell Brenner2012-03-161-2/+2
|\ \ \ \
| * | | | Fix selection positioning for RTL languagesRussell Brenner2012-03-161-2/+2
* | | | | Merge "Paint tiles with the PaintTileOperation's painter"Chris Craik2012-03-166-17/+11
|\ \ \ \ \
| * | | | | Paint tiles with the PaintTileOperation's painterChris Craik2012-03-166-17/+11
* | | | | | Merge "only report actual changes to matchCount"Victoria Lease2012-03-161-3/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | only report actual changes to matchCountVictoria Lease2012-03-161-3/+4
| | |_|_|/ | |/| | |
* | | | | Merge "Add libmedia_native"Glenn Kasten2012-03-161-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add libmedia_nativeGlenn Kasten2012-03-131-0/+1
* | | | | Update edit text size when the text changes so scroll works.George Mount2012-03-153-2/+42
| |/ / / |/| | |
* | | | Merge "Scroll cursor with edited text."George Mount2012-03-151-0/+1
|\ \ \ \
| * | | | Scroll cursor with edited text.George Mount2012-03-151-0/+1
* | | | | Merge "Add scrolling editable text with a finger drag."George Mount2012-03-152-25/+89
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Add scrolling editable text with a finger drag.George Mount2012-03-142-25/+89
| | |/ | |/|
* | | Merge "Remove gmail specific mime code from webview"Selim Gurun2012-03-142-12/+3
|\ \ \
| * | | Remove gmail specific mime code from webviewSelim Gurun2012-03-142-12/+3
* | | | Merge "Refresh fonts when system locale is changed"Russell Brenner2012-03-144-0/+87
|\ \ \ \
| * | | | Refresh fonts when system locale is changedRussell Brenner2012-03-144-0/+87
* | | | | Merge "use scale 1 when no GLWebViewState"Chris Craik2012-03-141-2/+5
|\ \ \ \ \
| * | | | | use scale 1 when no GLWebViewStateChris Craik2012-03-131-2/+5
| |/ / / /
* | | | | Fix layers ordering issue with Absolute positioned elementsNicolas Roard2012-03-138-66/+121
| |_|/ / |/| | |
* | | | Merge "Support "prev" for IME input."George Mount2012-03-131-11/+8
|\ \ \ \
| * | | | Support "prev" for IME input.George Mount2012-03-121-11/+8
| | |_|/ | |/| |
* | | | Fix tile discard, acquire, transfer, crashChris Craik2012-03-121-2/+3
| |/ / |/| |
* | | replace XLOGC/XLOG with ALOGD/ALOGVChris Craik2012-03-1243-1170/+567
* | | resolved conflicts for merge of f6d49173 to masterDerek Sollenberger2012-03-127-108/+19
|\ \ \ | |/ / |/| |
| * | am ff1fac5a: am 1969832e: Merge "Update WebKit with necessary changes for the...Derek Sollenberger2012-03-127-112/+19
| |\ \
| | * \ am 1969832e: Merge "Update WebKit with necessary changes for the Skia merge."Derek Sollenberger2012-03-127-112/+19
| | |\ \