summaryrefslogtreecommitdiffstats
path: root/WebCore
Commit message (Collapse)AuthorAgeFilesLines
* Fix the compiler error while disabling overflow scroll.Shimeng (Simon) Wang2010-09-301-0/+2
| | | | Change-Id: I4d74ac00a6d348ce00b551572da6ceb5f2793b1f
* JSC build fixKristian Monsen2010-09-291-0/+1
| | | | | | | Need by this webkit CL: http://trac.webkit.org/changeset/67898 Change-Id: Ic6180c845bf2d51036925e9329be6cb9a0cc0ab6
* Merge WebKit at r67908: ResourceLoader now makes use of NetworkingContextSteve Block2010-09-292-15/+18
| | | | | | See http://trac.webkit.org/changeset/67291 Change-Id: I620cba25ea40451830b86df90631a2c88792ce16
* Merge WebKit at r67908: Remove ↵Steve Block2010-09-291-5/+0
| | | | | | | | GraphicsLayer::compositingCoordinatesOrientation() See http://trac.webkit.org/changeset/67576 Change-Id: I2f212e6591b4d7c1a48cae5be9e8e4911d9c3a50
* Merge WebKit at r67908: Remove call to ↵Steve Block2010-09-291-0/+8
| | | | | | | | SharedGraphicsContext3D::removeTexturesFor() See http://trac.webkit.org/changeset/67412 Change-Id: I327df5aa81770a4eab885933ac6339ae26aca62a
* Merge WebKit at r67908: Fix MakefilesSteve Block2010-09-292-0/+2
| | | | Change-Id: I2ce222e3f946987d9d544df5f015e06a2e5c7f4d
* Merge WebKit at r67908: Fix conflictsSteve Block2010-09-2918-212/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whitespace difference in config.h - http://trac.webkit.org/changeset/67323 - WebCore/config.h Conflict due to ANDROID_LAYOUT - http://trac.webkit.org/changeset/67882 - WebCore/css/CSSComputedStyleDeclaration.cpp Conflict due to ANDROID_INSTRUMENT - http://trac.webkit.org/changeset/67704 - WebCore/css/CSSParser.cpp Conflict due to ANDROID_CSS_RING - http://trac.webkit.org/changeset/67667 - WebCore/css/CSSParser.cpp - WebCore/css/CSSStyleSelector.cpp Conflict due to axObjectCache - http://trac.webkit.org/changeset/67292 - WebCore/dom/Document.cpp Conflict due to ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS - http://trac.webkit.org/changeset/67903 - WebCore/html/HTMLInputElement.cpp Conflict due to ARCHIVE - http://trac.webkit.org/changeset/67198 - WebCore/loader/DocumentLoader.cpp - WebCore/loader/FrameLoader.cpp Conflict due to ARCHIVE - http://trac.webkit.org/changeset/67253 - WebCore/loader/FrameLoader.cpp Conflict due to actualWidth() vs width() - http://trac.webkit.org/changeset/67762 - WebCore/page/DOMWindow.cpp Conflict due to ANDROID_PLUGINS - http://trac.webkit.org/changeset/67890 - WebCore/page/Settings.cpp - WebCore/page/Settings.h Conflict due to Android MIME types - http://trac.webkit.org/changeset/67375 - WebCore/platform/MIMETypeRegistry.cpp Android fix in PluginView no longer needed after http://trac.webkit.org/changeset/67325 - WebCore/plugins/PluginView.cpp Conflict due to ANDROID_FLATTEN_IFRAME and ANDROID_FLATTEN_FRAMESET - http://trac.webkit.org/changeset/67660 - WebCore/rendering/RenderBlockLineLayout.cpp Conflict due to ANDROID_LAYOUT - http://trac.webkit.org/changeset/67660 - WebCore/rendering/RenderBox.h - WebCore/rendering/RenderTable.cpp Android fix in RenderTableCell no longer needed after http://trac.webkit.org/changeset/67862 - WebCore/rendering/RenderTableCell.cpp Conflict due to ANDROID_CSS_RING - http://trac.webkit.org/changeset/67889 and http://trac.webkit.org/changeset/67667 - WebCore/rendering/style/RenderStyle.h Change-Id: Ie36bd7de6d89a1f873c91984048f2507cabd864c fix conflicts Change-Id: I3acaba9492f6f39869e69fa24270cefbb74ba673
* Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-29664-10487/+24375
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Turn autofill on by default at compile time and make it a browser setting.Ben Murdoch2010-09-282-1/+11
| | | | | | | | | | | Make autofill a runtime option configured through the browser. Required a corresponding change in frameworks/base - https://android-git.corp.google.com/g/65573 and packages/apps/browser - https://android-git.corp.google.com/g/65579 Change-Id: I905b464a6338ff27b02f16d0b9a718154c3c98c1
* Merge "Bug: 2372180"Huahui Wu2010-09-274-6/+13
|\
| * Bug: 2372180Huahui Wu2010-09-274-6/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL adds support to pass multi-touch event from browser to webkit. PlatformTouchEvent.h and PlatformTouchEventAndroid.cpp: changed the android constructor to take multiple touch points. PlatformTouchPoint.h and PlatformTouchPointAndroid.cpp: changed the android constructor to take a touch point ID. WebViewCore.h and WebViewCore.cpp: 1. Updated handleTouchEvent(), HandleTouchEvent(), and jni interface to take multiple points. 2. Added support of action MotionEvent.ACTION_POINTER_DOWN & MotionEvent.ACTION_POINTER_UP. Change-Id: I79cffdba12a60ced9a571b4c1fd5b520a0fb6074
* | Double Buffered Texture Support for WebKit.Derek Sollenberger2010-09-276-11/+570
|/ | | | | | | | This CL adds support for the DoubleBufferedTexture class which can be used to pass textures between threads. Bug-Id: 3034088 Change-Id: Idf4a5d367c02eae0cedb08f2167b9af370173851
* Merge "Remove a superfluous comment from HTMLInputElement.cpp"Steve Block2010-09-221-1/+0
|\
| * Remove a superfluous comment from HTMLInputElement.cppSteve Block2010-09-221-1/+0
| | | | | | | | | | | | This is an Android addition Change-Id: I2784049bd97d970c5a21a08b256a2eb528700cd1
* | Merge "GL utilities"Nicolas Roard2010-09-214-0/+633
|\ \ | |/ |/|
| * GL utilitiesNicolas Roard2010-09-214-0/+633
| | | | | | | | Change-Id: I5b4a008c51f409639059d2e47d5c8624c96b2981
* | Merge "Remove superfluous Geolocation::stop() method rogue LayoutTests"Steve Block2010-09-172-8/+0
|\ \
| * | Remove superfluous Geolocation::stop() method rogue LayoutTestsSteve Block2010-09-162-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The stop() method and LayoutTests were added in https://android-git.corp.google.com/g/#change,53849 which cherry-picked a WebKit change to attempt to stop leaks. This change has been rolled back in WebKit pending a better solution, but was retained in Android as a temporary fix. Later changes to Geolocation in WebKit have now fixed the underlying problem and this has been confirmed on Android. The temporary fix was mostly removed in the merge to WebKit r65615 in https://android-git.corp.google.com/g/#change,62318 This patch simply removes the superfluous stop() method and LayoutTests, which were missed in the above patch. Bug: 3001031 Change-Id: Id17117f285cb1a8fa600945cc6a87fc336709cab
* | | Merge WebKit at r67178 : Cherry-pick fix for V8DOMWrapper.Iain Merrick2010-09-162-9/+14
| | | | | | | | | | | | | | | | | | | | | | | | Copying http://trac.webkit.org/changeset/67324, which fixes a circular header file inclusion when compiling with both XPATH and V8 enabled (which is our default build config). Change-Id: I244870c2b612314ac2c6248eeeb1c8dc5e5b362b
* | | Merge WebKit at r67178 : Fix AndroidAnimation.Iain Merrick2010-09-162-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TimingFunction was previously a simple struct with an enum to select different behaviors. It's now an abstract class with a different subclass for each behavior. Fixing AndroidAnimation so that it holds a RefPtr to the timing function rather than trying to store its value directly. See http://trac.webkit.org/changeset/67032 Change-Id: Icb7f2911aea341975531c95594ab1c30ac48cd87
* | | Merge WebKit at r67178 : Fix Makefiles.Iain Merrick2010-09-162-0/+5
| | | | | | | | | | | | Change-Id: I8d14775998f5bad70cb01ce71a0f88e16dde85e0
* | | Merge WebKit at r67178 : Fix conflicts.Iain Merrick2010-09-166-31/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | V8DOMWindowShell::initContextIfNeeded now has a return value: http://trac.webkit.org/changeset/66840 DocLoader renamed to CachedResourceLoader. This affects loader/*, ResourceHandleAndroid.cpp and WebSettings.cpp http://trac.webkit.org/changeset/66963 Change-Id: I3ea74336a4a0236f7487b794982b9d19e08c1c45
* | | Merge WebKit at r67178 : Initial merge by git.Iain Merrick2010-09-16572-5593/+28754
| | | | | | | | | | | | Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
* | | Fix prototype for V8Proxy::compileScriptInternalIain Merrick2010-09-142-2/+2
|/ / | | | | | | | | | | | | Looks like this was broken in the last WebKit merge. It's only used when compiling with #define ANDROID_INSTRUMENT. Change-Id: Idc6d879cf733f84122c3b3f0608d8df1598eff36
* | Initial autofill changes in libwebcore.Ben Murdoch2010-09-131-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial checkin of WebKit source for enabling AutoFill on Android. This code calls into the chromium library to perform the autofill magic. There's still lots to do, but this and a corresponding change in external/chromium enable the feature (basically) end to end. The feature is disabled by default until we implement it more fully with some proper UI. To turn it on, set the ENABLE_AUTOFILL environment variable to "true" and rebuild. This is only useful for preliminary testing though as for now we use a precanned profile, which won't be relevant unless your name happens to be John Smith. Change-Id: I4a3e0e840617f7cf8f522af33ae1be560768a6c5
* | Merge Webkit at r66666 : Fix include in V8Bindings generationKristian Monsen2010-09-111-0/+1
| | | | | | | | | | | | | | | | | | | | Submitted upstream patch: https://bugs.webkit.org/show_bug.cgi?id=45292 Fix is in: http://trac.webkit.org/changeset/66888/trunk/WebCore/bindings/scripts/CodeGeneratorV8.pm Change-Id: Ia4b009b2744bca744711f567f2ec182288cfe011
* | Merge Webkit at r66666 : Renamed function in GraphicsContext.h.Kristian Monsen2010-09-111-1/+2
| | | | | | | | | | | | | | Webkit CL: http://trac.webkit.org/changeset/66643 Change-Id: Ia17bde54d46e1792cfe309f19e229abe513ed52c
* | Merge Webkit at r66666 : Fix makefiles, including some conflicts.Kristian Monsen2010-09-116-49/+47
| | | | | | | | Change-Id: Ia903fa56d31594944939f03d0b8dec021f7964bb
* | Merge Webkit at r66666 : Fix conflicts.Kristian Monsen2010-09-115-24/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | css/CSSParser.cpp Replaced m_mediaQuery = 0 with ASSERT(!m_mediaQuery): http://trac.webkit.org/changeset/66334/trunk/WebCore/css/CSSParser.cpp dom/Document.cpp Removed a function call next to an Android specific change: http://trac.webkit.org/changeset/66247/trunk/WebCore/dom/Document.cpp html/HTMLPlugInElement.cpp Removed a function next to an Android change: http://trac.webkit.org/changeset/66653/trunk/WebCore/html/HTMLPlugInElement.cpp page/Settings.h Whitespace change in this CL: http://trac.webkit.org/changeset/66570/trunk/WebCore/page/Settings.h svg/SVGFontFaceUriElement.h Small change next to an Android change: http://trac.webkit.org/changeset/66397/trunk/WebCore/svg/SVGFontFaceUriElement.h Change-Id: I8d395474f9a08d3a1432249da9a1aa06b01765e0
* | Merge WebKit at r66666 : Initial merge by git.Kristian Monsen2010-09-11995-17254/+28040
|/ | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Allow WebKit to scroll selection on screen.Leon Scroggins2010-09-101-2/+2
| | | | | | | | | Requires a change to frameworks/base Bug 2679411 Bug 2659028 Change-Id: I482cefadc24c620c6d07cbce44acc216bdb9b8df
* Revert "Bug fix 2337042 <base> URL + <img> URL = URL that starts with "/.""Steve Block2010-09-041-7/+0
| | | | | | | | This change broke LayoutTest fast/url/ipv4.html This reverts commit ff93a851c578d0b570c84b3a83a41a4930e7107c. Change-Id: Ic27602be9fdd855fbc1517deed9e7e9737f5b9b5
* Merge "Update to Merge WebKit at r61871: Floating-point support for text ↵Kristian Monsen2010-09-021-2/+2
|\ | | | | | | selection."
| * Update to Merge WebKit at r61871: Floating-point support for text selection.Kristian Monsen2010-09-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | The last CL only fixed when SUPPORT_COMPLEX_SCRIPTS was defined, this is the same fix for when it is not defined. The previous CL: https://android-git.corp.google.com/g/#change,56256 Webkit CL: http://trac.webkit.org/changeset/61253 Change-Id: I9300786525fd6ec0ea2fc304c5d33e3ee00ccd3e
* | Merge WebKit at r66079 : Cherry-pick WebKit change 66211 to add missing ↵Steve Block2010-09-021-0/+2
| | | | | | | | | | | | | | | | IndexedDB guards See http://trac.webkit.org/changeset/66211 Change-Id: I61a04cf700bc84dd5ff173cc79befc28497fddd2
* | Merge WebKit at r66079 : ImageSource constructor now takes a premultipyAlpha ↵Steve Block2010-09-021-2/+4
| | | | | | | | | | | | | | | | argument See http://trac.webkit.org/changeset/66039 Change-Id: I4961f5610c3061c90edf8cc32b83e4a6b8be12d1
* | Merge WebKit at r66079 : Fix makefilesSteve Block2010-09-021-2/+0
| | | | | | | | Change-Id: I361701236c527552e183fe1eaf427c6f549ded90
* | Merge WebKit at r66079 : Fix conflictsSteve Block2010-09-025-32/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - WebCore/dom/Document.cpp Conflict due to Android guards around m_axObjectCache See http://trac.webkit.org/changeset/65787 - WebCore/dom/Document.h Conflict due to Android guards around m_axObjectCache whitespace diff See http://trac.webkit.org/changeset/65787 and http://trac.webkit.org/changeset/66037 - WebCore/html/HTMLDocumentParser.cpp Conflict due to ANDROID_INSTRUMENT See http://trac.webkit.org/changeset/65692 - WebCore/platform/image-decoders/ImageDecoder.cpp Conflict due to Android not implementing ImageDecoder::create() See http://trac.webkit.org/changeset/66039 - WebCore/plugins/PluginView.h Conflict due to PLUGIN_SCHEDULE_TIMER See http://trac.webkit.org/changeset/65697 Change-Id: I5dc94bad471ea566dbabf965425938b732735d02
* | Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-02630-9216/+17377
|/ | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* add web setting for enabling/disabling synthetic linksCary Clark2010-09-012-3/+7
| | | | | | | | | | | | | | According to this feature request http://b/1865484 Some webviews wish to load pages and ignore the email, phone, and postal addresses. Add a way to specify that preference to the WebView class. depends on companion change in frameworks/base Change-Id: Ibcd78ab632063d8ab403567fa40c329339e51572
* am cd011297: am ff93a851: Bug fix 2337042 <base> URL + <img> URL = URL that ↵Melanie Clements2010-08-311-0/+7
|\ | | | | | | | | | | | | | | | | starts with "/." Merge commit 'cd011297fda5b6f6093453d59c2624aaf878e2fb' * commit 'cd011297fda5b6f6093453d59c2624aaf878e2fb': Bug fix 2337042 <base> URL + <img> URL = URL that starts with "/."
| * am ff93a851: Bug fix 2337042 <base> URL + <img> URL = URL that starts with "/."Melanie Clements2010-08-311-0/+7
| |\ | | | | | | | | | | | | | | | | | | Merge commit 'ff93a851c578d0b570c84b3a83a41a4930e7107c' into gingerbread-plus-aosp * commit 'ff93a851c578d0b570c84b3a83a41a4930e7107c': Bug fix 2337042 <base> URL + <img> URL = URL that starts with "/."
| | * Bug fix 2337042 <base> URL + <img> URL = URL that starts with "/."Melanie Clements2010-08-301-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Android browser inserts "/." at the beginning of the URL path when processing an <img> in an HTML document with a <base> tag. This does not cause any errors but should be fixed to comply with RFC 3986 section 5.4. This only happens at the first pass of the URL parsing, at the second pass where the base and path are parsed together this is dealt with correctly. I am therefore fixing it by modifying the parse() method in KURL to check for a trailing '.' at the end of the base segment. Change-Id: I0d641c8619e00aa2b08a33e271ef863cee5ed7ad
| * | am e9ee2d86: am a4279478: Cherry-pick WebKit change 61921 to fix exploitable ↵Steve Block2010-08-061-28/+39
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | memory corruption in RenderBoxModelObject Merge commit 'e9ee2d864ded6c57c02ebc2ff6e41a0711d099d3' into gingerbread-plus-aosp * commit 'e9ee2d864ded6c57c02ebc2ff6e41a0711d099d3': Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
| | * \ am a4279478: Cherry-pick WebKit change 61921 to fix exploitable memory ↵Steve Block2010-08-061-28/+39
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | corruption in RenderBoxModelObject Merge commit 'a42794783dfec7f142845611dc0f20bfe2657c49' into gingerbread * commit 'a42794783dfec7f142845611dc0f20bfe2657c49': Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
| | | * | Cherry-pick WebKit change 61921 to fix exploitable memory corruption in ↵Steve Block2010-08-051-28/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | RenderBoxModelObject Bug: 2895569 Change-Id: Iea09dc4fdc35e68ccad36deed2132f02e3778e34
| * | | | am 7162fe0e: am 2b6ea029: Cherry-pick WebKit change 60984 to fix an ↵Steve Block2010-08-061-1/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exploitable crash when focus is changed Merge commit '7162fe0e3c5886b6c35f42c5cd9d9e83aa3785cf' into gingerbread-plus-aosp * commit '7162fe0e3c5886b6c35f42c5cd9d9e83aa3785cf': Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
| | * | | am 2b6ea029: Cherry-pick WebKit change 60984 to fix an exploitable crash ↵Steve Block2010-08-061-1/+5
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when focus is changed Merge commit '2b6ea0299b0340ff815b7beab6e7491ff5e4d6c0' into gingerbread * commit '2b6ea0299b0340ff815b7beab6e7491ff5e4d6c0': Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
| | | * | Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is ↵Steve Block2010-08-051-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changed Bug: 2895569 Change-Id: I76f48ca7d6ddee996127254c5f1f00e355318527
| * | | | am 71b088a0: Tracking merge of dalvik-dev to gingerbreadBrian Carlstrom2010-08-051-20/+20
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '71b088a040027130a502f60e6f953c08a194b11e' into gingerbread-plus-aosp * commit '71b088a040027130a502f60e6f953c08a194b11e': Tracking merge of dalvik-dev to gingerbread