summaryrefslogtreecommitdiffstats
path: root/WebKit
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge Webkit at r58956: add new FrameLoaderClient methods. See ↵Ben Murdoch2010-05-142-0/+7
| | | | | | | | | | | | http://trac.webkit.org/changeset/58686 and http://trac.webkit.org/changeset/58111 Change-Id: Iebc4ab59ac768d4dde2fe56f63657d98c4b9db3a
* | Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-14225-1366/+7336
|/ | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* restrict nav cache picture to content width, heightCary Clark2010-05-121-1/+2
| | | | | | | | | | | | | | | Formerly, the nav cache picture recorded a rectangle of (0, 0, INT_MAX, INT_MAX). If the drawing was subsequently translated, the rectangle wrapped around and futher drawing was clipped out. Now the drawing is constrained to the contentWidth and contentHeight -- the enclosing picture already had this restriction. http://b/2604141 Change-Id: Idde1cbaeb507310813a7c5b00e3dde9cacebe44d
* fix the pause() problem...Nicolas Roard2010-05-111-0/+1
| | | | Change-Id: I997b2e5f1fed2bf5abba8bb027df9390c99a8c0f
* Merge webkit.org at r58033 : Settings::setDatabasesEnabled() has been removedSteve Block2010-05-111-1/+2
| | | | | | | | | | We should use Database::setIsAvailable() instead. See http://trac.webkit.org/changeset/55666, http://trac.webkit.org/changeset/55667 and http://trac.webkit.org/changeset/55809 Change-Id: Iead4dac03f791d2bde8e7ee20e452b2100ed1e4f
* Merge webkit.org at r58033 : Implement ↵Steve Block2010-05-111-0/+5
| | | | | | | | MIMETypeRegistry::isApplicationPluginMIMEType() for Android See http://trac.webkit.org/changeset/56661 Change-Id: I3f0047c7a4424b9aed928388a24977b1b415267e
* Merge webkit.org at r58033 : Update ChromeClientAndroid with refactoring of ↵Steve Block2010-05-112-7/+16
| | | | | | | | ChromeClient::repaint() See http://trac.webkit.org/changeset/55675 and http://trac.webkit.org/changeset/55864 Change-Id: I8bf64fa0315877f8fafabe2a9e3c5ca8cc1e362c
* Merge webkit.org at r58033 : Update ChromeClient::iconForFiles()Steve Block2010-05-112-2/+3
| | | | | | See http://trac.webkit.org/changeset/56439 and http://trac.webkit.org/changeset/57903 Change-Id: I9e05104b452804a74623b6b8e915dcaebf9cca7c
* Merge webkit.org at r58033 : Update stubbed methods in InspectorClientAndroidSteve Block2010-05-111-15/+1
| | | | | | See http://trac.webkit.org/changeset/56051 Change-Id: I6b30d9fbb157ec77e8ba93cb0fa9a6e0c2a9ec81
* Merge webkit.org at r58033 : ↵Steve Block2010-05-112-2/+2
| | | | | | ChromeClient::cancelGeolocationPermissionRequestForFrame() now takes a Geolocation parameter Change-Id: I26acb60fc15511968f81628c44c29670d8324cc7
* Merge webkit.org at r58033 : FrameLoader::setEncoding() has movedSteve Block2010-05-111-1/+1
| | | | | | See http://trac.webkit.org/changeset/57927 Change-Id: I3ee9f44de1cbe22ab4a795791763ff9facfd298d
* Merge webkit.org at r58033 : Add missing SharedBuffer.h includeSteve Block2010-05-111-0/+1
| | | | Change-Id: Ib7b420dd18f20c5a62c40080f698ec88edefb8b6
* Merge webkit.org at r58033 : Use new ZoomMode enumSteve Block2010-05-111-1/+1
| | | | | | See http://trac.webkit.org/changeset/55387 Change-Id: Ieacfed3cd4bfea79d22e42d909d9a88b7ec9b42c
* Merge webkit.org at r58033 : Update location of KeyboardCodes.hSteve Block2010-05-112-2/+2
| | | | | | See http://trac.webkit.org/changeset/56704 Change-Id: I0091045727b5dcbbeebcd0d3839a220d8af176c7
* Merge webkit.org at r58033 : Update location of CString.hSteve Block2010-05-1117-25/+23
| | | | | | See http://trac.webkit.org/changeset/56825 Change-Id: I8ba6a9685dcd1d8c4dec3400fba81e19fcbfe74d
* Merge webkit.org at r58033 : Resolve merge conflictsSteve Block2010-05-111-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - CanvasRenderingContext2D.cpp - Take upstream, conflict due to cherry-pick of security fix, see 285b474734e82bc42b25e48ea4824f8050badb4f - CanvasSurface.cpp, HTMLCanvasElement.cpp - convertLogicalToDevice has been refactored. See http://trac.webkit.org/changeset/56447 - Chrome.cpp/h, ChromeClient.h - Take upstream, conflict due to cherry-pick of cancelling Geolocation permission request - Document.h - Take both, conflicts due to ANDROID_META_SUPPORT - DragImage.h - Take both, conflict due to Android addition - EmptyClients.h - Take upstream, conflicts due to Geo cancel permission request - EventHandler.cpp - Take both, conflicts due to recently upstreamed touch events and ANDROID_PLUGINS - EventHandler.cpp - Keep ours, conflict due to touch event bug fixes not yet upstreamed. See 7f034a1734d634dd1fdb3b64817d5828b5e46922 and 73adc26dba4be1d9da34a7f0907cb7b12f10c909 - FileSystemPOSIX - Take both, conflict due to ANDROID_PLUGINS - FrameLoader.cpp - Take both, conflct due to ANDROID_BLOCK_NETWORK_IMAGE - FrameView.cpp - Take both, conflict due to Android frame flattening - Geolocation.h - Merge conflicts due to Android-specific changes - Geolocation.cpp - Take upstream, conflict due to addition of Geolocation maximumAge - GeolocationPositionCache.cpp - Take upstream, conflict due to addition of ENABLE_GEOLOCATION guards - Gradient.h - Take both, conflict due to Android addition - HTMLLinkElement.cpp, DocLoader.cpp - Take both, conflict due to new link prefetching not yet upstreamed. See f91ac8eab3399adb5325701bebe0590a77e49df7 - HTMLMetaElement.cpp - Take both, conflict due to recently upstreamed meta element - JavaInstanceJSC.cpp - Take both, conflict due to Android additional logging - MediaPlayer.cpp/h - Take both, conflict due to Android-specific change - PlatformTouchPoint.h - Take upstream, conflict due to recently upstreamed unsigned stuff - RenderFrame.cpp, RenderFrameSet.h - Take both, conflict due to Android frameset flattening - RenderLayerCompositor.cpp - Take both, conflicts due to Android layers code - Settings.cpp/h - Conflict due to ANDROID_PLUGINS - TextInputController.h - Take upstream, git got confused - V8DOMWindowShell.cpp - Take upstream, conflict due to cherry-pick of method to add V8 bindings for page cache, see 8fecd9c9a62aa89fb44ed3142ba583dc7b8cbe29 - V8DOMWraper.cpp - Take upstream, conflict due to recently upstreamed WORKERS guards - WebCore.xcodeproj - Take upstream, conflict due to addition of Geolocation maximumAge - Widget.h - Take both, conflict due to Android addition - jsc/JNIUtilityPrivate.cpp - Take upstream, conflict due to switching from bzero to memset - mac/WebCoreSupport/WebChromeCient.h - Take upstream, conflicts due to Geo cancel permission request Change-Id: I1b75eac220faddf2f84c7fd4fd3436a5e07edf64
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-11547-9968/+48215
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Fix the 'wobbling fixed elements' bug.Nicolas Roard2010-05-101-9/+19
| | | | | | | This CL has a corresponding java counterpart (https://android-git.corp.google.com/g/#change,51150). Bug:2665696 Change-Id: I397100ac1b7ea9e0ecf799902d9ba04fba970cce
* Implement the audio tag in webkit -- the corresponding java CL is ↵Nicolas Roard2010-05-076-250/+534
| | | | | | https://android-git.corp.google.com/g/#change,41406 Change-Id: Ief37a7d9879308f0749fcd569e82fddc3f989a8a
* Provide access to current match highlighted.Leon Scroggins2010-05-062-0/+15
| | | | | | | | Part of fix for issue 2663680 Requires a change to frameworks/base. Change-Id: I79e460867973cbfcb3105d46058de705877f0aa9
* Enable contentEditable.Leon Scroggins2010-05-055-7/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebViewCore.cpp: Open the keyboard when a contentEditable element is put into focus by a click. In key(), return whether the selection changed if a contentEditable element is in focus. CacheBuilder.cpp: Add root contentEditable elements to the navigation tree. CachedNode.h: Include contentEditable elements as elements that want key events. CachedNodeType.h Add a type for contentEditable. WebView.cpp: Do not call setFollowedLink for contentEditable, so that the orange selection ring stays around the field. Add a check to determine whether the page should handle shift and arrow keys. Bug 1788820 Caveats: Does not ensure that the caret remains on screen. Frame::revealSelection is called, but we ignore it for other reasons. Need to investigate that. The cursor will blink if the contentEditable node has focus, even if the user has not clicked on it or has moved to a different input field. Further, while in this state, the user can input text. Requires a change to frameworks/base Change-Id: Ife39254f46dcc1046a075eee2fda6cf4879b4ee8
* Merge "Fix typo in FrameLoaderClientAndroid.cpp"Steve Block2010-05-051-1/+1
|\
| * Fix typo in FrameLoaderClientAndroid.cppSteve Block2010-05-051-1/+1
| | | | | | | | Change-Id: Ia852fa791d5c77ba80500e59926568cb9990bcac
* | am ce99ade6: am 6452300d: am d294ab99: Update plugin\'s dirtyRect to match ↵Derek Sollenberger2010-05-031-0/+10
|\ \ | | | | | | | | | the dirtyRect returned when locking a surface.
| * \ am 6452300d: am d294ab99: Update plugin\'s dirtyRect to match the dirtyRect ↵Derek Sollenberger2010-05-031-0/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | returned when locking a surface. Merge commit '6452300d47d77d78e874862c5f7908746b04c1f8' into kraken * commit '6452300d47d77d78e874862c5f7908746b04c1f8': Update plugin's dirtyRect to match the dirtyRect returned when locking a surface.
| | * | Update plugin's dirtyRect to match the dirtyRect returned when locking a ↵Derek Sollenberger2010-05-031-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | surface. Change-Id: I2c3e6daa10eb9eb651be52bf9387008f154b176d http://b/2650954
* | | | Merge "Fix a return type bug which is complained by gcc-4.6. If compile this ↵Jing Yu2010-05-031-2/+1
|\ \ \ \ | | | | | | | | | | | | | | | function iwht gcc-4.6, gcc complains that "error: 'GlyphSet::GlyphSet' names the constructor, not the type"."
| * | | | Fix a return type bug which is complained by gcc-4.6.Jing Yu2010-05-021-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If compile this function iwht gcc-4.6, gcc complains that "error: 'GlyphSet::GlyphSet' names the constructor, not the type". Change-Id: I34f3a66dc33f8dca93e4c0db1d87236bf3efc6ae Tested: With the patch, gcc-4.4.0 is still working correctly. With the patch, gcc-4.6 works well too.
* | | | | Merge changes ↵Steve Block2010-04-29148-2717/+12156
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ie9ba4c69,I35363367,I18aaae5f,I2c315360,I4f163c97,Ib640e64c,I98a4af82 * changes: Merge webkit.org at r55033 : Update WebKit revision Merge webkit.org at r55033 : Update Android-specific LayoutTest expected result Merge webkit.org at r55033 : Implement FrameLoaderClient::didTransferChildFrameToNewDocument for Android Merge webkit.org at r55033 : Implement PluginPackage::NPVersion for Android Merge webkit.org at r55033 : Implement new ChromeClient::iconForFiles method for Android Merge webkit.org at r55033 : Fix merge conflicts Merge webkit.org at r55033 : Initial merge by git
| * | | | Merge webkit.org at r55033 : Implement ↵Steve Block2010-04-273-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FrameLoaderClient::didTransferChildFrameToNewDocument for Android This method is required because the latest version of WebKit adds the ability for an existing Frame object to be relocated in the DOM. See http://trac.webkit.org/changeset/54938 and http://trac.webkit.org/changeset/53871 Change-Id: I18aaae5f6db005b7a0d29c3d783207fa37548572
| * | | | Merge webkit.org at r55033 : Implement new ChromeClient::iconForFiles method ↵Steve Block2010-04-272-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for Android See http://trac.webkit.org/changeset/54923 Change-Id: I4f163c9716ca5e01b24f04337cf6c813e9faf0f7
| * | | | Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-27144-2712/+12129
| | | | | | | | | | | | | | | | | | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* | | | | Merge "Do not hide the cursor ring when clicking on a <select> element."Leon Scroggins2010-04-274-5/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Do not hide the cursor ring when clicking on a <select> element.Leon Scroggins2010-04-274-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a CachedNodeType for <select> elements. If the cursor node is a <select> element, do not call setFollowedLink, which would hide the cursor ring. Bug 1694023 Change-Id: I2df2e70391b5f5969683b71b1e69bc24cba8946f
* | | | | Merge "move CachedInput::init() to cpp"Cary Clark2010-04-272-4/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | move CachedInput::init() to cppCary Clark2010-04-262-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation of init() calls bzero, which is defined in CachedPrefix.h. if CachedInput.h is included directly bzero may not be defined. It is always defined for CachedInput.cpp. http://b/2535696 enter the commit message for your changes. Lines starting Change-Id: I995498cd4bc611f0f1a45aadf27a1fd330e62410
* | | | | Add more padding round select boxes, use different assets atLeon Clarke2010-04-263-35/+81
| |/ / / |/| | | | | | | | | | | | | | | | | | | different resolutions, use new assets and don't deform the arrows when stretching the select box. http://b/issue?id=2506670
* | | | Merge "Fixes the Geolocation mock position timestamp"Steve Block2010-04-231-1/+1
|\ \ \ \
| * | | | Fixes the Geolocation mock position timestampSteve Block2010-04-231-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I96010209387446306fd548a87cf203a9505e6d03
* | | | | am 29189dc4: am 6ec27fea: am 5076efcd: don\'t hide transparent nodesCary Clark2010-04-221-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | am 6ec27fea: am 5076efcd: don\'t hide transparent nodesCary Clark2010-04-221-1/+1
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | Merge commit '6ec27fea860849da854f5c3bcfd7b4798b08efc0' into kraken * commit '6ec27fea860849da854f5c3bcfd7b4798b08efc0': don't hide transparent nodes
| | * | | don't hide transparent nodesCary Clark2010-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A node may be transparent if the body of the node is drawn earlier. In this case, the node may not be tested to see if it has been occluded by later drawing, since no drawing inside the scope of the node is actually visible. So, skip the hidden test for transparent nodes. Change-Id: Ib748e9e7b86252f791ee68198d1d794fb4591a88 http://b/2582455
* | | | | am 68b8e349: am 0f92e845: am 55ab51c0: Merge "nextTextField may walk off the ↵Cary Clark2010-04-225-34/+44
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | end or try invalid frames" into froyo
| * | | am 0f92e845: am 55ab51c0: Merge "nextTextField may walk off the end or try ↵Cary Clark2010-04-225-34/+44
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | invalid frames" into froyo Merge commit '0f92e845ed6499088958acf229f196ad67965f63' into kraken * commit '0f92e845ed6499088958acf229f196ad67965f63': nextTextField may walk off the end or try invalid frames
| | * | nextTextField may walk off the end or try invalid framesCary Clark2010-04-225-34/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrote nextTextField() to check range and frame, and to more resemble other node walkers. Caller no longer passes uninitialized frame in focused case, and looks at parent frames after the target node. Change-Id: I7ea9dffb75d28bdd9d71d83921058feca6baf928 http://b/2607250
* | | | am 5c6e2c78: am 34a423ba: am 22804c07: Pass scroll mode to Java so that we ↵Grace Kloba2010-04-152-0/+16
|\ \ \ \ | |/ / / | | | | | | | | can handle overflow on html and body correctly.
| * | | am 34a423ba: am 22804c07: Pass scroll mode to Java so that we can handle ↵Grace Kloba2010-04-142-0/+16
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | overflow on html and body correctly. Merge commit '34a423ba5b431f032c09b5a6702b2cd3944bda3b' into kraken * commit '34a423ba5b431f032c09b5a6702b2cd3944bda3b': Pass scroll mode to Java so that we can handle
| | * | Pass scroll mode to Java so that we can handleGrace Kloba2010-04-132-0/+16
| | | | | | | | | | | | | | | | | | | | overflow on html and body correctly. Fix http://b/issue?id=2512549
* | | | Merge "Remove the TouchStationary state from PlatformTouchPoint."Ben Murdoch2010-04-152-9/+0
|\ \ \ \
| * | | | Remove the TouchStationary state from PlatformTouchPoint.Ben Murdoch2010-04-142-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is being tracked upstream at webkit.org in https://bugs.webkit.org/show_bug.cgi?id=37609 Change-Id: Ideb26d7457e27799564e8db9b3308a703a1110e2