summaryrefslogtreecommitdiffstats
path: root/WebCore/rendering/RenderImage.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-021-21/+46
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge Webkit at r70209: Fix conflictsBen Murdoch2010-10-261-27/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore/page/FrameView.cpp http://trac.webkit.org/changeset/69896 WebCore/html/parser/HTMLDocumentParser.cpp http://trac.webkit.org/changeset/69283 WebCore/html/HTMLPlugInElement.h http://trac.webkit.org/changeset/69596 WebCore/html/HTMLInputElement.cpp http://trac.webkit.org/changeset/68996 http://trac.webkit.org/changeset/69378 WebCore/plugins/npapi.cpp http://trac.webkit.org/changeset/69808 WebCore/css/CSSComputedStyleDeclaration.cpp http://trac.webkit.org/changeset/69220 WebCore/css/CSSParser.cpp http://trac.webkit.org/changeset/69196 WebCore/rendering/style/RenderStyle.h http://trac.webkit.org/changeset/68680 WebCore/rendering/RenderImage.cpp http://trac.webkit.org/changeset/68917 WebCore/platform/android/FileSystemAndroid.cpp http://trac.webkit.org/changeset/69594 WebCore/inspector/InspectorController.h http://trac.webkit.org/changeset/68767 See also Android change I4c724f2f52a5a9db6dca6b58032b6a902aac74b5 which is why this is a conflict. JavaScriptCore/parser/Parser.cpp http://trac.webkit.org/changeset/69516 Change-Id: I5a708c6590ba029a2b3ecc3b30478ea303e1f2f5
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-261-36/+57
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r68651 : Renamed variablesKristian Monsen2010-10-071-5/+5
| | | | | | | | | | | | | | Changed m_minPrefWidth and m_maxPrefWidth to m_minPreferredLogicalWidth and m_maxPreferredLogicalWidth in this CL: http://trac.webkit.org/changeset/68276/trunk/WebCore/rendering/RenderBox.h This changed containerWidth to containerLogicalWidth http://trac.webkit.org/changeset/68362/trunk/WebCore/rendering/RenderBox.cpp Also changed calcReplacedWidthUsing to computeReplacedWidthUsing here: http://trac.webkit.org/changeset/68239/trunk/WebCore/rendering/RenderBox.h Change-Id: I8eb912128aa5e09f55f4495671209cb8ca2ba3f0
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-071-15/+15
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-291-25/+2
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge WebKit at r66666 : Initial merge by git.Kristian Monsen2010-09-111-60/+40
| | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Merge WebKit at r64523 : Fix conflicts due to ANDROID_HITTEST_WITHSIZESteve Block2010-08-091-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A modified version of this Android-specific code was upstreamed in http://trac.webkit.org/changeset/64272 For the most part, the differences between the Android and upstreamed versions are syntactic only. In these cases, we take the upstream version. In a small number of cases, logical changes exist. In these cases, the Android logic has been retained, guarded with ANDROID_HITTEST_WITHSIZE, but using the new syntax. In particular ... - Android's HitTestResult::intersects(x, y, rect) is logically equivalent to the uspstream IntRect::intersects(HitTestPoint::rectFromPoint(x, y))). - Android's HitTestResult::addRawNode() is logically equivalent to the upstream HitTestResult::m_rectBasedTestResult.add(). - Android's HitTestResult::isRegionTest() is slightly different from the upstream HitTestResult::isRectBasedTest(). The latter is modified with a new ANDROID_HITTEST_WITHSIZE guard in HitTestResult::HitTestResult() to maintain the same behaviour. - The upstreamed code uses HitTestResult::addNodeToRectBasedTestResult() as a helper method in place of inline logic in the Android version. The slight difference in behaviour between this helper and the Android logic is reflected in the new ANDROID_HITTEST_WITHSIZE guard in the helper. This change should introduce no change in behaviour. Change-Id: I974d68e3ac963f18334418e32b08c3fd9ab1182e
* Merge WebKit at r64523 : Initial merge by git.Steve Block2010-08-091-0/+12
| | | | Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-021-129/+2
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-161-1/+2
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-271-1/+1
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-251-1/+1
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* First draft to add a fat point to WebKit hit test.Grace Kloba2010-05-241-0/+12
| | | | | | | | | | | | | | | | | | | | | | | If padding is 0, it is the old style point hit test. If it finds a node, it will break the search loop and return. If padding is non-zero, the first node will be added to HitTestResult's innerNode as before. But instead of finishing the search, hit test will continue to look for other nodes covered by the fat point unless it is fully inside the current node. Here are some highlights of the changes. . instead of testing renderRect.contains(x, y), we now test renderRect.intersect(pointRect) . when a Node is hit, it will be appended to the rawNodeList of HitTestResult. So the order inside the rawNodeList represents the hit test order. Currently the fat point doesn't support SVG nodes. It also doesn't support overflow control yet.
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-141-3/+3
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-111-1/+1
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r54127 : Initial merge by gitSteve Block2010-02-041-6/+68
| | | | Change-Id: Ib661abb595522f50ea406f72d3a0ce17f7193c82
* Merge webkit.org at r51976 : Initial merge by git.Steve Block2009-12-171-6/+6
| | | | Change-Id: Ib0e7e2f0fb4bee5a186610272edf3186f0986b43
* Merge webkit.org at r50258 : Initial merge by git.Steve Block2009-11-101-1/+1
| | | | Change-Id: I1a9e1dc4ed654b69174ad52a4f031a07240f37b0
* Makes a number of changes to ease future merging with and upstreaming to ↵Steve Block2009-10-221-5/+5
| | | | | | | | | | | | | 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 : Automatic merge by git.Steve Block2009-10-201-1/+1
| | | | Change-Id: I8968561bc1bfd72b8923b7118d3728579c6dbcc7
* 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
* Revert "Merge WebKit r47420"Andrei Popescu2009-08-191-1/+1
| | | | This reverts commit d227fc870c7a697500a3c900c31baf05fb9a8524.
* Merge WebKit r47420Ben Murdoch2009-08-181-1/+1
|
* Merge in WebKit r47029.Ben Murdoch2009-08-111-15/+10
|
* AI 145796: Land the WebKit merge @r42026.Feng Qian2009-04-101-15/+42
| | | | Automated import of CL 145796
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-051-22/+42
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+593
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-593/+0
|
* auto import from //branches/cupcake/...@125939The Android Open Source Project2009-01-091-22/+0
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-56/+181
|
* Initial ContributionThe Android Open Source Project2008-10-211-7/+80
|
* external/webkit r30707Upstream1970-01-121-0/+417
generated by cgit v1.1 at 2025-06-07 20:30:47 +0000