summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering
Commit message (Collapse)AuthorAgeFilesLines
* Disable "fit to screen" if line height < font size.Shimeng (Simon) Wang2010-01-061-0/+5
| | | | | Bug: 2289376 modified: WebCore/rendering/RenderBlockLineLayout.cpp
* resolved conflicts for merge of 870689c8Nicolas Roard2010-01-042-1/+6
|
* am 4dd98cc2: am aad6f24e: Merge webkit.org at r51976 : Fix general conflicts.Steve Block2009-12-174-43/+2
|\ | | | | | | | | | | | | Merge commit '4dd98cc27e25e6c3104672f50749132d2236461b' * commit '4dd98cc27e25e6c3104672f50749132d2236461b': Merge webkit.org at r51976 : Fix general conflicts.
| * Merge webkit.org at r51976 : Fix general conflicts.Steve Block2009-12-174-43/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes ... For FrameLoader.cpp/h, see http://trac.webkit.org/changeset/51644 For FrameView.cpp and ScrolView.cpp, see http://trac.webkit.org/changeset/51636 For PluginInfoStore.cpp, see http://trac.webkit.org/changeset/51257 For Geolocation.cpp, see http://trac.webkit.org/changeset/50605 For V8DOMWrapper.cpp, see http://trac.webkit.org/changeset/51004 For V8Proxy.cpp, see http://trac.webkit.org/changeset/50441, http://trac.webkit.org/changeset/50327, http://trac.webkit.org/changeset/50406 and http://trac.webkit.org/changeset/50523 For HTMLInputElement.cpp, see http://trac.webkit.org/changeset/50996 For RenderBlock.cpp/RenderInline.cpp, see https://android-git.corp.google.com/g/#change,33465 Android-specific change to now-deleted JSCanvasArrayCustom.cpp was trivial. Change-Id: Iddc8d43bdcb6208d6a991a7a1d591e8a4f918bf7
* | am b880d713: am 643ca787: Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-17120-755/+2350
|\ \ | |/ | | | | | | | | | | Merge commit 'b880d713c04257ca40abfef97c300afdead423b8' * commit 'b880d713c04257ca40abfef97c300afdead423b8': Merge webkit.org at r51976 : Initial merge by git.
| * Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-17120-755/+2350
| | | | | | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* | Do not expand IFrames that are 1x1.Patrick Scott2009-12-161-7/+8
|/ | | | | | | I was filtering out 1x1 frames incorrectly by using the calculated width and height which includes border and padding. Bug: 2317776
* Fix the crash in RenderTableSection for Small ScreenGrace Kloba2009-12-101-2/+7
| | | | | | | rendering. The code path was not exercised in the Browser and the crash was triggered by the WebKit integration. Fix http://b/issue?id=2285748
* Fixes a PLATFORM(ANDROID) guard in RenderBlock.h which causes problems when ↵Steve Block2009-11-251-0/+4
| | | | | | | | | | | building on Mac. This code was modified recently to aid upstreaming by wrapping all Android changes in PLATFORM(ANDROID). To allow the build to succeed on other paltforms, we need to be more careful with our use of the guards. See https://android-git.corp.google.com/w/?p=platform/external/webkit.git;a=commitdiff;h=bc7b84de3fd863c500a8169fd00dca3811cadbb3#patch28 Change-Id: I4b0151ad62023821171742c5dfbba1dd7b39d8ed
* remove obsolete code blockCary Clark2009-11-241-11/+0
| | | | | | | | This block was commented out in Android to improve performance. It has now been removed from webkit altogether. It needs to be removed to allow webkit to build for Safari, since the interfaces it references are now obsolete.
* am ffe27b58: Integrate WebKit security fix ↵Grace Kloba2009-11-172-12/+18
|\ | | | | | | | | | | | | | | | | http://trac.webkit.org/changeset/50466 Merge commit 'ffe27b58c77e71641efd3bd4258323cd4c29c39a' into eclair-mr2 * commit 'ffe27b58c77e71641efd3bd4258323cd4c29c39a': Integrate WebKit security fix
| * Integrate WebKit security fixGrace Kloba2009-11-172-12/+18
| | | | | | | | | | http://trac.webkit.org/changeset/50466 Fix http://b/issue?id=2268722
* | am a5605499: Changing fit column to screen to exclude the padding.Grace Kloba2009-11-111-11/+5
|\ \ | |/ | | | | | | | | | | Merge commit 'a56054997e46fcd04621cc67d650b6daf85f7b59' into eclair-mr2 * commit 'a56054997e46fcd04621cc67d650b6daf85f7b59': Changing fit column to screen to exclude the padding.
| * Changing fit column to screen to exclude the padding.Grace Kloba2009-11-101-11/+5
| | | | | | Fix http://b/issue?id=2253222
* | Merge webkit.org at r50258 : Fix conflicts.Steve Block2009-11-101-3/+0
| | | | | | | | | | | | | | Note that FrameLoader::gotoAnchor has been moved to FramveView::gotoAnchor. See http://trac.webkit.org/changeset/49608 Change-Id: Ic2a87bb0c0f91d371508578ddccf200967524a77
* | Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-1030-88/+308
| | | | | | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* | We were excluding device-width to fix http://b/issue?id=1331654.Grace Kloba2009-10-271-3/+2
| | | | | | | | | | | | | | | | | | But some mobile sites will have minimum pref width wider than the screen width, like in http://www.boygeniusreport.com/2009/10/23/motorola-droid-preview/. Now we are checking width() > screenWidth before wrapping at line 958, there is no need to exclude the device-width case. Remove the checking and both bugs should be fixed.
* | Remove bad assert.Patrick Scott2009-10-271-3/+0
| | | | | | | | | | | | The original assert was meant to assert that the body renderer layout state is not modified during the expansion of the iframe. This can falsely fire if the body renderer already needed a layout before the iframe expansion.
* | Makes a number of changes to ease future merging with and upstreaming to ↵Steve Block2009-10-2213-51/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | webkit.org. - Fixes whitespace discrepancies between webkit.org and Android versions - Re-orders Android-specific changes to minimise the diff with webkit.org - Makes sure all Android-specific changes are appropriately guarded. - Fixes some Android-specific style problems None of these should introduce any functional changes for PLATFORM(ANDROID). Change-Id: Id27cf0b0e8682a7f29590c3fccae2d287b3630f1
* | Merge webkit.org at R49305 : Update rendering to use new overflow methods.Steve Block2009-10-201-1/+7
| | | | | | | | | | | | See http://trac.webkit.org/changeset?new=47440 Change-Id: I140b6be130c1fb175c653f5ba2ba19fdc323bbc9
* | Merge webkit.org at R49305 : Fix merge conflicts.Steve Block2009-10-203-13/+1
| | | | | | | | Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
* | Merge webkit.org at R49305 : Automatic merge by git.Steve Block2009-10-2094-2834/+3742
| | | | | | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* | Fixes a bunch of WebKit whitespace discrepancies between Android and ↵Steve Block2009-10-143-3/+3
| | | | | | | | | | | | | | | | webkit.org. Do not merge. This will avoid noise in the diffs when upstreaming Android-specific changes to webkit.org. This has already been submitted to master branch.
* | File upload.Leon Scroggins2009-10-091-4/+0
| | | | | | | | | | | | | | | | Webkit implementation for passing in the data for file uploads. Requires a change to frameworks/base to not break things; also requires a change to packages/apps/Browser to work. Fixes http://b/issue?id=675743
* | remove unneeded ANDROID_ALLOW_TRANSPARENT_BACKGROUNDSMike Reed2009-10-021-4/+0
|/ | | | http://b/issue?id=2146657
* Fix the random crash around iframes.Patrick Scott2009-09-302-4/+24
| | | | | | | | | | | | | | | | The problem is that if updateWidgetPosition calls layout, the FrameView will layout with 0x0 dimensions. Then, we resize the view and try to relayout. This causes the body to be marked as needing a layout. But, the body does not get a chance to relayout. If updateWidgetPosition does not layout, the view size will match and the body will not be marked for layout. This makes everything sane after layout of the iframe. The root of the problem is that we are calling FrameView::layout() while in the midst of a layout. This is causing a child RenderObject to need a layout without the parent object needing a layout. We avoid this by not laying out until we set the FrameView dimensions. Bug: 2048855, 2134215
* save and restore the transparent fill when drawing replaced imagesCary Clark2009-08-311-0/+6
| | | | | | | | | | | | | | | If an image node is incomplete, RenderImage::paintReplaced is triggered. A thin frame with a transparent center sets but does not restore the fill to transparent. Our graphics state draws transparent bitmaps until the state gets set back to opaque. I haven't figured out why Safari doesn't demonstrate this same bug, but in some webkit code, the state is saved and restored around making the fill transparent. Adding that save()/restore() pair fixes our bug as well. But, it may be that our platform should be setting the fill state before drawing the bitmap and is failing to do so. This fixes http://b/issue?id=2052757
* Fix the paragraph is not wrapping with the new WK problem.Grace Kloba2009-08-211-0/+101
| | | | Copy the change from bidi.cpp to RenerBlockLineLayout.cpp as the file is renamed.
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-1932-407/+252
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-1832-252/+407
|
* Merge commit 'goog/master' into mergeBen Murdoch2009-08-181-46/+63
|\ | | | | | | | | | | | | Conflicts: WebCore/bindings/v8/ScriptController.cpp WebCore/page/Geolocation.cpp WebCore/platform/android/GeolocationServiceAndroid.cpp
| * Be more restrictive when expanding iframes.Patrick Scott2009-08-171-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 Murdoch2009-08-171-2/+3
| |
* | Fix merges and add #if PLATFORM(ANDROID)Nicolas Roard2009-08-122-9/+3
| |
* | Merge in WebKit r47029.Ben Murdoch2009-08-11158-3495/+6214
|/
* Another tweak for text wrap screen. We add a fixed padding when wrapping textGrace Kloba2009-08-041-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 screenGrace Kloba2009-08-031-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 Kloba2009-07-301-2/+3
|
* Get WebKit r44544.Feng Qian2009-06-17131-2712/+3763
|
* speedup some common matrix operations, to be submitted backMike Reed2009-06-112-1/+17
|
* Fix a warning with an Android edit.Patrick Scott2009-05-121-6/+6
|
* AI 146317: Traverse the frame tree and compute the largest rectangle that ↵Patrick Scott2009-04-151-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 Qian2009-04-10176-8265/+12941
| | | | Automated import of CL 145796
* AI 145074: Override calcWidth and calcHeight to compute the content dimensions.Patrick Scott2009-04-082-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 Scroggins2009-04-032-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 Kloba2009-03-311-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,141440Grace Kloba2009-03-241-0/+7
|
* Automated import from //branches/master/...@140476,140476Grace Kloba2009-03-241-2/+3
|
* auto import from //branches/cupcake/...@137873The Android Open Source Project2009-03-111-8/+12
|
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-05176-6235/+10387
|
generated by cgit v1.1 at 2025-11-26 23:15:42 +0000