summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge "Cherry-pick WebKit change r94841 to fix a LayoutTest crash"Steve Block2012-04-131-1/+1
|\ \ \ \ \ | |/ / / /
| * | | | Cherry-pick WebKit change r94841 to fix a LayoutTest crashSteve Block2012-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | editing/execCommand/ident-crashes-topnode-is-text.html See http://trac.webkit.org/changeset/94841 Bug: 6329306 Change-Id: Ic27f31beae3b390a4aba1797c13c8d36422911f5
* | | | | Merge "Cherry-pick WebKit change r94511 to fix a LayoutTest crash"Steve Block2012-04-131-5/+10
|\ \ \ \ \ | |/ / / /
| * | | | Cherry-pick WebKit change r94511 to fix a LayoutTest crashSteve Block2012-04-121-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fast/dom/Range/range-delete-contents-event-fire-crash.html See http://trac.webkit.org/changeset/94511 Bug: 6329028 Change-Id: I00cc0e6520831f20f6177f18f4e86d471003ea58
* | | | | Merge "Cherry-pick WebKit change r94215 to fix a LayoutTest crash"Steve Block2012-04-131-0/+2
|\ \ \ \ \ | |/ / / /
| * | | | Cherry-pick WebKit change r94215 to fix a LayoutTest crashSteve Block2012-04-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fast/gradients/css3-radial-gradient-crash.html See http://trac.webkit.org/changeset/94215 Bug: 6328935 Change-Id: I4414885e54a60aa05346c002c40835334685b1cb
* | | | | Merge changes If869bd58,I18c371c9,I7c46eab4Steve Block2012-04-137-28/+31
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * changes: Cherry-pick WebKit change r92139 to fix a LayoutTest crash Cherry-pick WebKit change r87227 as a prerequisite for r92139 Cherry-pick WebKit change r85267 as a prerequisite for r92139
| * | | | Cherry-pick WebKit change r92139 to fix a LayoutTest crashSteve Block2012-04-122-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | editing/input/search-field-crash-in-designmode.html Manually resolved a merge conflict in CSSStyleSelector::isAtShadowBoundary() due to http://trac.webkit.org/changeset/88476. See http://trac.webkit.org/changeset/92139 Bug: 6329073 Change-Id: If869bd58a689bb918ef47048c4f5d2e84e4b6f89
| * | | | Cherry-pick WebKit change r87227 as a prerequisite for r92139Steve Block2012-04-123-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/87227 Bug: 6329073 Change-Id: I18c371c96547d5a2011847647c8fc398b0adb18d
| * | | | Cherry-pick WebKit change r85267 as a prerequisite for r92139Steve Block2012-04-125-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/85267 Bug: 6329073 Change-Id: I7c46eab459647059890732214a9b953adef0a647
* | | | | Merge changes I0cee4daa,If526b331Steve Block2012-04-131-249/+182
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * changes: Cherry-pick WebKit change r90568 to fix LayoutTest crashes Cherry-pick WebKit change r86098 as a prerequisite for r90568
| * | | | Cherry-pick WebKit change r90568 to fix LayoutTest crashesSteve Block2012-04-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fast/flexbox/crash-button-input-autofocus.html fast/flexbox/crash-button-keygen.html fast/flexbox/crash-button-relayout.html Patch manually applied due to file rename. See http://trac.webkit.org/changeset/90568 Bug: 6328974 Change-Id: I0cee4daaea2e6fa2b9fae7d7dd81b4541561e969
| * | | | Cherry-pick WebKit change r86098 as a prerequisite for r90568Steve Block2012-04-121-249/+182
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/86098 Bug: 6328974 Change-Id: If526b33142144f1ed466325898f9177adf27e6ee
* | | | | Merge "Cherry-pick WebKit change r89762 to fix a LayoutTest crash"Steve Block2012-04-132-6/+15
|\ \ \ \ \ | |/ / / /
| * | | | Cherry-pick WebKit change r89762 to fix a LayoutTest crashSteve Block2012-04-122-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fast/dom/shadow/frameless-media-element-crash.html See http://trac.webkit.org/changeset/89762 Bug: 6329068 Change-Id: I73db520557e2ab4c04a4a2198276439e6c7932ec
* | | | | Merge "Cherry-pick WebKit change r88474 to fix a LayoutTest crash"Steve Block2012-04-131-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | Cherry-pick WebKit change r88474 to fix a LayoutTest crashSteve Block2012-04-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fast/css/webkit-keyframes-crash.html See http://trac.webkit.org/changeset/88474 Bug: 6328781 Change-Id: I9ae7d323b48ff6e55c720595fd27249176e87b8f
* | | | | Add support for HTML Media Capture "capture" attribute.Ben Murdoch2012-04-1310-3/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support in WebKit for the newly specified "capture" attribute to be used on HTML file pickers. Maintains support for the legacy implementation of the API (a MIME type parameter on the 'accept' attribute) for backwards compatibility. Note the 'capture' attribute takes precedent over a MIME type parameter. See http://www.w3.org/TR/html-media-capture/#captureparam for details. Requires changes in the framework (I494adc1274ca21ce8fe52a6c7b6b758217927e66) and Browser (I38dfe2df043fdba1388384dbd3b5370737eb38e5). Bug: 5771207 Change-Id: I0a921be31fda79a43c05da4fe22d9c808d92709c
* | | | | Fix funky rects in some casesJohn Reck2012-04-121-2/+3
| |/ / / |/| | | | | | | | | | | | | | | | | | | Bug: 6138337 Change-Id: Ibbfee2f451a0f05c25832122e1debd53d7fce4b6
* | | | Merge "Minor clean-up in DeviceOrientation and DeviceMotion"Steve Block2012-04-122-5/+5
|\ \ \ \ | |/ / /
| * | | Minor clean-up in DeviceOrientation and DeviceMotionSteve Block2012-04-122-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No functional change. See corresponding frameworks/base change https://android-git.corp.google.com/g/#change,125699 Change-Id: Iad7260fd506c13e773ee7a6c2225cbc71e8acdab
* | | | Merge "Skip drawing the background (glClear) if the tiles cover it."Chris Craik2012-04-126-14/+43
|\ \ \ \
| * | | | Skip drawing the background (glClear) if the tiles cover it.Chris Craik2012-04-126-14/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5631590 Change-Id: Ic7dc0dac0d7f98fb94eb2b111b3e59a0a7010caf
* | | | | Merge "Cleanup unused code"John Reck2012-04-124-143/+1
|\ \ \ \ \
| * | | | | Cleanup unused codeJohn Reck2012-04-114-143/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6317798 Change-Id: I377753d119d74bbd2569be586d980081f78d15e7
* | | | | | Merge "Fix ImageTexture drawing in software path"Chris Craik2012-04-121-1/+2
|\ \ \ \ \ \
| * | | | | | Fix ImageTexture drawing in software pathChris Craik2012-04-111-1/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | bug:6317028 Change-Id: Ibec896f64371c29a25aaae2490a4e5cf97b5b54a
* | | | | | Merge "Log tiles correctly for the base surface"Chris Craik2012-04-121-3/+4
|\ \ \ \ \ \
| * | | | | | Log tiles correctly for the base surfaceChris Craik2012-04-111-3/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | bug:6324663 Change-Id: I8dae021b98a1f721d2282bdb7490668a12eb0cf3
* | | | | | Merge "Correct viewport for GL drawing when webview is on FBO"Teng-Hui Zhu2012-04-121-4/+8
|\ \ \ \ \ \
| * | | | | | Correct viewport for GL drawing when webview is on FBOTeng-Hui Zhu2012-04-111-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6283539 Change-Id: I0d5fb92a9ad7e8b6781900bbc08e5afd48c53614
* | | | | | | Merge "We shall restore the FBO id instead of setting it back to 0."Teng-Hui Zhu2012-04-123-12/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | We shall restore the FBO id instead of setting it back to 0.Teng-Hui Zhu2012-04-113-12/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:6283539 Change-Id: I84b8d5e0a984cb98cedc43d755b04be521d675ca
* | | | | | | Merge "Vertical glyph doesn't work on typeface font."claireho2012-04-121-12/+33
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Vertical glyph doesn't work on typeface font.claireho2012-04-111-12/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6270583 - Vertical glyph doesn't work after switching from ARM gcc4.4 to gcc4.6. Fixed 3 problems: 1. substituteWithVerticalGlyphs() does not check the error code for HB_GSUB_Select_Script() call.    In gcc4.4, the scriptIndex is default to 0 but not in gcc4.6. 2. Removed the redundant checks for isCJKIdeograph() calls. 3. Convert text to vertical forms if substituteWithVerticalGlyphs() returns an error. Change-Id: I3b0778affa3e13b608e60190266880c1f47f905a
* | | | | | | Merge "Cherry-pick WebKit change r96779 to fix window.location"Steve Block2012-04-1210-34/+16
|\ \ \ \ \ \ \
| * | | | | | | Cherry-pick WebKit change r96779 to fix window.locationSteve Block2012-03-2810-34/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/96779 Note that a conflict occurred in Source/WebCore/platform/qt/KURLQt.cpp but the change is not required. Bug: 2159848 Change-Id: I56e645b2f187302c6f1858c8c6c291209f130cad
* | | | | | | | Merge "Cherry-pick WebKit change r94132 to fix default port in URLs"Steve Block2012-04-123-13/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Cherry-pick WebKit change r94132 to fix default port in URLsSteve Block2012-03-283-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to make sure URL parsing behaviour is up-to-date prior to fixing window.location. See bug for details. Note that a manual edit to HTMLAnchorElement::port() was required to avoid the use of emptyString(). See http://trac.webkit.org/changeset/94132 Bug: 2159848 Change-Id: I13ef58e18df46c1d4592c102d4eb80f54ae53020
* | | | | | | | Merge "Cherry-pick WebKit change r87623 to fix use of KURL::prettyURL()"Steve Block2012-04-1217-35/+40
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Cherry-pick WebKit change r87623 to fix use of KURL::prettyURL()Steve Block2012-03-2817-35/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a prerequisite for http://trac.webkit.org/changeset/96779 to fix window.location. Note that a conflict occurred in Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp but the change is not required. See http://trac.webkit.org/changeset/87623 Bug: 2159848 Change-Id: I5614b3588f30508f81b562aa7fb2f9027c2bda72
* | | | | | | | Merge "Cherry-pick WebKit change r84762 to fix URL canonicalization"Steve Block2012-04-121-5/+26
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Cherry-pick WebKit change r84762 to fix URL canonicalizationSteve Block2012-03-281-5/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to make sure URL parsing behaviour is up-to-date prior to fixing window.location. See bug for details. Note that the 'http:example.com/' test case in fast/url/standard-url.html fails with DRT2 because of an assumption in the test that it is served as a file scheme URL. See http://trac.webkit.org/changeset/84762 Bug: 2159848 Change-Id: Ie680debcad3d285efd40134932b72d429c0d2222
* | | | | | | | Merge "Cherry-pick WebKit change r91386 to fix a rendering crash"Steve Block2012-04-122-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Cherry-pick WebKit change r91386 to fix a rendering crashSteve Block2012-04-102-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that the use of RenderObject::isDeprecatedFlexibleBox() in the patch had to be changed to RenderObject::isFlexibleBox(). This method was renamed in http://trac.webkit.org/changeset/90773, which is not in Android's version of WebKit. The LayoutTest added in r91386 no longer crashes. See http://trac.webkit.org/changeset/91386 Bug: 5492762 Change-Id: Id43e55e89b4f107285b33c1a2c37a634cf10aad7
* | | | | | | | | Merge "Cherry-pick WebKit change r90068 to fix a rendering crash"Steve Block2012-04-124-1/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Cherry-pick WebKit change r90068 to fix a rendering crashSteve Block2012-04-104-1/+15
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that this change does not apply cleanly in RenderBlock::destroy() without r85869. r85869 was intended to be an optimization only, with no functional change. However, it introduced two crashes, one of which is fixed in r90068 and the other in r86060. To avoid the need to cherry-pick both r85869 and r86060 as prerequisites, the patch for r90068 was applied manually to give the correct end result in RenderBlock::destroy(). We now pass the LayoutTests added in r90068 and the LayoutTest added in r86060 does not crash. See http://trac.webkit.org/changeset/90068 Bug: 5496903 Change-Id: Ica6dc2c70a4cd5c781ae77df95a8a4033c097708
* | | | | | | | | Merge "Free local references as early as possible."George Mount2012-04-112-12/+19
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Free local references as early as possible.George Mount2012-04-112-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6300264 Change-Id: I29ffffa9be33884a3e6a1c9fc5bb5cac95585cdc
* | | | | | | | | Merge "New touch input support"John Reck2012-04-114-13/+30
|\ \ \ \ \ \ \ \ \