summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | 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
* | | 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
| |/ /
* | | 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
| | |/ | |/|
* | | 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
| |/ /
* | | 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
* | | 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
* | | Merge "Fix crash" into jb-devNicolas Roard2012-05-231-0/+2
|\ \ \ | |_|/ |/| |
| * | Fix crashNicolas Roard2012-05-231-0/+2
* | | 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
* | | 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
* | 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 "Null check" into jb-devJohn Reck2012-05-221-2/+3
|\
| * Null checkJohn Reck2012-05-211-2/+3
* | 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
* | | Merge "Real isn't real according to the USPS, but add it anyway" into jb-devJohn Reck2012-05-211-1/+1
|\ \ \
| * | | Real isn't real according to the USPS, but add it anywayJohn Reck2012-05-211-1/+1
| | |/ | |/|
* | | Merge "Turn off autohinting at HDPI. do not merge" into jb-devBilly Hewlett2012-05-211-0/+4
|\ \ \ | |/ / |/| |
| * | Turn off autohinting at HDPI. do not mergeBilly Hewlett2012-05-211-0/+4
| |/
* | Merge "Switch to a 4ms/1s timer" into jb-devJohn Reck2012-05-213-4/+10
|\ \
| * | Switch to a 4ms/1s timerJohn Reck2012-05-183-4/+10
* | | Add checks for null base layer contentChris Craik2012-05-211-2/+2
| |/ |/|
* | Fix memory leak and repaint issues with fixed background elementsNicolas Roard2012-05-185-17/+29
* | Merge "Revert part of "Fix iframe, ..."" into jb-devMangesh Ghiware2012-05-185-1/+87
|\ \
| * | Revert part of "Fix iframe, ..."Mangesh Ghiware2012-05-185-1/+87
* | | Remove paint tile operations for stale paintersChris Craik2012-05-187-2/+46
* | | Merge "Cherrypick WebKit r94543." into jb-devVictoria Lease2012-05-188-5/+52
|\ \ \
| * | | Cherrypick WebKit r94543.Victoria Lease2012-05-188-5/+52
* | | | Merge "Clean up some redundant code" into jb-devTeng-Hui Zhu2012-05-182-6/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Clean up some redundant codeTeng-Hui Zhu2012-05-172-6/+2
* | | | Make sure CanvasLayer isn't merged and is initialized correctlyJohn Reck2012-05-173-1/+4
* | | | Merge "Workaround double texture removal" into jb-devBart Sears2012-05-171-1/+5
|\ \ \ \
| * | | | Workaround double texture removalChris Craik2012-05-171-1/+5
| | |_|/ | |/| |
* | | | Fix repaint glitches on merged layersNicolas Roard2012-05-171-1/+2
* | | | Fix invalidations sent to frameworkNicolas Roard2012-05-1712-19/+57
| |/ / |/| |
* | | Merge "Fix mouse nudging in hit test" into jb-devJohn Reck2012-05-171-13/+20
|\ \ \
| * | | Fix mouse nudging in hit testJohn Reck2012-05-171-13/+20
* | | | Merge "Fix the tile dirty and framework inval when in single Surface mode" in...Teng-Hui Zhu2012-05-175-23/+82
|\ \ \ \ | |_|/ / |/| | |