summaryrefslogtreecommitdiffstats
path: root/Source/WebKit
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Use isHighEndGfx to double texturesJohn Reck2011-11-211-4/+9
| | | | | | | | | | | | | | | | | | Bug: 5639612 Change-Id: I308f6fbb8208a0d2e83f2b6d285d4c471137a0e7
* | | am 59b140f3: Merge "Content and viewport rects set in one step." into ics-mr1Bart Sears2011-11-181-88/+71
|\ \ \ | |/ / | | | | | | | | | * commit '59b140f3e2721433929e11087d0fdb626afb1a72': Content and viewport rects set in one step.
| * | Merge "Content and viewport rects set in one step." into ics-mr1Bart Sears2011-11-181-88/+71
| |\ \
| | * | Content and viewport rects set in one step.George Mount2011-11-161-88/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5342918 The content rect of the WebView was being retrieved during the draw while the viewport rect was being set when the draw functor was setup. During animations, the content rect was changing between the time the draw functor was retrieved and it was executed. The content rect is now being set with the viewport rect. Framework change: I1b0978ee Change-Id: I05d68dcc73ede1e919ddc1478f48b372b7b64042
* | | | Merge "Audit misuse of PassRefPtr"Russell Brenner2011-11-173-11/+11
|\ \ \ \
| * | | | Audit misuse of PassRefPtrRussell Brenner2011-11-163-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Removing ANDROID_INSTRUMENTATION code"Kristian Monsen2011-11-1711-845/+16
|\ \ \ \ \ \
| * | | | | | Removing ANDROID_INSTRUMENTATION codeKristian Monsen2011-11-1711-845/+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 d6945dd4: Merge "Position WebTextView correctly on layers" into ics-mr1Michael Kolb2011-11-171-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | | * commit 'd6945dd4dc2d427a38d75cde40767fce404f69fc': Position WebTextView correctly on layers
| * | | | | Merge "Position WebTextView correctly on layers" into ics-mr1Michael Kolb2011-11-161-1/+1
| |\ \ \ \ \
| | * | | | | Position WebTextView correctly on layersMichael Kolb2011-11-151-1/+1
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5550648 Change-Id: If3d59e0d197e9383b64f6a9e17d94e022044b5c3
* | | | | | am 73a306c4: Merge "Fix CacheManager to correctly write CacheFiles to disk." ↵Ben Murdoch2011-11-162-6/+6
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | | | | | | | | | | into ics-mr1 * commit '73a306c4d2dd650b9a083deb6362fc6ba3cf9032': Fix CacheManager to correctly write CacheFiles to disk.
| * | | | Merge "Fix CacheManager to correctly write CacheFiles to disk." into ics-mr1Ben Murdoch2011-11-162-6/+6
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix CacheManager to correctly write CacheFiles to disk.Ben Murdoch2011-11-152-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | am 29244862: Fix text selection handle positioningJohn Reck2011-11-153-3/+14
|\ \ \ \ \ | |/ / / / | | | / / | |_|/ / |/| | | * commit '292448625cf74fa0cbb6776572d5b116d2e7eb15': Fix text selection handle positioning
| * | | Fix text selection handle positioningJohn Reck2011-11-153-3/+14
| |/ / | | | | | | | | | | | | | | | Bug: 5620362 Change-Id: Ic75ba855b5b86f8b0c3a21ee5dcbcc92b0dc982a
* | | Merge "Fix for bug 5594865: Network error"Kristian Monsen2011-11-141-0/+1
|\ \ \
| * | | Fix for bug 5594865: Network errorKristian Monsen2011-11-141-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Using ERROR_CONNECT for ERR_CACHE_MISS Change-Id: I27c089c01e5df1d3b77f719862552328eb1f53ce
* | | | am 7c2e38b6: Merge "Enable SPDY protocol." into ics-mr1Selim Gurun2011-11-111-2/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '7c2e38b61270efe55f065d765228ace66b54f169': Enable SPDY protocol.
| * | | Merge "Enable SPDY protocol." into ics-mr1Selim Gurun2011-11-111-2/+1
| |\ \ \
| | * | | Enable SPDY protocol.Selim Gurun2011-11-101-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5524112 Reenable SPDY protocol. Change-Id: I0144791020b64e20a12b7cd45ac2427100bef8a7 Signed-off-by: Selim Gurun <sgurun@google.com>
* | | | | am e5c39206: Remove inset for WebTextViewMichael Kolb2011-11-111-2/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit 'e5c39206de45588678bf718a8274432068d702f6': Remove inset for WebTextView
| * | | | Remove inset for WebTextViewMichael Kolb2011-11-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5383911 By removing the inset we cover webkit's text field completely Change-Id: Ib3edf21beb4e26b38b2195a9e336523336f26eb7
* | | | | am 0de683c1: Merge "Fix combobox metrics and asset scaling" into ics-mr1Michael Kolb2011-11-112-17/+39
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '0de683c1b300c8e788c178c63b7dc71189c0a3d8': Fix combobox metrics and asset scaling
| * | | | Merge "Fix combobox metrics and asset scaling" into ics-mr1Michael Kolb2011-11-112-17/+39
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix combobox metrics and asset scalingMichael Kolb2011-11-102-17/+39
| | |/ / | | | | | | | | | | | | | | | | | | | | Bug: 5521553 Change-Id: I630eda2ffd90d0c986f00c5a2a4b523e93537192
* | | | am 1067d8e6: Merge "Fix CTS regressions from merge to r74534." into ics-mr1Ben Murdoch2011-11-101-2/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '1067d8e648ceae4db56ce5cc2b3dac1786d557d1': Fix CTS regressions from merge to r74534.
| * | | Merge "Fix CTS regressions from merge to r74534." into ics-mr1Ben Murdoch2011-11-101-2/+0
| |\ \ \
| | * | | Fix CTS regressions from merge to r74534.Ben Murdoch2011-11-101-2/+0
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebKit change http://trac.webkit.org/changeset/73385 removed overflow dimensions from the calculation of layer dimensions. This means that the optimisation inside the nav cache to skip building a frame cache when one of the layer dimensions is 0 is no longer valid (as the layer may contain only overflow content). Bug: 5572431 Change-Id: I3c973ad1ed57b07217d19f5d4fba7bfe522a2165
* | | | am 9074815a: Merge "Support pausing drawing" into ics-mr1John Reck2011-11-101-1/+11
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '9074815a647bc5401963370e16b71e758fc3f550': Support pausing drawing
| * | | Merge "Support pausing drawing" into ics-mr1John Reck2011-11-101-1/+11
| |\ \ \
| | * | | Support pausing drawingJohn Reck2011-11-091-1/+11
| | |/ / | | | | | | | | | | | | | | | | | | | | Bug: 5594608 Change-Id: I09590f8c04904957b079f0458022b960599eb47a
| * | | 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
* | Part of fix for bug 5584571 Add HTTP request header with app nameKristian Monsen2011-11-092-1/+21
| | | | | | | | | | | | | | | | | | | | Getting the app package name from JNI. Cache the string after the first call. Add a header to every request with: X-Requested-With: com.package.name Change-Id: If9d8c131f6c4203036678516ccae6a7ec9131df9
* | am 00d524fd: Merge "Change the default webView behavior to minimize the ↵Teng-Hui Zhu2011-11-071-2/+6
|\ \ | |/ | | | | | | | | | | memory consumption" into ics-mr1 * commit '00d524fd5dc3e995e2b517da48e479694260ce2f': Change the default webView behavior to minimize the memory consumption
| * Merge "Change the default webView behavior to minimize the memory ↵Teng-Hui Zhu2011-11-071-2/+6
| |\ | | | | | | | | | consumption" into ics-mr1
| | * Change the default webView behavior to minimize the memory consumptionTeng-Hui Zhu2011-11-071-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For now, we just limit the expansion on x and y direction. In the future, we need to dynamically allocate and deallocate the memory. browser change is : c/148242 bug:5522175 Change-Id: I8562c39c55913ab89848afe8a36e8a2784c12727
* | | am 82ccbd8c: Remove the global button lockJohn Reck2011-11-074-132/+5
|\ \ \ | |/ / | | | | | | | | | * commit '82ccbd8ce95211b4b5afad6a653462fd3beb771b': Remove the global button lock
| * | Remove the global button lockJohn Reck2011-11-074-132/+5
| | | | | | | | | | | | | | | | | | | | | Bug: 5558699 Bug: 5572238 Change-Id: Ic199ffda5bc4aa09d39ee54221c6fcce6a91ca05
* | | am 9f3355b5: Fix crash in Autofill.Ben Murdoch2011-11-031-7/+9
|\ \ \ | |/ / | | | | | | | | | * commit '9f3355b57b144ac285d6bb28e39268a8e9f26fd6': Fix crash in Autofill.
| * | Fix crash in Autofill.Ben Murdoch2011-11-031-7/+9
| |/ | | | | | | | | | | | | | | Fix a crash in autofill that can be caused by toggling the setting on and off. Bug: 5452927 Change-Id: I80ba0b823fd16cb4e2df3359be95f3d063a9b091
| * Report a load error when network loads blocked. Do not mergeBen Murdoch2011-10-314-19/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry pick from master. When network loads are blocked, we should fail those loads rather than leaving them dangling. In particular, this fixes an issue where WebCore will wait to do the first layout while CSS loads are pending. If network loads are blocked, we need to tell WebCore they are never going to complete. To implement this, we make use of the Chromium stack's load flags and move the code to a more suitable location. Bug: 5416543 Change-Id: I4bd9987611364b29d3ccaa50437d418a5eb9a5cd
* | Fix debug buildSteve Block2011-10-282-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - FrameLoaderClientAndroid::dispatchDidClearWindowObjectInWorld() FrameLoader::url() was removed in http://trac.webkit.org/changeset/76872. We should use Document::url() instead. - ImageBufferAndroid See http://trac.webkit.org/changeset/77286 and http://trac.webkit.org/changeset/77398 - Add PluginDebug.cpp to build - ChromiumIncludes.h Don't build Chromium code without NDEBUG set - Frame.cpp We should not include WebKit files from WebCore. WebViewCore.h introduces problems due to the change to ChromiumIncludes.h and is not required here. Bug: 5448972 Change-Id: I82c5c95591bf01fb65179282d03f865df4255c89
* | am 75fd6068: Merge "Keep text handles in sync with native touch targets" ↵John Reck2011-10-273-4/+46
|\ \ | |/ | | | | | | | | | | into ics-mr1 * commit '75fd6068b065c26beb1ce4d86090aaacbe243c22': Keep text handles in sync with native touch targets
| * Keep text handles in sync with native touch targetsJohn Reck2011-10-273-4/+46
| | | | | | | | | | | | | | | | Bug: 5522153 Also add some slop to the handle targets, cleaned up the JNI and improved debugging. Change-Id: I3b2c3c8b1543d4a1aa599ae2938fa78fe95e01bf
| * Merge "DO NOT MERGE Adjust text selection position" into ics-mr1John Reck2011-10-253-3/+12
| |\