summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Expand)AuthorAgeFilesLines
* am 284e9fee: am c8d518ba: Merge "properly convert data from utf-16 to utf-8 i...Victoria Lease2012-05-241-3/+3
|\
| * Merge "properly convert data from utf-16 to utf-8 in LoadData()" into jb-devVictoria Lease2012-05-241-3/+3
| |\
| | * properly convert data from utf-16 to utf-8 in LoadData()Victoria Lease2012-05-241-3/+3
* | | am 9bada0c1: am 39ba1a3a: Merge "Don\'t send selection info to WebView for un...George Mount2012-05-241-1/+5
|\ \ \ | |/ /
| * | Merge "Don't send selection info to WebView for unrendered selections." into ...George Mount2012-05-241-1/+5
| |\ \
| | * | Don't send selection info to WebView for unrendered selections.George Mount2012-05-231-1/+5
* | | | am cd6a3bff: am 6f4fd96b: Merge "Don\'t set up background images if 1x1" into...Nicolas Roard2012-05-232-6/+12
|\ \ \ \ | |/ / /
| * | | Merge "Don't set up background images if 1x1" into jb-devNicolas Roard2012-05-232-6/+12
| |\ \ \
| | * | | Don't set up background images if 1x1Nicolas Roard2012-05-232-6/+12
| | |/ /
* | | | am 3b6f13bd: am 596f7241: Merge "Use Surface areas to compute tile usage" int...Chris Craik2012-05-235-20/+30
|\ \ \ \ | |/ / /
| * | | Merge "Use Surface areas to compute tile usage" into jb-devChris Craik2012-05-235-20/+30
| |\ \ \
| | * | | Use Surface areas to compute tile usageChris Craik2012-05-235-20/+30
| | | |/ | | |/|
* | | | am f942c7b1: am 21ed283c: Merge "Add tracing to interesting/potentially costl...Chris Craik2012-05-233-0/+5
|\ \ \ \ | |/ / /
| * | | Merge "Add tracing to interesting/potentially costly functions" into jb-devChris Craik2012-05-233-0/+5
| |\ \ \
| | * | | Add tracing to interesting/potentially costly functionsChris Craik2012-05-233-0/+5
| | |/ /
* | | | am 5557efbd: am 17f16d58: Merge "Clean up the transferQueue code and add more...Teng-Hui Zhu2012-05-232-55/+11
|\ \ \ \ | |/ / /
| * | | Merge "Clean up the transferQueue code and add more detailed GL log" into jb-devTeng-Hui Zhu2012-05-232-55/+11
| |\ \ \ | | |_|/ | |/| |
| | * | Clean up the transferQueue code and add more detailed GL logTeng-Hui Zhu2012-05-232-55/+11
* | | | am 1d1eaec5: am a6645da2: Merge "Correctly handle the EGL context recreation....Teng-Hui Zhu2012-05-232-24/+21
|\ \ \ \ | |/ / /
| * | | Merge "Correctly handle the EGL context recreation." into jb-devTeng-Hui Zhu2012-05-232-24/+21
| |\ \ \ | | |/ /
| | * | Correctly handle the EGL context recreation.Teng-Hui Zhu2012-05-232-24/+21
* | | | am 344434ac: am 7f33cb9c: Merge "Fix crash" into jb-devNicolas Roard2012-05-231-0/+2
|\ \ \ \ | |/ / /
| * | | Merge "Fix crash" into jb-devNicolas Roard2012-05-231-0/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Fix crashNicolas Roard2012-05-231-0/+2
* | | | am 311b8af6: am 55d60259: Merge "Don\'t use an ImageBuffer for scratchContext...John Reck2012-05-222-1/+21
|\ \ \ \ | |/ / /
| * | | Merge "Don't use an ImageBuffer for scratchContext()" into jb-devJohn Reck2012-05-222-1/+21
| |\ \ \ | | |/ / | |/| |
| | * | Don't use an ImageBuffer for scratchContext()John Reck2012-05-222-1/+21
* | | | am ee7dbc2a: am 56ec1c56: Merge "We need to clear the items even when seeing ...Teng-Hui Zhu2012-05-221-0/+1
|\ \ \ \ | |/ / /
| * | | Merge "We need to clear the items even when seeing obsolete tiles" into jb-devTeng-Hui Zhu2012-05-221-0/+1
| |\ \ \ | | |/ / | |/| / | | |/
| | * We need to clear the items even when seeing obsolete tilesTeng-Hui Zhu2012-05-221-0/+1
* | | am 697d71c9: am 45aaa37e: Merge "Handle more favicon decoding error cases" in...John Reck2012-05-224-15/+25
|\ \ \ | |/ /
| * | Merge "Handle more favicon decoding error cases" into jb-devJohn Reck2012-05-224-15/+25
| |\ \
| | * | Handle more favicon decoding error casesJohn Reck2012-05-224-15/+25
| | |/
| * | DO NOT MERGE Consider fixed layers when scrolling the edit box.George Mount2012-05-221-0/+90
| |/
* | Merge "Remove unused WebViewCore::isPaused() and setIsPaused()"Steve Block2012-05-222-18/+0
|\ \
| * | Remove unused WebViewCore::isPaused() and setIsPaused()Steve Block2012-05-222-18/+0
* | | Merge "Use preemptive permissions policy for Geolocation"Steve Block2012-05-221-5/+0
|\ \ \
| * | | Use preemptive permissions policy for GeolocationSteve Block2012-05-221-5/+0
| |/ /
* | | am 3d964c36: am fa25b832: Merge "Null check" into jb-devJohn Reck2012-05-221-2/+3
|\ \ \ | |/ / |/| / | |/
| * Merge "Null check" into jb-devJohn Reck2012-05-221-2/+3
| |\
| | * Null checkJohn Reck2012-05-211-2/+3
* | | Remove the hacks used to suspend and resume the non-client-based Geolocation ...Steve Block2012-05-226-37/+0
* | | Hook up client-based Geolocation mockSteve Block2012-05-224-32/+91
* | | Always call back to new Geolocation requestsSteve Block2012-05-223-3/+32
* | | Switch to client-based GeolocationSteve Block2012-05-2218-373/+645
* | | am f282a4d1: am 37289e42: Merge "Disable transform fudging for merged surface...Chris Craik2012-05-212-1/+8
|\ \ \ | |/ /
| * | Merge "Disable transform fudging for merged surfaces" into jb-devChris Craik2012-05-212-1/+8
| |\ \
| | * | Disable transform fudging for merged surfacesChris Craik2012-05-212-1/+8
* | | | am 13c0becf: am db197e8d: Merge "Real isn\'t real according to the USPS, but ...John Reck2012-05-211-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Real isn't real according to the USPS, but add it anyway" into jb-devJohn Reck2012-05-211-1/+1
| |\ \ \