summaryrefslogtreecommitdiffstats
path: root/Source/WebKit
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge WebKit at branches/chromium/742 r89068: Initial merge by Git.Ben Murdoch2011-07-132-8/+3
| | | | | | Take us to top of Chrome 12 release branch (12.0.742.130) Change-Id: I4408a97e343a118cf4a1bb9d71367bcc2c16ae48
* Merge "Merge Chromium at r12.0.742.93: Update Autofill files in WebKit."Ben Murdoch2011-07-125-175/+208
|\
| * Merge Chromium at r12.0.742.93: Update Autofill files in WebKit.Ben Murdoch2011-07-125-175/+208
| | | | | | | | | | | | | | | | | | | | | | | | | | Apply diffs to the forked copies of Chromium files we keep in external/webkit. See: http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/renderer/autofill/form_manager.cc?r1=67599&r2=82248 http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/renderer/autofill/form_manager.h?r1=67599&r2=82248 http://src.chromium.org/viewvc/chrome/branches/742/src/webkit/glue/form_field.cc?r1=67599&r2=82248 http://src.chromium.org/viewvc/chrome/branches/742/src/webkit/glue/form_field.h?r1=67599&r2=82248 Change-Id: If62167848d86293cb833c593afd2c0c958bafbef
* | notImplemented() should always log to logcatSteve Block2011-07-121-11/+13
|/ | | | | | | | | | | | | | - Update Android's version of notImplemented() to match that on other platforms and only log once for each method. - Remove lowPriority_notImplemented(), as this was added way back in https://mondrian.corp.google.com/changelist/16159-p9 and I'm pretty sure the distinction between that and notImplemented() has long since been lost. - Move verifiedOk() to FrameLoaderClientAndroid.cpp as this is the only place it is used. Bug: 5008643 Change-Id: I6552a2a736873b4dfb0933e55af3ab862b60f87c
* Merge "Possible fix for bug 3335863: 3-second delay before Incognito state ↵Kristian Monsen2011-07-081-0/+4
|\ | | | | | | is cleared"
| * Possible fix for bug 3335863: 3-second delay before Incognito state is clearedKristian Monsen2011-07-011-0/+4
| | | | | | | | | | | | | | Force removing pending PageCache deletes when deleting a WebView. Change-Id: Ibd62f7b841e311a907c01a626834559b3bd9f263
* | Merge changes I02f589b6,Ie54a0054,I80966819,Ib8898076,Ie3d53bc3Kristian Monsen2011-07-089-96/+83
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | * changes: Merge Chromium at r12.0.742.93: Direct access in FormField Merge Chromium at r12.0.742.93: Autofill fixes Merge Chromium at r12.0.742.93: Snapstart error code removed Merge Chromium at r12.0.742.93: CookiePolicy update Merge Chromium at r12.0.742.93: Updating include paths
| * | Merge Chromium at r12.0.742.93: Direct access in FormFieldKristian Monsen2011-07-074-70/+58
| | | | | | | | | | | | | | | | | | | | | | | | FormField changed to a struct with public members instead of a class with setters and getters. CL: http://codereview.chromium.org/6625087 Change-Id: I02f589b671147c1ff09661b032c979c85e15a264
| * | Merge Chromium at r12.0.742.93: Autofill fixesKristian Monsen2011-07-072-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AutoFillProfile -> AutofillProfile renaming: http://codereview.chromium.org/6658030 Moved from AutofillType to AutofillFieldType, upstream CL: http://src.chromium.org/viewvc/chrome/branches/742/src/chrome/browser/autofill/autofill_profile.h?r1=77630&r2=78518&pathrev=88489 Change-Id: Ie54a0054221d28b20622f94dd882975c73a5aec1
| * | Merge Chromium at r12.0.742.93: Snapstart error code removedKristian Monsen2011-07-071-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Snapstart error code removed upstream, removing it from our list as well. Chromium CL: http://src.chromium.org/viewvc/chrome/branches/742/src/net/base/net_error_list.h?r1=76644&r2=81288&pathrev=88489 Change-Id: I80966819f04d13d73608dfb2d1510eabe4a64f38
| * | Merge Chromium at r12.0.742.93: CookiePolicy updateKristian Monsen2011-07-072-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Async functionality removed, and const added. Needed to make the Mutex mutable so it can be changed in the const function. Chromium CL: http://src.chromium.org/viewvc/chrome/branches/742/src/net/base/cookie_policy.h?view=diff&pathrev=88489&r1=80659&r2=80660 Change-Id: Ib8898076cd6a22ccac4f719bc9ed437bf36d7b44
| * | Merge Chromium at r12.0.742.93: Updating include pathsKristian Monsen2011-07-071-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | chromium CL: http://codereview.chromium.org/6714032 Also fix another orderding when I was there. Change-Id: Ie3d53bc3816760f8f0d1a41c5d458968c35afc80
* | | When restoring the global reference in the WeakJavaInstance destructor, ↵Steve Block2011-07-081-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | always do so from our weak global reference This avoid using a stale local reference in the case that calls to begin() and end() are unbalanced. Bug: 5006434 Change-Id: I3d1bb4ecfe11e9b54fb2a48b6ab9663ea753be54
* | | Delete a JNI local ref in WebViewCore::openFileChooser()Steve Block2011-07-081-9/+4
|/ / | | | | | | Change-Id: I3a488125d86a4f8cc63691ae7035cad0eadaf514
* | Avoid leaking JNI local references in UrlInterceptResponseSteve Block2011-07-062-1/+5
| | | | | | | | | | Bug: 4509854 Change-Id: I70bd6b5f1ce32263b1f048a7bb5e732338e7297d
* | Merge "Update viewport using webkit's way."Shimeng (Simon) Wang2011-07-012-0/+18
|\ \ | |/ |/|
| * Update viewport using webkit's way.Shimeng (Simon) Wang2011-07-012-0/+18
| | | | | | | | | | | | | | | | | | The Android's customized way of parsing viewport meta tags is kept intact; while the viewport update notification mechanism is changed to use webkit's way. This gives much better notification of viewport switching. issue: 4975315 Change-Id: I7896b67d684efec015245ee804a9243e72ff0b50
* | Merge changes I899af0a4,I1d8b554a,Iefb91f0bKristian Monsen2011-07-0113-100/+100
|\ \ | | | | | | | | | | | | | | | | | | * changes: Merge Chromium at r11.0.696.0: Compile fix, update include location Merge Chromium at r11.0.696.0: Compile fixes in WebRequestContext.cc Merge Chromium at r11.0.696.0: Just AutoFill => Autofill renaming
| * | Merge Chromium at r11.0.696.0: Compile fix, update include locationKristian Monsen2011-06-301-1/+1
| | | | | | | | | | | | | | | | | | | | | chrome/browser/tab_contents/tab_contents.h has moved to content/browser/tab_contents/tab_contents.h Change-Id: I899af0a4895f0d6a30850c65c22fbc67c7bedd88
| * | Merge Chromium at r11.0.696.0: Compile fixes in WebRequestContext.ccKristian Monsen2011-06-291-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Members in UrlRequestContext was made private in: http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_context.h?view=diff&pathrev=77261&r1=75164&r2=75165 Using setter to set instead of using variable directly. Change-Id: I1d8b554a1f017d39acbf5ae014e934631c29049b
| * | Merge Chromium at r11.0.696.0: Just AutoFill => Autofill renamingKristian Monsen2011-06-2911-94/+94
| |/ | | | | | | Change-Id: Iefb91f0b784c26b503125017ae3582a28e7d530d
* | Refactoring: Moved 'SkLayer' to 'Layer' class in webkitChris Craik2011-06-302-4/+4
| | | | | | | | Change-Id: Ie1c24e5e402c539e0359810cfdf872178fa083c1
* | Merge "Use full scrollable area for content width/height."Shimeng (Simon) Wang2011-06-291-1/+1
|\ \ | |/ |/|
| * Use full scrollable area for content width/height.Shimeng (Simon) Wang2011-06-281-1/+1
| | | | | | | | | | | | | | | | Currently after webkit merge, the content width/height is only for visible area. issue: 4672075 Change-Id: Ib7d51119a59131f1443a3c0d59980a8da34b4173
* | Merge "Revert Android specific method name"Kristian Monsen2011-06-292-2/+2
|\ \
| * | Revert Android specific method nameKristian Monsen2011-06-292-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The name change was reverted in external/chromium in: https://android-git.corp.google.com/g/#change,118320 This fixes external/webkit after that change. Change-Id: I21ff90a8759deee1799e718e0bac06b165477606
* | | 2nd try: Bubbles up the url that has the invalid certificate.Huahui Wu2011-06-283-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | Same as this CL https://android-git.corp.google.com/g/#change,117817 except one minor change to make the build happy: Change-Id: Ie863737eee00c42de5d7a289b60aff8c2cfaa8e2
* | | Merge "Revert "Bubbles up the url that has the invalid certificate.""Huahui Wu2011-06-283-8/+5
|\ \ \ | |_|/ |/| |
| * | Revert "Bubbles up the url that has the invalid certificate."Huahui Wu2011-06-283-8/+5
| | | | | | | | | | | | This reverts commit f072ccf633e8c2c2812289f0e65f18320f2147c8.
* | | Merge "Bubbles up the url that has the invalid certificate."Huahui Wu2011-06-283-5/+8
|\ \ \ | |/ /
| * | Bubbles up the url that has the invalid certificate.Huahui Wu2011-06-273-5/+8
| |/ | | | | | | | | | | | | | | | | | | b/2689122 SSL error shows the wrong page when triggered by an image/javascript in the page This CL bubbles the url, which has the invalid cert, up to framework to display it. Related CLs are: Framework: https://android-git.corp.google.com/g/#change,117828 Browser: https://android-git.corp.google.com/g/#change,117835 Change-Id: If01ea2320aa50450a6d3d409123bed5a9f101d61
* | Prevent GL rings on layersJohn Reck2011-06-271-1/+2
|/ | | | | | | | | Bug: 4496611 Rings on layers are still drawn with the software path, but the gl ones are also drawn and in the wrong location. For now, prevent the drawing of the incorrect GL rings Change-Id: I7436dec9da3ce936b2ed0c4aa549a31b00e6e066
* Merge "Fix compiler error when DEBUG is turned on"Teng-Hui Zhu2011-06-221-1/+1
|\
| * Fix compiler error when DEBUG is turned onTeng-Hui Zhu2011-06-211-1/+1
| | | | | | | | Change-Id: I1a9d8eab3e5259eade94fc9e825ec4d162a1e392
* | Fix fast/encoding/dumpAsText//utf-16-no-bom.xmlBen Murdoch2011-06-211-0/+4
|/ | | | | | | | | | | This test now expects us to use the XMLTreeViewer, so make sure that it's enabled. SetDeveloperExtras enables the XMLTreeViewer and Inspector, but we have no inspector on Android, so this is just toggling the XMLTreeViewer on. Change-Id: I365930f34003d6e97aed88af77746c784a3c3bd1
* Merge "Ignore the initial empty document when setting viewport size."Shimeng (Simon) Wang2011-06-171-0/+5
|\
| * Ignore the initial empty document when setting viewport size.Shimeng (Simon) Wang2011-06-171-0/+5
| | | | | | | | | | | | | | | | | | This fixes the issue where "google legal" dialog will show empty content, since the initial empty document will get laid out and used in some circumstances. issue: 4501857 Change-Id: I779d983f3c81724663391872de81ceed025adec1
* | Change mTextSize to be a percentageJohn Reck2011-06-161-9/+3
| | | | | | | | Change-Id: I22720665be2900121acaa3801adc36f3d7fddeae
* | Merge "Set appropriate initial viewport bounds."Shimeng (Simon) Wang2011-06-151-1/+8
|\ \ | |/
| * Set appropriate initial viewport bounds.Shimeng (Simon) Wang2011-06-151-1/+8
| | | | | | | | | | | | | | | | This fixes lots of cases where various legal/license dialog show empty content. issue: 4501857 Change-Id: I113b1b43ec1b2f17fad4bf9fbf6aa17f8b10240c
* | Merge "Rmove unnecessary passing of unused parameter"Ben Murdoch2011-06-151-1/+1
|\ \ | |/ |/|
| * Rmove unnecessary passing of unused parameterBen Murdoch2011-06-161-1/+1
| | | | | | | | | | | | | | Requires a change in external/chromium, see If349cd2ffd56b9f539d4ebdb8944964fc57289e5 Change-Id: I88d7c291ee1ffd1b1c413ffaf59acf5e4ae57c78
* | Merge "Support for getting the background color"John Reck2011-06-151-0/+15
|\ \ | |/ |/|
| * Support for getting the background colorJohn Reck2011-06-141-0/+15
| | | | | | | | Change-Id: Ia8b0f97a5d50b3c16b8d59bb7af42899a614b676
* | Merge changes I637b26fb,Icf028ea9Kristian Monsen2011-06-146-9/+12
|\ \ | |/ |/| | | | | | | * changes: Merge Chromium at r11.0.672.0: Fix autofill Merge Chromium at r11.0.672.0: Compile fixes
| * Merge Chromium at r11.0.672.0: Fix autofillKristian Monsen2011-06-081-3/+3
| | | | | | | | | | | | | | | | | | | | Major refactoring in CL: http://codereview.chromium.org/5958021 Created wrapper function to call in chromium CL: https://android-git.corp.google.com/g/#change,113980 Change-Id: I637b26fb2e3ccb544adfc818b94047ef5a2c5aad
| * Merge Chromium at r11.0.672.0: Compile fixesKristian Monsen2011-06-085-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | WebRequestContext.h: http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request_context.h?r1=70592&r2=71522&pathrev=74924 Other files: base/lock.h moved to base/synchronization/lock.h contents to base namespace: http://codereview.chromium.org/6018013 Change-Id: Icf028ea9cd32746c6681751bc86935aefb7c0084
* | Merge WebKit at branches/chromium/742 r88085: Implement new ↵Steve Block2011-06-141-0/+2
| | | | | | | | | | | | | | | | | | ChromeViewClient::webView() This is only required on Chromoium See http://trac.webkit.org/changeset/85823 Change-Id: I61069d27bfbdabb88474c759e2bb8723e5913783
* | Merge WebKit at branches/chromium/742 r88085: Initial merge by git.Steve Block2011-06-1417-101/+1491
| | | | | | | | Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
* | Merge "Add javascript 'select' event"Russell Brenner2011-06-131-0/+6
|\ \
generated by cgit v1.1 at 2025-09-15 16:04:31 +0000