summaryrefslogtreecommitdiffstats
path: root/Source/WebKit
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix onReachedMaxAppCacheSize callback"Selim Gurun2012-07-101-2/+16
|\
| * Fix onReachedMaxAppCacheSize callbackSelim Gurun2012-07-101-2/+16
| | | | | | | | | | | | | | | | | | | | | | Bug: 5869022 When appcache reached max size, a callback is triggered. The second parameter of this callback was returning the used Web SQL quota, which is a rather different concept then AppCache. Fix this to return max database size. Change-Id: I5ece83934d5a43b6927bc8fc25bcae1354c49149
* | Support fullscreen to inline video transition.Teng-Hui Zhu2012-06-274-25/+54
| | | | | | | | | | | | | | | | | | | | | | | | Basically, player is responsible to enter fullscreen mode such that we have the proper proxy updated on the Java side. bug:5710646 framework change: https://android-git.corp.google.com/g/#/c/202139/ Change-Id: Ie7adf620f2e9889142ef153e12d676a5f288bc0a
* | am ff80940a: resolved conflicts for merge of 343fe48a to jb-dev-plus-aospJean-Baptiste Queru2012-06-251-9/+9
|\ \ | | | | | | | | | | | | * commit 'ff80940ae8358f49efbbb2d989b02e4b23dd1930': Accept-Language header is not updated when phone language changes
| * \ resolved conflicts for merge of 343fe48a to jb-dev-plus-aospJean-Baptiste Queru2012-06-251-9/+9
| |\ \ | | | | | | | | | | | | Change-Id: I9b3379ec26c3a0fb208b8cdd66a0b60088c1b01d
| | * \ Merge "Accept-Language header is not updated when phone language changes"Jean-Baptiste Queru2012-06-251-9/+9
| | |\ \
| | | * | Accept-Language header is not updated when phone language changesAnders Edenbrandt2012-06-211-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Java class WebSettings has accessor methods for User Agent and Accept-Language strings. These methods ensure that the values are updated if the Locale has changed. However, WebSettings.cpp in WebKit reads the private fields in WebSettings.java directly, and thereby fails to trigger the update. The correction is to use the appropriate accessor methods from WebSettings.cpp. Change-Id: Id1aa1f4de38d2a73cad9660afc35944c663dbd4a
* | | | | Enable RecordingContext by defaultJohn Reck2012-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Performance seems comparable to SkPicture already, and this makes it easier to iterate on fixing some of the problem areas Change-Id: I2e7b6b282e6b53ba2dc68d8a62b3b982f2b5838d
* | | | | Merge "Remove unused ENABLE_ANDROID_INSTALLABLE_WEB_APPS"George Mount2012-06-224-28/+0
|\ \ \ \ \
| * | | | | Remove unused ENABLE_ANDROID_INSTALLABLE_WEB_APPSGeorge Mount2012-06-214-28/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove an unused #define and code associated with it. This will smooth a possible future webkit merge. Framework change: Ibf046337cdabb9bee9cff8e3d77d9f69a59ecb15 Change-Id: I16d8c457a3f08996bc66401b241fe0db5a118975
* | | | | | Remove updateTextfield for changing passwords.George Mount2012-06-203-19/+8
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The UI no longer needs to know about password field changes as it is not required like it was with the removed WebTextView. Change-Id: I16a6bb44c31c83c5c3e9cb70f2bc865d5eb2732c
* | | | | am 50034a4c: am 903d2ec9: Merge "Don\'t use deleted Node object in ↵Jean-Baptiste Queru2012-06-201-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | setSizeScreenWidthAndScale" * commit '50034a4c4b41e0e3c99ec5a4ce8c6673190e20ac': Don't use deleted Node object in setSizeScreenWidthAndScale
| * | | | am 903d2ec9: Merge "Don\'t use deleted Node object in ↵Jean-Baptiste Queru2012-06-201-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | setSizeScreenWidthAndScale" * commit '903d2ec97b2ac9cf4f50fc3d7f9e503611bce470': Don't use deleted Node object in setSizeScreenWidthAndScale
| | * | | Don't use deleted Node object in setSizeScreenWidthAndScaleMattias Falk2012-06-191-1/+1
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The call to forceLayout may cause the Node object to be deleted. Avoid crash by check that the Node object is still valid when forceLayout has returned. Change-Id: Ieb74a59ca7f2e457b3b17d01bcb02cd566f84ef2
| | * | DO NOT MERGE Add webkit plumbing for file origin policySelim Gurun2012-06-061-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6212665 This is a cherry-pick from master branch. sha: 0ea6dad65eb77f9347a59704b1f8a019cfc9e01f (cherry picked from commit 57633fd9f863f5e1e4ce8fab0eb05ddb535e1be6) Change-Id: I9c2fa81aa3e16d39ed79d171ae09b1f99d9e7082
| * | | DO NOT MERGE Respect the "Make password visible" setting.George Mount2012-06-141-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6667146 Framework Change: I7fc107b02f73f4c54e8fe66484038ea9d7b69d61 Change-Id: I95ffcfa6fa47baad60b1af55f84bee35dfcc7972
* | | | Support recording context in PicturePileJohn Reck2012-06-192-63/+103
| | | | | | | | | | | | | | | | Change-Id: I920d4b967542354136b7f0102ec01c3386a3450a
* | | | Clip selected text within scrollable edit to the edit boundary.George Mount2012-06-183-3/+37
| | | | | | | | | | | | | | | | | | | | | | | | Bug 6666415 Change-Id: Ie19e6bc3eedcbb5c9eb5791ac4b1f55149dcdb72
* | | | Merge "Remove unused and fix build warning"John Reck2012-06-152-18/+0
|\ \ \ \
| * | | | Remove unused and fix build warningJohn Reck2012-06-142-18/+0
| | | | | | | | | | | | | | | | | | | | Change-Id: I68292b54638502d0769e6e8dbeea5d77eef901d0
* | | | | Merge "Respect the "Make password visible" setting."George Mount2012-06-141-2/+6
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Respect the "Make password visible" setting.George Mount2012-06-141-2/+6
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Bug 6667146 Framework Change: I7fc107b02f73f4c54e8fe66484038ea9d7b69d61 Change-Id: I95ffcfa6fa47baad60b1af55f84bee35dfcc7972
* | | | Merge "Show layer tree in hierarchyviewer"John Reck2012-06-142-1/+92
|\ \ \ \ | |/ / / |/| | |
| * | | Show layer tree in hierarchyviewerJohn Reck2012-06-142-1/+92
| | | | | | | | | | | | | | | | Change-Id: I2a53b157d40c630e7ca1361f8e0c8aca1d6e8a4e
* | | | Add detailed tracing to tile paintingChris Craik2012-06-132-2/+3
|/ / / | | | | | | | | | | | | bug:6653638 Change-Id: I839917feb1803bc1f4ace5aa2367067024a18706
* | | Merge "Revert "Revert "Add layer clip check to hide handles when not visible."""George Mount2012-06-121-0/+23
|\ \ \
| * | | Revert "Revert "Add layer clip check to hide handles when not visible.""George Mount2012-06-121-0/+23
| | | | | | | | | | | | This reverts commit c63158835c5027aa7245f331dc23f77cda96e192
* | | | am 101ff140: am b8dbaafe: Merge "Call the right updatePositions*" into jb-devJohn Reck2012-06-121-1/+1
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit '101ff140ede0e7b633699bdb98bddd25b17b6eb2': Call the right updatePositions*
| * | | Merge "Call the right updatePositions*" into jb-devJohn Reck2012-06-121-1/+1
| |\ \ \
| | * | | Call the right updatePositions*John Reck2012-06-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6634077 Software was accidentally calling the inner updatePositions instead of the outer updatePositions which the hardware path calls. Move the inner updatePositions to be protected instead of public to guard against this in the future as well. Change-Id: Ib509f151ce64bf390383eaa0c32a2bae89428e89
* | | | | Merge "Revert "Add layer clip check to hide handles when not visible.""George Mount2012-06-121-23/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Revert "Add layer clip check to hide handles when not visible."George Mount2012-06-121-23/+0
| | | | | | | | | | | | | | | This reverts commit 40369ea6114f406fef50d4241335dd8613372748
* | | | | Merge "Add layer clip check to hide handles when not visible."George Mount2012-06-121-0/+23
|\ \ \ \ \ | |/ / / /
| * | | | Add layer clip check to hide handles when not visible.George Mount2012-06-071-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6590742 Change-Id: Idd1ad305989ab8137597f86b4a6463e052c08a9e
* | | | | Merge "Fix edit text capturing selection."George Mount2012-06-122-23/+24
|\ \ \ \ \
| * | | | | Fix edit text capturing selection.George Mount2012-06-062-23/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6623128 Change-Id: Ia7a9f4bdf9478c8e1e8acb0e9f6e08d779185d11
* | | | | | am f8b2a5a3: am 7fc1c095: Merge "Remove forgotten CHROME_NETWORK_STACK ↵Selim Gurun2012-06-111-2/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | macros" into jb-dev * commit 'f8b2a5a3e2f83bee801a2d19fc1073f37e95fb1f': Remove forgotten CHROME_NETWORK_STACK macros
| * | | | | Merge "Remove forgotten CHROME_NETWORK_STACK macros" into jb-devSelim Gurun2012-06-111-2/+0
| |\ \ \ \ \ | | |_|_|/ / | |/| | | |
| | * | | | Remove forgotten CHROME_NETWORK_STACK macrosSelim Gurun2012-06-081-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6637033 It seems that somehow these macros were forgotten to be removed while dropping http stack, it is likely a merge/rebase issue. Change-Id: I37b14488dbfd786e3e0deab9775f42f21d2205e7
* | | | | | Merge "Support separation interface and implementations of WebView classes"Jonathan Dixon2012-06-081-33/+32
|\ \ \ \ \ \
| * | | | | | Support separation interface and implementations of WebView classesJesse Greenwald2012-06-011-33/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebBackForwardList and WebHistory item are now separated in the Java code. This change is for the correpsonding JNI code. Change-Id: I7358932be6cd82d8558575e953246d9d065da9c2
* | | | | | | am 334b4068: am 92d7c4c4: Merge "Switch stopGL and destroy to use a passed ↵John Reck2012-06-071-6/+7
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | / / | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | in ptr" into jb-dev * commit '334b406839a240e271a59a1157839bfe25c3470e': Switch stopGL and destroy to use a passed in ptr
| * | | | | Merge "Switch stopGL and destroy to use a passed in ptr" into jb-devJohn Reck2012-06-071-6/+7
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Switch stopGL and destroy to use a passed in ptrJohn Reck2012-06-071-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6569073 This is part a cleanup of destroy to eliminate the gap between finalize() and destroy() by allowing both nativeDestroy and nativeStopGL to be called statically Change-Id: I6418cfe64ca03c58d2a395a239739e1577c54dea
| * | | | | Merge "DO NOT MERGE Use scoped_refptr's rather than naked ptrs." into jb-devSelim Gurun2012-06-071-5/+5
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | DO NOT MERGE Use scoped_refptr's rather than naked ptrs.Selim Gurun2012-06-071-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6508448 Cherry pick from master, sha: 6c9f55f6f57bd4da36053c76a1cfce8a15a00a97 This is to make sure webkit usage of scoped refptrs are compatible with chromium changes, see bug for more details. Change-Id: Ib8aa3e29409bfe6fd94ef56376bd2ff2297ec868
* | | | | | Merge "Use scoped_refptr's rather than naked ptrs."Selim Gurun2012-06-071-5/+5
|\ \ \ \ \ \
| * | | | | | Use scoped_refptr's rather than naked ptrs.Selim Gurun2012-06-071-5/+5
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 6508448 This is to make sure webkit usage of scoped refptrs are compatible with chromium changes, see bug for more details. Change-Id: I24e3615ba961ba928d1074d54ea0bfe2d051519a
* | | | | | Merge "Fixed flipped selection handles."George Mount2012-06-071-1/+1
|\ \ \ \ \ \
| * | | | | | Fixed flipped selection handles.George Mount2012-06-061-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 6623406 Change-Id: Ib99d308fe97d245bc55ffb2557319efffb6e6e4f
generated by cgit v1.1 at 2024-08-21 04:27:43 +0000