summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android/jni
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Enable History API.Ben Murdoch2011-12-161-0/+7
|/ / | | | | | | | | | | | | | | The HTML5 History API is disabled at runtime by default in WebKit. Configure it to be enabled. Bug: 5767904 Change-Id: Ic6b6860ca4bfe891e84fb0445d67c7ea728c6fe3
* | Fix use of LOG_VERBOSE in WebHistorySteve Block2011-12-121-18/+18
| | | | | | | | | | | | | | This fixes the debug build. See https://android-git.corp.google.com/g/#/c/150512 Change-Id: Id85c11788c2ad913f8826aa55f49f25401b7ee42
* | am f1a22119: Merge "Fix image layer codepath" into ics-mr1Nicolas Roard2011-12-011-20/+4
|\ \ | |/ | | | | | | * commit 'f1a221194f2b0d5fd82d2e98ced94f0553c45986': Fix image layer codepath
| * Fix image layer codepathNicolas Roard2011-11-301-20/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - asynchronous loading - support for tiled content using TiledTexture - fix repaint/duplication bugs - share same textures as layers - disambiguate between images by computing a CRC code - added better debugging in TilesManager/ClassTracker to track memory usage bug:5661120 bug:5572134 bug:5521718 Change-Id: Id422fb991d6233bbe4dc6e5c3c7409468b7dca98
| * Merge "DO NOT MERGE Use unsigned length when reading data" into ics-mr1Russell Brenner2011-11-301-1/+1
| |\
| | * DO NOT MERGE Use unsigned length when reading dataRussell Brenner2011-11-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With a signed length, invalid negative sizes can bypass data limit checks of the type: if (data + length < end) With an unsigned length, absurdly large lengths will now trigger an early exit instead of following through into the decoding routine with a bad length. Bug: 5143832 Change-Id: I8e4a8d357ee04a36e35ab47d538ce57088734ccf
* | | am 807ee5ec: Merge "synchronize animation starts with webkit" into ics-mr1Chris Craik2011-11-302-5/+23
|\ \ \ | |/ / | | | | | | | | | * commit '807ee5ec662a7864dee505040ade9a9b3eab143c': synchronize animation starts with webkit
| * | synchronize animation starts with webkitChris Craik2011-11-292-5/+23
| |/ | | | | | | | | | | | | | | | | | | bug:5239801 this better supports animations not synchronous with webkit Relies on the frameworks/base CL: https://android-git.corp.google.com/g/#/c/152533/ Change-Id: Ia79a475065b3891db8fc4014559062ab1ac95ebe
* | Merge "Use unsigned length when reading data"Russell Brenner2011-11-291-1/+1
|\ \
| * | Use unsigned length when reading dataRussell Brenner2011-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With a signed length, invalid negative sizes can bypass data limit checks of the type: if (data + length < end) With an unsigned length, absurdly large lengths will now trigger an early exit instead of following through into the decoding routine with a bad length. Bug: 5143832 Change-Id: I50c636ccfbc82a297df802572cf85972dddf8213
* | | am 9c0e7d80: Merge "Fix WebViewCore::createBaseLayer() to always do a layout ↵Steve Block2011-11-291-8/+6
|\ \ \ | |/ / |/| / | |/ | | | | | | and paint the background color" into ics-mr1 * commit '9c0e7d80ade0cc9bbe087838232cd0877fa01a98': Fix WebViewCore::createBaseLayer() to always do a layout and paint the background color
| * Fix WebViewCore::createBaseLayer() to always do a layout and paint the ↵Steve Block2011-11-241-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | background color It seems that it's not valid to do this only when the base layer's inval region is not empty. This is a partial revert of https://android-git.corp.google.com/g/#/c/142481. Bug: 5501576 Change-Id: Ie608674e0b61e0d6280777583c64499ff5afe8a3
* | Merge "Audit misuse of PassRefPtr"Russell Brenner2011-11-172-10/+10
|\ \
| * | Audit misuse of PassRefPtrRussell Brenner2011-11-162-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed Android code for misuse of PassRefPtr in place of RefPtr. Also reviewed for PassOwnPtr and found no apparent misuse. Bug: 5631569 Change-Id: Ib22b340875b1d875091af47cef6510d9c63e351b
* | | Merge "Use RefPtr instead of PassRefPtr for WebHistory"Russell Brenner2011-11-171-20/+20
|\ \ \
| * | | Use RefPtr instead of PassRefPtr for WebHistoryRussell Brenner2011-11-161-20/+20
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | In read_item_recursive, there are two instances of PassRefPtr which, according to docs at http://www.webkit.org/coding/RefPtr.html, should rather be RefPtr. Bug: 5143832 Change-Id: Id8315d3d67de9e0dfc24bd70fdc0b6ef4a25a8a1
* | | Removing ANDROID_INSTRUMENTATION codeKristian Monsen2011-11-175-320/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This has not been used for years, and due to WebKit merges the results are not accurate anymore. The resulting code is cleaner, less likely to create merge conflicts, and does not give the impression that this can be turned on and it will still work. Needs CL: https://android-git.corp.google.com/g/#/c/148912/ Change-Id: I617ad00c103ab72038371a3203452d2ccec0e50c
* | | am 73a306c4: Merge "Fix CacheManager to correctly write CacheFiles to disk." ↵Ben Murdoch2011-11-161-0/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | into ics-mr1 * commit '73a306c4d2dd650b9a083deb6362fc6ba3cf9032': Fix CacheManager to correctly write CacheFiles to disk.
| * Fix CacheManager to correctly write CacheFiles to disk.Ben Murdoch2011-11-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | There are two problems with the CacheManager - 1. Need to null terminate the file path used for the cache file on disk. 2. A race condition between starting the background task to write the file and updating internal state variables. These were causing a CTS test to fail. Bug: 5619303 Change-Id: I61f06d50b7ef560ede2f1141fc51d92255d4efbd
| * DO NOT MERGE Offset scroll area by the scroll origin on AndroidGeorge Mount2011-11-092-9/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5268793 The scrolled area for WebView is 0,0 - maxX,maxY while ScrollView can have any origin. On RTL pages, the origin is negative when it can scroll. This scrolls the page to the right when it detects an RTL page. Cherry-picked from master CL: I6a91b97f Framework CL: I2537b84a Change-Id: I6a91b97f90f5ba4c323c56dda9d125108d9502c4
* | Fix assertion message.George Mount2011-11-101-1/+2
| | | | | | | | | | | | | | | | Bug 5598631 The assertion message was misleading. This corrects it. Change-Id: Ic609804ebac09e6d92fa11dc078aad62126b8690
* | Offset scroll area by the scroll origin on AndroidGeorge Mount2011-11-092-9/+34
| | | | | | | | | | | | | | | | | | | | | | | | Bug 5268793 The scrolled area for WebView is 0,0 - maxX,maxY while ScrollView can have any origin. On RTL pages, the origin is negative when it can scroll. This scrolls the page to the right when it detects an RTL page. Framework CL: I2537b84a Change-Id: I6a91b97f90f5ba4c323c56dda9d125108d9502c4
* | am 82ccbd8c: Remove the global button lockJohn Reck2011-11-073-67/+3
|\ \ | |/ | | | | | | * commit '82ccbd8ce95211b4b5afad6a653462fd3beb771b': Remove the global button lock
| * Remove the global button lockJohn Reck2011-11-073-67/+3
| | | | | | | | | | | | | | Bug: 5558699 Bug: 5572238 Change-Id: Ic199ffda5bc4aa09d39ee54221c6fcce6a91ca05
* | Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGESteve Block2011-10-256-57/+57
|/ | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I821098330652380686aca9e83222936bd5678970
* Force a navcache update before requesting keyboardJohn Reck2011-10-191-0/+4
| | | | | | Bug: 5453541 Change-Id: I209d96d6cd567f7d548549e3e9e5004df045226b
* Improve performances / fixes some glitchesNicolas Roard2011-10-142-9/+11
| | | | | | | | | | - no layout / bgd color check if no inval on the base layer - throttle the number of ImageTexture uploaded per draw call - disable fast layer position update for now bug:5297559 bug:5421309 bug:5218173 Change-Id: I9ff9867dd3cfc2e0805e378d75ea75667fef8673
* Merge "Fix uses of GetByteArrayElements() in WebCoreFrameBridge" into ics-mr0Steve Block2011-10-131-18/+12
|\
| * Fix uses of GetByteArrayElements() in WebCoreFrameBridgeSteve Block2011-10-121-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently, we call GetByteArrayElements() to get a pointer to the data, then modify it, then fail to call ReleaseByteArrayElements. This means that if GetByteArrayElements() happens to take a copy of the data, we'll never sync the modified data back to the JNI object. This change updates the code to use SetByteArrayRegion() which handles releasing any copies that are made by JNI. Also use ScopedLocalRef where possible. Bug: 5442710 Change-Id: Ic8691eb18cac746ee2a2086017ffb9b5558755bd
* | Merge "Refactor the image sharing code" into ics-mr0Nicolas Roard2011-10-131-1/+2
|\ \
| * | Refactor the image sharing codeNicolas Roard2011-10-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | We add a separate Images Manager, working both in GL and software rendering. bug:5425148 Change-Id: Ib5bc88ad94d49c7f1eb969a716691ac98dc10b77
* | | Merge "Correctly guard WebFrame methods needed only with the Chromium HTTP ↵Steve Block2011-10-122-12/+4
|\ \ \ | | | | | | | | | | | | stack" into ics-mr0
| * | | Correctly guard WebFrame methods needed only with the Chromium HTTP stackSteve Block2011-10-122-12/+4
| | |/ | |/| | | | | | | | | | | | | This fixes the break in builds which use the Android HTTP stack. Change-Id: I0feb885754c34e96216c8e0c28390808f424534e
* | | Merge "Modify BrowserFrame.requestClientCert() to take the host and port as ↵Steve Block2011-10-122-9/+6
|\ \ \ | |/ / | | / | |/ |/| a String" into ics-mr0
| * Modify BrowserFrame.requestClientCert() to take the host and port as a StringSteve Block2011-10-122-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently we get the host and port from Chromium as a std::string, convert to a jbyte array to pass over JNI, then convert to String. It's simpler to convert directly to jstring and to pass that over JNI. This also fixes the fact that WebFrame::requestClientCert() fails to call ReleaseByteArrayElements(). Requires https://android-git.corp.google.com/g/141238 in frameworks/base. Bug: 5442710 Change-Id: If81fdef338ecdf2debeece0ebb9926bd261ae219
* | Fix repaint bug. In some cases when the content size changes, theNicolas Roard2011-10-111-0/+24
|/ | | | | | | | | | inval rects we receive from webkit do not fully cover the area that changed. For now, fix this by forcing the invalidation of the entire content (note: we only invalidate the tiles -- we do not force an actual regeneration of the pictureset for the entire content) bug:5361852 Change-Id: I682766d0101d4c8b8a38357dc7846c0030c1f9dc
* Delay sending Plugin Draw event until the surface is ready.Derek Sollenberger2011-10-102-0/+21
| | | | | bug: 5436630 Change-Id: I058a0d750f185c56c0fe70ac0bff7c9781c35dc8
* The new FAST_PICTURESET code path seems to trigger repaintNicolas Roard2011-10-071-1/+1
| | | | | | | | | | bugs in some cases. The current performance improvement of this code path is reasonably small compared to the default PICTURESET. This CL turns off FAST_PICTURESET for now (we will revisit the issue in the future) bug:5406701 Change-Id: I7ab7addf14d46b28ebf6bd4ff7f2b3b4ee044cc4
* Fix WebViewCore uninitialised data.Ben Murdoch2011-10-072-111/+95
| | | | | | | | | | | | | | | | | | | Improve WebViewCore initialisation by using the initialiser list rather than assignment in the constructor. Ensure that *all* members get an initial value. Also remove the WebViewCore::reset(bool) function, that was only being called from the constructor and so is now unnecessary. Additionally remove two completely unused members and one (m_now) that was being written once but never read (and only ever behind a debug #ifdef). Bug: 5399726 Change-Id: I29216737c2406eed1cdc426d011bca0728fdf232
* Merge "Streamline the layers update codepath. Directly update the layers ↵Nicolas Roard2011-10-052-12/+22
|\ | | | | | | transform and position. This makes updates faster and less dependent on other webkit work."
| * Streamline the layers update codepath.Nicolas Roard2011-10-042-12/+22
| | | | | | | | | | | | | | | | | | | | | | Directly update the layers transform and position. This makes updates faster and less dependent on other webkit work. counterpart java CL: https://android-git.corp.google.com/g/#/c/139853/ bug:5218173 Change-Id: I03a76ab853e81f0f12177fb785707ffb8dace330
* | Remove m_contentsImage usageJohn Reck2011-10-041-4/+28
|/ | | | | | Bug: 5410522 Change-Id: Id8457715665dbd51761900011beba57b7f634fff
* Merge "Fine-tune the number of buckets in PictureSet add some clearing logic ↵Nicolas Roard2011-09-301-1/+33
|\ | | | | | | as well"
| * Fine-tune the number of buckets in PictureSetNicolas Roard2011-09-301-1/+33
| | | | | | | | | | | | | | add some clearing logic as well bug:5145259 bug:5255262 Change-Id: I764e2b67ff15893e853e36185cd610e7293d0129
* | Initialize to BUCKET_SIZE instead of 0Russell Brenner2011-09-301-7/+25
|/ | | | | | | | | | Some execution path appears to be leaving mBucketSizeX and/or Y set to 0, causing a divide-by-zero exception. This should only be feasible when mWidth and mHeight are also 0, but, to keep things safe, we'll initialize to BUCKET_SIZE instead. Bug: 5391435 Change-Id: I4e01f980731619e6a6fb70a6eb315c44dd677c7b
* Make bucket sizes in increments of 256Russell Brenner2011-09-272-7/+41
| | | | | | | | | As pages grow, limit the number of bucket refills by making them in chunks of 256 (BUCKET_SIZE). This also fixes a divide-by-zero error in the earlier update to limit the bucket brigade. Bug: 5382243 Change-Id: I4ee6eb86c5934175b7cf0f7b69bcfb416d68b967
* Merge "Limit the number of buckets in a PictureSet"Russell Brenner2011-09-273-34/+45
|\
| * Limit the number of buckets in a PictureSetRussell Brenner2011-09-263-34/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | Added MAX_BUCKET_COUNT_X and _Y so that absurdly large pages, such as those in LayoutTests, don't run out of memory due to millions of buckets. Renamed checkDimensions() to setDimensions() and made inval an optional parameter so that it can be used more generally within PictureSet to adjust settings. Bug: 5300146 Change-Id: Ic6c2dc97085ef38d5782aa005b71a6797d165e24
* | Merge "Clean up style and add some comments in Layer"Steve Block2011-09-221-2/+2
|\ \
| * | Clean up style and add some comments in LayerSteve Block2011-09-211-2/+2
| |/ | | | | | | | | | | | | | | | | This is preparation for https://android-git.corp.google.com/g/#/c/134488/4 Refactoring only, no functional change. Bug: 5262656 Change-Id: I44e362cf35fc5080f7d9fba34183188d3a2a6331