summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-09902-11465/+33671
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Properly guard local changes for link prefetchingSteve Block2010-07-092-7/+19
| | | | | | This fixes the WebKit build for PLATFORM(MAC) Change-Id: Ic19e8840363bc1d42b569c3e732ee3ee4e92c00a
* Merge "Fix issue 2823805: let expanded iframe scroll."Shimeng (Simon) Wang2010-07-081-0/+2
|\
| * Fix issue 2823805: let expanded iframe scroll.Shimeng (Simon) Wang2010-07-081-0/+2
| | | | | | | | | | issue: 2823805 Change-Id: I39e24cd1359df0d0a44d7eee60a62a1990d74861
* | Merge "Merge WebKit at r61871: Update WEBKIT_MERGE_REVISION"Kristian Monsen2010-07-081-2/+2
|\ \
| * | Merge WebKit at r61871: Update WEBKIT_MERGE_REVISIONKristian Monsen2010-07-081-2/+2
| | | | | | | | | | | | Change-Id: Iccb0bd9a2908dda6310fa6543a5ae0018b40825b
* | | Merge "Enable composite layers for the sub frame."Grace Kloba2010-07-074-34/+15
|\ \ \ | |_|/ |/| |
| * | Enable composite layers for the sub frame.Grace Kloba2010-07-074-34/+15
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the visibleContentRect for iframe. It should be relative to its parent instead of the viewport. For fixed position, we still check for the top frame as the current logic positions the object relative to the screen which only applied to the top frame. For plugin, it depends on PluginWidget's platformLayer(). The default is 0. For video, it depends on MediaPlayer's supportsAcceleratedRendering(). The default is false. Fix the crash in the GraphicsLayerAndroid. The root layer is a container layer, there is no need to draw them. As LayerAndroid doesn't create Picture for them, we should ensure to skip draw. Fix http://b/issue?id=2733947
* | Merge "Update JavaInstance to reflect final version upstreamed to WebKit"Steve Block2010-07-072-9/+8
|\ \ | |/ |/|
| * Update JavaInstance to reflect final version upstreamed to WebKitSteve Block2010-07-072-9/+8
| | | | | | | | | | | | | | See https://bugs.webkit.org/show_bug.cgi?id=41516 Bug: 2807132 Change-Id: I080978d1a6b90f2d8da1f62adbb62c60ef0034c9
* | Merge "don't walk off the end of the DOM when looking for text"Cary Clark2010-07-021-3/+4
|\ \ | |/ |/|
| * don't walk off the end of the DOM when looking for textCary Clark2010-07-021-3/+4
| | | | | | | | | | | | | | | | Also, fix a couple of minor changes in debugging code to stay sync'd with webkit. Change-Id: If4263bab97715e2a2d12f06f2359554740bf5dbc http://b/2816549
* | Merge WebKit at r61871: Update expected layout test.Kristian Monsen2010-07-021-3/+2
| | | | | | | | | | | | | | The initial chromium expected matches what we see on android so using that. http://trac.webkit.org/changeset/61352 Change-Id: Ie8dec2c650f45fe6c84884d800043b42897bc7bc
* | Merge WebKit at r61871: Refactoring of MimeClassInfo class.Kristian Monsen2010-07-021-10/+1
| | | | | | | | | | | | | | http://trac.webkit.org/changeset/61168 String suffixes changed to Vector<String> extensions http://trac.webkit.org/changeset/61150 pluginIndex removed Change-Id: I8e81d95da1a6795beb94247102317cf9b449979f
* | Merge WebKit at r61871: Floating-point support for text selection.Kristian Monsen2010-07-022-3/+3
| | | | | | | | | | | | http://trac.webkit.org/changeset/61253 Change-Id: If90b8c599f64c659436278c217d678a981db262f
* | Merge WebKit at r61871: Compile fix for PrintContext.cppKristian Monsen2010-07-021-0/+1
| | | | | | | | | | | | | | | | http://trac.webkit.org/changeset/61232. Not sure why it compiles on other platforms. Change-Id: I6f109ebdb6069b00cefbb528a9d38cc3df0079f7
* | Merge WebKit at r61871: Fix conflicts in Frame.cppKristian Monsen2010-07-022-41/+4
| | | | | | | | | | | | | | Code was moved from Frame.cpp, this created problems for local changes. Should be working again now (with more local changes). http://trac.webkit.org/changeset/61217/trunk/WebCore/page/Frame.cpp Change-Id: Ica56218eb972a1d0d311900efc1a2b3c609dae75
* | Merge WebKit at r61871: Fix conflicts in FrameLoader.cppKristian Monsen2010-07-022-27/+3
| | | | | | | | | | | | | | Cleaing up of frameloader removed one of our local changes, this should fix it. http://trac.webkit.org/changeset/61546 Change-Id: Ic0c08e8f944ab93b8a08f500042ce9fdeaa57238
* | Merge WebKit at r61871: Fix conflicts in HTMLDocumentParser.cppKristian Monsen2010-07-022-258/+10
| | | | | | | | | | | | | | | | | | | | | | | | New document parser in webkit. Just taking in the new parser. See http://trac.webkit.org/changeset/61674 This file is now what is in webkit at the time of the merge, with ANDROID_INSTRUMENT added. The instrumentation for Parsing now includes inline script execution, this will have to be fixed later. Updated the description for the parsing counter. Change-Id: I2c1bae725fe8989999620430e4745e1dfa7c450b
* | Merge WebKit at r61871: Fix conflictsKristian Monsen2010-07-028-36/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | V8Proxy.cpp http://trac.webkit.org/changeset/61499 npapi.h: http://trac.webkit.org/changeset/61277 Document.cpp http://trac.webkit.org/changeset/61787 XMLDocumentParser.h: http://trac.webkit.org/changeset/61663 HTMLLinkElement.*: http://trac.webkit.org/changeset/61424 HTMLTableCellElement.cpp http://trac.webkit.org/changeset/61630 ResourceHandleAndroid.cpp: http://trac.webkit.org/changeset/61768 Change-Id: If991d3c112eeefd3098aa68b862c65798d505e1f
* | Merge WebKit at r61871: Update makefilesKristian Monsen2010-07-025-25/+8
| | | | | | | | Change-Id: I85e597beedb768af8d3cf4aa269ecdeb2af9a113
* | Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-021285-16325/+48152
| | | | | | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* | Merge "Disable ICF for libwebcore.so"Doug Kwan2010-07-011-0/+7
|\ \
| * | Disable ICF for libwebcore.soDoug Kwan2010-07-011-0/+7
| | | | | | | | | | | | Change-Id: I314231a5f7d831f940b8cbc7c1d5bcd0fe09424e
* | | am 939d1819: am 9d4701f9: Push a local reference frame to avoid table overflow.Patrick Scott2010-07-012-8/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '939d1819c550af9e179aa2fa46668206333e1ebc' * commit '939d1819c550af9e179aa2fa46668206333e1ebc': Push a local reference frame to avoid table overflow.
| * \ \ am 9d4701f9: Push a local reference frame to avoid table overflow.Patrick Scott2010-07-012-8/+13
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '9d4701f9dc3d6fec15813f6ff9da0ae2611aa4be' into gingerbread * commit '9d4701f9dc3d6fec15813f6ff9da0ae2611aa4be': Push a local reference frame to avoid table overflow.
| | * | | Push a local reference frame to avoid table overflow.Patrick Scott2010-06-292-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to jsc's implementation, this is needed to restrict the amount of local references in a given jni frame. Once the frame is popped from the stack, all local references are cleaned. Bug: 2807132 Change-Id: I5f4153509c513bec142472927a1787869a57f530
* | | | | Merge "Bug2790521 - complex script overlap issue."claireho2010-07-012-49/+46
|\ \ \ \ \
| * | | | | Bug2790521 - complex script overlap issue.claireho2010-06-302-49/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Applied the fixes for complex script overlap for webkit/Chrome to webkit/Android. Change-Id: I4e34e36230b832524d7b8e78406de1e4c8438cf1
* | | | | | Merge "Clean up FEATURE_DEFINES in V8 generated sources Makefile"Steve Block2010-07-011-2/+3
|\ \ \ \ \ \
| * | | | | | Clean up FEATURE_DEFINES in V8 generated sources MakefileSteve Block2010-07-011-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The define V8_BINDING is intended to be on a line on its own to allow the other defines on the line above to be identical between JSC and V8. Change-Id: I278a135ba3f205283ae66f8ef1ff58fd139c4687
* | | | | | | Merge "Pass the WebView context to the GeolocationService from WebKit"Steve Block2010-07-013-7/+19
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Pass the WebView context to the GeolocationService from WebKitSteve Block2010-06-293-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2798745 Change-Id: I429a1cb9fc6826419c62f1f30376692ede497085
* | | | | | | Merge "Remove the double traversal in GraphicsLayerAndroid, so we should ↵Grace Kloba2010-06-302-52/+23
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | draw much less now."
| * | | | | | Remove the double traversal in GraphicsLayerAndroid,Grace Kloba2010-06-302-52/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | so we should draw much less now. As we use Picture instead of PictureSet, ignore the m_invalidatedRects for now. This should also reduce the number of draws when m_invalidatedRects has more than one rect.
* | | | | | | Detect if we're a webapp from the meta tag and send a message throughBen Murdoch2010-06-308-0/+49
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to java land if that is the case. Requires a frameworks/base change. b/2766917 Change-Id: I6d4034e6316e27c31a36a06063b5968c654fc756
* | | | | | Merge "refine text selection"Cary Clark2010-06-291-24/+26
|\ \ \ \ \ \
| * | | | | | refine text selectionCary Clark2010-06-291-24/+26
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change 'select all' to begin with the first character and end with the last rather than relying on the top left and bottom right. The old algorithm failed for pages broken into multiple columns. Similarly, capture the text from the beginning selection to the ending selection, rather than relying on the characters contained by the selection region. Reduce the gap required to add a linebreak from twice the lineheight to 1.5x the lineheight. Change-Id: Ib90a719ea3353feeaa3a6cc692d0dd9cff498cb5 http://b/262451
* | | | | | set maximum image sizeCary Clark2010-06-293-1/+11
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our use of web settings does not specify the maximum image size, although we have some hard-coded values used when decoding the image. For defective images, the hard-coded values are not enough, since we may exceed memory in the decoder before the limit is reached. Pass along our limits to the decoder, and respect any limits set by the caller. companion change in frameworks/base Change-Id: Icdfca87a44a3af8bcc1f0ed4792e04e060a67333 http://b/2689053
* | | | | Merge "Don't use the validity of the border color to determine whether the ↵Leon Clarke2010-06-281-4/+8
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | border will be drawn, but instead use the appearance, which is effectively what webkit uses to decide whether to draw its border http://b/issue?id=2661748"
| * | | | Don't use the validity of the border color to determineLeon Clarke2010-06-231-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | whether the border will be drawn, but instead use the appearance, which is effectively what webkit uses to decide whether to draw its border http://b/issue?id=2661748 Change-Id: I8200f9e1ae68c1e16360bab25a0c7e6b0fe9ee34
* | | | | Refactor find and select dialogsCary Clark2010-06-253-173/+937
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SelectText now permits incremental extension of the selection using either touch or trackball data. SelectText adds word selection and select all interfaces. SelectText has been rewritten to do a better job of finding space characters and selecting text outside of the visible window. Companion changes in frameworks/base and packages/apps/Browser Change-Id: I917a14124a41a3c9bd72ffa48fe36e55e7c4e543 http://b/2626451
* | | | | Merge "Check "email" input as some sites use it as the username."Grace Kloba2010-06-231-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Check "email" input as some sites use it as the username.Grace Kloba2010-06-231-2/+2
| |/ / / | | | | | | | | Fix http://b/issue?id=2792508
* | | | Don't dereference the frame when there isn't one in rel=apple-touch-icon linksLeon Clarke2010-06-231-1/+1
|/ / / | | | | | | | | | | | | | | | http://b/issue?id=2789499 Change-Id: I392825d357057c02cd379228fcfaa23ff7616378
* | | Merge "Added setXSSAuditorEnabled support in WebSettings."Shimeng (Simon) Wang2010-06-221-0/+5
|\ \ \
| * | | Added setXSSAuditorEnabled support in WebSettings.Elliott Slaughter2010-06-221-0/+5
| | | | | | | | | | | | | | | | Change-Id: I5a2580314ef866d661c6a1cac08df28ea1e0b54a
* | | | Merge "Enable complex scripts support compiling by deafult."claireho2010-06-221-0/+6
|\ \ \ \
| * | | | Enable complex scripts support compiling by deafult.claireho2010-06-221-0/+6
| |/ / / | | | | | | | | | | | | Change-Id: Iba6b9cb70bfb642467afe9dae3efa51829dc9d06
* | | | Fix for b/2786464Ben Murdoch2010-06-221-2/+3
|/ / / | | | | | | | | | | | | | | | | | | | | | Some renderobjects are "anonymous", i.e. have the document node associated with them and in this case the node() function returns null. We were then using the null RefPtr, hence the crash. RenderListMarker is an example of such an anonymous node which is why websites that use lists exposed the crash. Change-Id: I1a5527c42d99bbe8418b0e7bce4f3c245276e058