summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* notImplemented() should always log to logcatSteve Block2011-07-122-23/+26
| | | | | | | | | | | | | | - 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 "Clear up the bitmap with white color at initial time"Teng-Hui Zhu2011-07-111-0/+4
|\
| * Clear up the bitmap with white color at initial timeTeng-Hui Zhu2011-07-111-0/+4
| | | | | | | | | | | | bug:4995281 Change-Id: Iee2d508c234d3e1cecb367b0108fd7215730173c
* | Merge "Revert "Factor the scale into the actual screen space calculation.""Shimeng (Simon) Wang2011-07-081-8/+4
|\ \
| * | Revert "Factor the scale into the actual screen space calculation."Shimeng (Simon) Wang2011-07-081-8/+4
| | | | | | | | | | | | This reverts commit 706c2b4c3089f2832c8172c0581e3df110bf534c.
* | | Merge "Add the matrix handle to the shaders."Teng-Hui Zhu2011-07-082-5/+10
|\ \ \
| * | | Add the matrix handle to the shaders.Teng-Hui Zhu2011-07-082-5/+10
| | |/ | |/| | | | | | | | | | | | | We are just getting lucky that the handle is the same for now. Change-Id: I8d897148dfaa29acbb2e23fd8894fcfea7f00215
* | | 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
* | | | Merge "Avoid leaking JNI local references in UrlInterceptResponse"Steve Block2011-07-072-1/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | Avoid leaking JNI local references in UrlInterceptResponseSteve Block2011-07-062-1/+5
| | |/ | |/| | | | | | | | | | Bug: 4509854 Change-Id: I70bd6b5f1ce32263b1f048a7bb5e732338e7297d
* | | Merge "Refactor partial invalidation code"Teng-Hui Zhu2011-07-064-36/+47
|\ \ \
| * | | Refactor partial invalidation codeTeng-Hui Zhu2011-07-064-36/+47
| |/ / | | | | | | | | | Change-Id: Id8612946d845daad86f02f626c3247ff8dc1d2f8
* | | Merge "Remove old scalar conversions"Russell Brenner2011-07-061-4/+4
|\ \ \ | |/ / |/| |
| * | Remove old scalar conversionsRussell Brenner2011-07-011-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The webkit merge from CL 112610 introduced an api change in setrectForUnderline, changing two params from int to float. The body of the function, however, was still performing int to float conversions, resulting in a debug assert within skia and conversion results forced to zero. This CL removes the outdated conversion. Change-Id: I0d5fae39552c3e6801b83e6c4363dc063a01b165
* | | Merge "Factor the scale into the actual screen space calculation."Shimeng (Simon) Wang2011-07-011-4/+8
|\ \ \
| * | | Factor the scale into the actual screen space calculation.Shimeng (Simon) Wang2011-07-011-4/+8
| | | | | | | | | | | | | | | | | | | | issue: 4982074 Change-Id: I5d86539a17393f3060cd67bd4c6888734037c7e4
* | | | Merge "meta format-detection is not a viewport meta tag."Shimeng (Simon) Wang2011-07-013-2/+18
|\ \ \ \ | |/ / /
| * | | meta format-detection is not a viewport meta tag.Shimeng (Simon) Wang2011-07-013-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts some of my previous change which wrongly treats format-detection as a viewport change. issue: 4975315 Change-Id: Icb3ab9b813010b253a59fca6992deb1aa4d186e7
* | | | Merge "Update viewport using webkit's way."Shimeng (Simon) Wang2011-07-016-46/+26
|\ \ \ \ | |/ / /
| * | | Update viewport using webkit's way.Shimeng (Simon) Wang2011-07-016-46/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 "Modified tile reclamation heuristic for multi-webview display"Chris Craik2011-07-0111-30/+64
|\ \ \ \
| * | | | Modified tile reclamation heuristic for multi-webview displayChris Craik2011-07-0111-30/+64
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When tiles are reclaimed, they are now taken first from webviews that haven't been drawn in a while. Previously they were taken from any other webview - which may have been one still being displayed if multiple are onscreen. bug:4049143 partially solved (still not enough graphics memory allocated for tiles on tablet devices) Change-Id: Id400ea28e92ba805120c8353881834157fefa483
* | | | Merge "Update to match the Java side change"Teng-Hui Zhu2011-07-011-1/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Update to match the Java side changeTeng-Hui Zhu2011-06-301-1/+1
| |/ / | | | | | | | | | | | | | | | Java side change: #change,118782 Change-Id: I9f94f2541a2dd197a77210566fb3a8d28102010c
* | | 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
* | Merge "Refactoring: Moved 'SkLayer' to 'Layer' class in webkit"Chris Craik2011-06-3012-19/+379
|\ \
| * | Refactoring: Moved 'SkLayer' to 'Layer' class in webkitChris Craik2011-06-3012-19/+379
| | | | | | | | | | | | Change-Id: Ie1c24e5e402c539e0359810cfdf872178fa083c1
* | | Merge "Add initial support for Ganesh renderer."Derek Sollenberger2011-06-3011-65/+476
|\ \ \
| * | | Add initial support for Ganesh renderer.Derek Sollenberger2011-06-3011-65/+476
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The GaneshRenderer can now be swapped in for the RasterRenderer in BaseTile. A following CL will enable this swap at runtime. Change-Id: Id42040fce2895ab00cccb8f11dfd0489df861655
* | | | Don't create newer LayerTexture when hitting upper bound.Teng-Hui Zhu2011-06-301-0/+4
| |/ / |/| | | | | | | | | | | bug:4976882 Change-Id: If1c913da8bdc3a310a3a665dc895711093fb8788
* | | Added fix for AndroidAnimation copy (m_name was forgotten)Chris Craik2011-06-291-0/+1
| | | | | | | | | | | | | | | bug:4595809 Change-Id: Ieaacb3cf7c6ea51f2ae7d92e5acf5c9fcafcf1d8
* | | 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
* | | Merge "Add BaseRenderer to handle generic rendering tasks."Derek Sollenberger2011-06-296-124/+295
|\ \ \
| * | | Add BaseRenderer to handle generic rendering tasks.Derek Sollenberger2011-06-296-124/+295
| | | | | | | | | | | | | | | | Change-Id: I5cf0e2da4d4f48be5daf176b5aac8222b9919ba9
* | | | Merge "2nd try: Bubbles up the url that has the invalid certificate."Huahui Wu2011-06-283-5/+8
|\ \ \ \ | |/ / / |/| | |