summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am 78d0003d: Better fix for crash workaroundNicolas Roard2012-05-091-6/+2
|\
| * Better fix for crash workaroundNicolas Roard2012-05-081-6/+2
* | am 57609831: Complete implementation fixed background - extract image for bod...Nicolas Roard2012-05-0912-101/+293
|\ \ | |/
| * Complete implementation fixed backgroundNicolas Roard2012-05-0812-101/+293
* | am 35caaaf7: Disable prerenders if we aren\'t focusedJohn Reck2012-05-093-2/+41
|\ \ | |/
| * Disable prerenders if we aren't focusedJohn Reck2012-05-083-2/+41
* | am 828c3a7d: Merge "Pass webview instance when getting base layer / color, an...Chris Craik2012-05-091-13/+13
|\ \ | |/
| * Merge "Pass webview instance when getting base layer / color, and prevent nul...Chris Craik2012-05-081-13/+13
| |\
| | * Pass webview instance when getting base layer / color, and prevent null valueChris Craik2012-05-081-13/+13
* | | am 7f83c77c: Merge "Set the default scrollTo back to animate = false" into jb...John Reck2012-05-091-1/+1
|\ \ \ | |/ /
| * | Merge "Set the default scrollTo back to animate = false" into jb-devJohn Reck2012-05-081-1/+1
| |\ \
| | * | Set the default scrollTo back to animate = falseJohn Reck2012-05-081-1/+1
| | |/
* | | am 418e065c: Fix visible area calculation.Mangesh Ghiware2012-05-097-11/+26
|\ \ \ | |/ /
| * | Fix visible area calculation.Mangesh Ghiware2012-05-087-11/+26
| |/
* | am e19b4847: Merge "Replace tree observer with a JNI call at draw time" into ...Teng-Hui Zhu2012-05-091-19/+14
|\ \ | |/
| * Merge "Replace tree observer with a JNI call at draw time" into jb-devTeng-Hui Zhu2012-05-081-19/+14
| |\
| | * Replace tree observer with a JNI call at draw timeTeng-Hui Zhu2012-05-071-19/+14
* | | am c2749f95: Merge "Delay creating Java objects for WebHistoryItem" into jb-devJohn Reck2012-05-095-90/+194
|\ \ \ | |/ /
| * | Merge "Delay creating Java objects for WebHistoryItem" into jb-devJohn Reck2012-05-085-90/+194
| |\ \
| | * | Delay creating Java objects for WebHistoryItemJohn Reck2012-05-075-90/+194
* | | | am d65e985b: Merge "Cherry-pick WebKit change r104441 to fix a rendering cras...Steve Block2012-05-091-1/+1
|\ \ \ \ | |/ / /
| * | | Merge "Cherry-pick WebKit change r104441 to fix a rendering crash" into jb-devSteve Block2012-05-081-1/+1
| |\ \ \
| | * | | Cherry-pick WebKit change r104441 to fix a rendering crashSteve Block2012-05-031-1/+1
* | | | | am af5fa119: Merge changes Ie015bf4c,If5e731ad into jb-devSteve Block2012-05-091-8/+15
|\ \ \ \ \ | |/ / / /
| * | | | Merge changes Ie015bf4c,If5e731ad into jb-devSteve Block2012-05-081-8/+15
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| |
| | * | Cherry-pick WebKit change r98561 to fix a rendering crashSteve Block2012-04-271-0/+5
| | * | Cherry-pick WebKit change r96294 as a prerequisite for r98561Steve Block2012-04-271-8/+10
* | | | am b3d68a4f: Merge "Replace Lohit Devanagari/Tamil fonts with Droid versions....Victoria Lease2012-05-081-4/+16
|\ \ \ \ | |/ / /
| * | | Merge "Replace Lohit Devanagari/Tamil fonts with Droid versions." into jb-devVictoria Lease2012-05-071-4/+16
| |\ \ \
| | * | | Replace Lohit Devanagari/Tamil fonts with Droid versions.Victoria Lease2012-04-301-4/+16
* | | | | am 17a3b1ef: Merge "Disable prerenders while scrolling" into jb-devJohn Reck2012-05-085-10/+15
|\ \ \ \ \ | |/ / / /
| * | | | Merge "Disable prerenders while scrolling" into jb-devJohn Reck2012-05-075-10/+15
| |\ \ \ \
| | * | | | Disable prerenders while scrollingJohn Reck2012-05-065-10/+15
* | | | | | am 353e1be7: Merge "Fix ssl client certs to use the private key ctx" into jb-devSelim Gurun2012-05-071-38/+56
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge "Fix ssl client certs to use the private key ctx" into jb-devSelim Gurun2012-05-071-38/+56
| |\ \ \ \ \
| | * | | | | Fix ssl client certs to use the private key ctxSelim Gurun2012-05-041-38/+56
* | | | | | | am a90fcfc4: Cherrypick WebKit r95959.Victoria Lease2012-05-071-1/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Cherrypick WebKit r95959.Victoria Lease2012-05-071-1/+7
| | |_|_|_|/ | |/| | | |
* | | | | | Merge "Fix anti-aliasing issues with dashed lines"Derek Sollenberger2012-05-071-0/+2
|\ \ \ \ \ \
| * | | | | | Fix anti-aliasing issues with dashed linesDerek Sollenberger2012-04-181-0/+2
* | | | | | | am 2c3ac3ef: Merge "Cherrypick WebKit r94508." into jb-devVictoria Lease2012-05-078-5/+58
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge "Cherrypick WebKit r94508." into jb-devVictoria Lease2012-05-078-5/+58
| |\ \ \ \ \ \
| | * | | | | | Cherrypick WebKit r94508.Victoria Lease2012-05-048-5/+58
* | | | | | | | am 5331af46: Merge "Ensure updateGLPositionsAndScale is called from updateLay...George Mount2012-05-075-11/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Ensure updateGLPositionsAndScale is called from updateLayerPosition." ...George Mount2012-05-075-11/+16
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Ensure updateGLPositionsAndScale is called from updateLayerPosition.George Mount2012-05-045-11/+16
* | | | | | | | am e712b54e: Merge "Broaden fast inval path" into jb-devJohn Reck2012-05-063-32/+41
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge "Broaden fast inval path" into jb-devJohn Reck2012-05-063-32/+41
| |\ \ \ \ \ \ \
| | * | | | | | | Broaden fast inval pathJohn Reck2012-05-043-32/+41
* | | | | | | | | am c4ea1619: Merge "Simplify hierarchy with fixed background Preliminary supp...Nicolas Roard2012-05-042-35/+49
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /