Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Merge WebKit r47420" | Andrei Popescu | 2009-08-19 | 32 | -407/+252 |
| | | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524. | ||||
* | Merge WebKit r47420 | Ben Murdoch | 2009-08-18 | 32 | -252/+407 |
| | |||||
* | Merge commit 'goog/master' into merge | Ben Murdoch | 2009-08-18 | 1 | -46/+63 |
|\ | | | | | | | | | | | | | Conflicts: WebCore/bindings/v8/ScriptController.cpp WebCore/page/Geolocation.cpp WebCore/platform/android/GeolocationServiceAndroid.cpp | ||||
| * | Be more restrictive when expanding iframes. | Patrick Scott | 2009-08-17 | 1 | -46/+63 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | If an iframe has no scrollbars and a fixed dimension, it serves no purpose to try and expand the contents. Some sites like to use hidden iframes for asynchronous loading and showing or expanding those iframes causes layout problems. Change the expansion logic slightly to only expand iframes and not contract them. Also update calcWidth and calcHeight to check for scrollbars or a non-fixed dimension. BUG=2039520,2004093 | ||||
* | | Compilation fixes. | Ben Murdoch | 2009-08-17 | 1 | -2/+3 |
| | | |||||
* | | Fix merges and add #if PLATFORM(ANDROID) | Nicolas Roard | 2009-08-12 | 2 | -9/+3 |
| | | |||||
* | | Merge in WebKit r47029. | Ben Murdoch | 2009-08-11 | 158 | -3495/+6214 |
|/ | |||||
* | Another tweak for text wrap screen. We add a fixed padding when wrapping text | Grace Kloba | 2009-08-04 | 1 | -1/+10 |
| | | | | | around the screen width. If the block already has a padding, we should put it under consideration so that we won't add too much padding. | ||||
* | Fix 1635950. If the RenderBlock is positioned, don't wrap text to screen | Grace Kloba | 2009-08-03 | 1 | -1/+5 |
| | | | | width as it may cause text overlap. | ||||
* | Fix 1849037. Don't force text wrap to the screen if text is not autoWrap. | Grace Kloba | 2009-07-30 | 1 | -2/+3 |
| | |||||
* | Get WebKit r44544. | Feng Qian | 2009-06-17 | 131 | -2712/+3763 |
| | |||||
* | speedup some common matrix operations, to be submitted back | Mike Reed | 2009-06-11 | 2 | -1/+17 |
| | |||||
* | Fix a warning with an Android edit. | Patrick Scott | 2009-05-12 | 1 | -6/+6 |
| | |||||
* | AI 146317: Traverse the frame tree and compute the largest rectangle that ↵ | Patrick Scott | 2009-04-15 | 1 | -10/+13 |
| | | | | | | | | | | | | | holds all the frames. If this rectangle is larger than the computed content, make the frame's view size equal to the computed total so that the content will be the correct size. When expanded iframes, set the width and height to the content width and height plus the padding and border. BUG=1719555 Automated import of CL 146317 | ||||
* | AI 145796: Land the WebKit merge @r42026. | Feng Qian | 2009-04-10 | 176 | -8265/+12941 |
| | | | | Automated import of CL 145796 | ||||
* | AI 145074: Override calcWidth and calcHeight to compute the content dimensions. | Patrick Scott | 2009-04-08 | 2 | -4/+68 |
| | | | | | | | This fixes a few calls to calcWidth/calcHeight without doing a layout. BUG=1360169 Automated import of CL 145074 | ||||
* | AI 144458: Remove our hack to prevent drawing the selection, and set our ↵ | Leon Scroggins | 2009-04-03 | 2 | -22/+0 |
| | | | | | | selection color to transparent. This gets us the same result while simplifying the merge. Automated import of CL 144458 | ||||
* | AI 143691: am: CL 143663 am: CL 143479 Skip fit-to-column if the block has ↵ | Grace Kloba | 2009-03-31 | 1 | -2/+6 |
| | | | | | | | | | | | float:right in LTR or float:left in RTL. This should fix the layout problem in the docomo site. The downside is that we will not trigger fit-to-column for this category any more. Original author: klobag Merged from: //branches/cupcake/... Original author: android-build Merged from: //branches/donutburger/... Automated import of CL 143691 | ||||
* | Automated import from //branches/master/...@141440,141440 | Grace Kloba | 2009-03-24 | 1 | -0/+7 |
| | |||||
* | Automated import from //branches/master/...@140476,140476 | Grace Kloba | 2009-03-24 | 1 | -2/+3 |
| | |||||
* | auto import from //branches/cupcake/...@137873 | The Android Open Source Project | 2009-03-11 | 1 | -8/+12 |
| | |||||
* | auto import from //depot/cupcake/@136594 | The Android Open Source Project | 2009-03-05 | 176 | -6235/+10387 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 259 | -0/+68962 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 259 | -68962/+0 |
| | |||||
* | auto import from //branches/cupcake/...@125939 | The Android Open Source Project | 2009-01-09 | 3 | -31/+5 |
| | |||||
* | Code drop from //branches/cupcake/...@124589 | The Android Open Source Project | 2008-12-17 | 222 | -8965/+16121 |
| | |||||
* | Initial Contribution | The Android Open Source Project | 2008-10-21 | 62 | -1040/+1874 |
| | |||||
* | external/webkit r30707 | Upstream | 1970-01-12 | 176 | -0/+60998 |