summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge Webkit at r70949: Fix conflicts.John Reck2010-11-098-58/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | JavaScriptCore/wtf/Platform.h http://trac.webkit.org/changeset/70726 WebCore/Android.derived.v8bindings.mk http://trac.webkit.org/changeset/70854 WebCore/Android.jscbindings.mk http://trac.webkit.org/changeset/70854 WebCore/Android.mk http://trac.webkit.org/changeset/70854 WebCore/css/CSSStyleSelector.cpp http://trac.webkit.org/changeset/70250 WebCore/page/Settings.cpp http://trac.webkit.org/changeset/70714 WebCore/page/Settings.h http://trac.webkit.org/changeset/70714 WebCore/rendering/RenderBox.h http://trac.webkit.org/changeset/70482 http://trac.webkit.org/changeset/70664 http://trac.webkit.org/changeset/70917 Change-Id: I0cdaca316df016c3885a23d42ee2038777b7ccff
* Merge Webkit at r70949: Initial merge by git.John Reck2010-11-091182-10892/+38231
| | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
* Merge "Add Android expected results for some Appcache tests"Steve Block2010-11-092-0/+12
|\
| * Add Android expected results for some Appcache testsSteve Block2010-11-092-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | These differ from the generic expected results in whitespace only. DRT1 ignores whitespace when comparing results, but DRT2, like DRT for other WebKit platforms does not. It's not clear why Android output differs in whitespace from other platforms, but it seems safer to add Android-specific expected results on a case-by-case basis than to always ignore whitespace. Change-Id: I0bab87e3f5641c4ce81db4e3f74ec7246d3612c7
* | Merge "update dom version on style change"Cary Clark2010-11-097-12/+35
|\ \
| * | update dom version on style changeCary Clark2010-11-087-12/+35
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DOM version number is used to know when the nav cache is out of date. Webkit changes the version when DOM attributes change, but not when the CSS style property changes. Tracking the style version fixes Google properties like the 'Options' menu that is available on mobile devices after a search. Additionally, fix a crash if the root layer doesn't exist. And, rebuild the nav cache always on touch. bug:2628448 Change-Id: I50aa258c1b057ac7deed00f6eca37c0ee323efcf
* | Merge "Encode email addresses that are not mailto: links."Patrick Scott2010-11-082-9/+15
|\ \
| * | Encode email addresses that are not mailto: links.Patrick Scott2010-11-082-9/+15
| |/ | | | | | | | | | | | | | | Fix a few extra copies of KURL and String. Added more characters to the list of allowable mailbox characters. Bug: 3038103 Change-Id: I49bd3ba9c628a70e7e1633d16fc329d64613dbf1
* | Merge "Remove fast/dom/StyleSheet from the list of triaged LayoutTests"Steve Block2010-11-081-1/+0
|\ \
| * | Remove fast/dom/StyleSheet from the list of triaged LayoutTestsSteve Block2010-11-081-1/+0
| | | | | | | | | | | | | | | | | | | | | This should not have been in the list, as the directory was removed in https://android-git.corp.google.com/g/#change,68234 Change-Id: I5400bc5506f7f260d416b30aa27bd4243521b16d
* | | Merge "Null-check in GLUtils::isEGLImageSupported()"Russell Brenner2010-11-081-2/+3
|\ \ \
| * | | Null-check in GLUtils::isEGLImageSupported()Russell Brenner2010-11-051-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid segfault by checking for null strings in GLUtils::isEGLImageSupported() and GLUtils::isEGLFenceSyncSupported(). Bug: 3169653
* | | | Merge "Fix text-shadow style when blur is 0px"Teng-Hui Zhu2010-11-081-7/+4
|\ \ \ \
| * | | | Fix text-shadow style when blur is 0pxTeng-Hui Zhu2010-11-051-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When blur is 0px , the should at least show up without any blurry. http://b/issue?id=2581273 Change-Id: I3db26647c1ed3f7dd29e7045ae6f5c5b81722da6
* | | | | Fix some compiler warningsSteve Block2010-11-083-7/+7
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Noe that in FindCanvas.h we include external/icu4c/common/unicode/umachine.h, rather than external/webkit/WebCore/icu/unicode/umachine.h to avoid warnings about redefining U_NAMESPACE_BEGIN We should be using the header from external/icu4c because we don't include any ICU headers from WebCore. The fix works becuase external/icu4c/common is on the include path, but WebCore/icu is not. Change-Id: I5c0ff1c5815018ba97962595debca12a17bdd0cd
* | | | Merge "Fix compilation error when ANDROID_LAYOUT is not defined."Shimeng (Simon) Wang2010-11-052-1/+5
|\ \ \ \
| * | | | Fix compilation error when ANDROID_LAYOUT is not defined.Shimeng (Simon) Wang2010-11-052-1/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: I6bdb9832bd94017a5f4a894474c30f2cea89d39d
* | | | | Fix the blank screen bug.Nicolas Roard2010-11-051-5/+13
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | As the texture generator thread isn't an infinite loop, we could miss a signaled new request. Bug:3155078 Change-Id: Ifad1ec356b061eec24399cad4b572866f6d74f06
* | | | Support partial invalidation of tiles based on webkit's inval rect.Derek Sollenberger2010-11-0513-205/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL reverts the rollback of the original CL now that we have fixed bug #3165953. This reverts commit 144ccd9c8dba05ffaa0ae598f9b70032050fc20e. Change-Id: Ibb5254f652ed95aa3b7b71bf24a2578c51e74a70
* | | | Merge "Do not create GL specific objects if we are not using hw acceleration"Derek Sollenberger2010-11-051-14/+18
|\ \ \ \
| * | | | Do not create GL specific objects if we are not using hw accelerationDerek Sollenberger2010-11-051-14/+18
| | | | | | | | | | | | | | | | | | | | | | | | | bug: 3166223 Change-Id: I5c18b76ac19119c3620636ce5d3b33892e18f523
* | | | | Merge "Code cleanup for FontCacheAndroid.cpp"Russell Brenner2010-11-051-3/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Code cleanup for FontCacheAndroid.cppRussell Brenner2010-11-041-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minor changes to allow check-webkit-style to complete without warning for FontCacheAndroid.cpp. Change-Id: Ifaa8634d53374c94251641d6b9daf5f8114af9e9
* | | | | Merge "Fix browser crash."Patrick Scott2010-11-051-7/+9
|\ \ \ \ \
| * | | | | Fix browser crash.Patrick Scott2010-11-051-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed indenting (3 spaces?). Change-Id: If4a137d1af3ec8a597e8b929e5b4f10240f2f054
* | | | | | Merge "Update method to take const std::string& argument"Kristian Monsen2010-11-052-2/+2
|\ \ \ \ \ \
| * | | | | | Update method to take const std::string& argumentKristian Monsen2010-11-052-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's safe to pass this across threads since NewRunnableMethod copies the argument. Change-Id: I620ebfe64ead7947ac3a6733507865938e04a8df
* | | | | | | Merge "Adjust layers when parent layer scrolls"Cary Clark2010-11-058-44/+154
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Adjust layers when parent layer scrollsCary Clark2010-11-048-44/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a page has layers, it causes the main body of the page to become a layer as well. The scroll position of the WebView must be applied to the layer to translate the cursor rings correctly for hit-testing. Today, applying the scroll position of the WebView screws up overflow scrolling. Until this gets figured out, skip using the scroll position in CacheFrame adjust() and unadjust(). The position of the layer, and all of its parent layers, should be considered when adjusting the rectangle bounds contained by that layer. Before, only the child layer's position was considered. The clip used by scrollable divs may be initialized but never set. If it is empty, ignore it, rather than clipping out all content. In CacheBuilder, remove a couple of unnecessary lines -- the CacheInput initialization clears all members. In SelectText, reverse the order of the xfer mode and paint objects to remove a Skia ref count assert. In CachedInput, make the debug printout current. Overall, added more debugging output (turned off by default). bug:3030370 Change-Id: Ic19c24b3bf33d081a1d0c1f8c06601dcb56ae881
* | | | | | | Send the AutoFill Preview string java side.Ben Murdoch2010-11-054-29/+27
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we have determined that the form can be autofilled, send a preview string over to Java so that we can display it in the drop down box. Requires a change in frameworks/base: https://android-git.corp.google.com/g/#change,77127 Change-Id: Ia0dd899d659c6e5710155f33749255058d7c3faf
* | | | | | Remove extras from GLWebViewState for nowNicolas Roard2010-11-041-0/+4
| |_|_|/ / |/| | | | | | | | | | | | | | Change-Id: Ic4d4866302645edb6c0a457ef6d0bd1d8f9cf484
* | | | | Merge "Revert "Support partial invalidation of tiles based on webkit's inval ↵Derek Sollenberger2010-11-0413-199/+205
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | rect.""
| * | | | | Revert "Support partial invalidation of tiles based on webkit's inval rect."Derek Sollenberger2010-11-0413-199/+205
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit fc92ca2409a95b539274985812d88016b6b84b7e.
* | | | | | Merge "Sync up with chromium/FontLinux.cpp"claireho2010-11-041-401/+400
|\ \ \ \ \ \
| * | | | | | Sync up with chromium/FontLinux.cppclaireho2010-11-031-401/+400
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adopted the code style change for TextRunWalker class from chromium/FontLinux.cpp to android/FontAndroid.cpp. Change-Id: I7f49efcaf5685181980a4ffa3b654d1577e3f9cd
* | | | | | | Map Chromium error codes to WebKit error codes.Iain Merrick2010-11-045-5/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On network errors, we were seeing strange "Data connectivity problem" alert boxes. This is because we were using the HTTP status code instead of a real error code; and when there's a connection error, the HTTP status is uninitialised, so the "error code" was 0 (no error). Bug: 3140283 Change-Id: I0566c29359a0ecb2998573d1a2a77306922c87be
* | | | | | | Merge "Fixed 2720133. Better lookup with @font-face local"Russell Brenner2010-11-041-45/+85
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | / / | | |_|_|/ / | |/| | | |
| * | | | | Fixed 2720133. Better lookup with @font-face localRussell Brenner2010-11-031-45/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using existing Skia APIs, FontCache::createFontPlatformData can detect when the retrieved font is the Skia default and will reject that choice, allowing WebCore to try the next font on the CSS fallback list. If the requested family is a generic family, e.g. "serif" or "monotype", the Skia default will be accepted. Change-Id: I8007caae96f26cd58ea1cf5bf2da8170e3ce6d9d Bug: 2720133
* | | | | | Merge "Support partial invalidation of tiles based on webkit's inval rect."Derek Sollenberger2010-11-0413-205/+199
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Support partial invalidation of tiles based on webkit's inval rect.Derek Sollenberger2010-11-0413-205/+199
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL causes the selective repainting of BaseTiles (and their associated GL textures) using the information provided by Webkit. If tiles need repainted they are marked with as dirty and the thread painting and uploading the textures will only operate on dirty tiles. This change resulted in some significant refactoring most of which revolved around these changes... (1) Removed PaintingInfo from the Texture object and instead track the state of the tile in Tile object. (2) Removed all pending TileSets for a TiledPage when the page produces a new set. This ensures that the tiles currently visible to the user are painted instead of ones that may already be offscreen. Change-Id: I93845d8e6e7b066e6bab84bcde11be4a6940002f
* | | | | | Let Chrome HTTP stack handle number of connectionsKristian Monsen2010-11-041-0/+7
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First of changes based on willchan's feedback. Note that this code doesn't really work as intended anyway. Change-Id: I91d43f1daa78248700738338cf3d24a12496ac19
* | | | | Merge "Hook chromium logging up in WebKit"Kristian Monsen2010-11-045-0/+117
|\ \ \ \ \
| * | | | | Hook chromium logging up in WebKitKristian Monsen2010-11-045-0/+117
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ide08371e0bc8f74ef80fe25d416623bd03ac6038
* | | | | | Merge "Add support for file uploads in WebKit"Kristian Monsen2010-11-047-62/+60
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Add support for file uploads in WebKitKristian Monsen2010-11-047-62/+60
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also moves some of the android file handling to Java so it is not duplicated in both places. This CL needs https://android-git.corp.google.com/g/#change,77400 in frameworks/base Change-Id: I90c1726e6c323a9de3fd64f2e6feef4b64171053
* | | | | Add SSL layout tests at WebKit r70209.Iain Merrick2010-11-0410-0/+66
|/ / / / | | | | | | | | | | | | | | | | | | | | Only 3 tests, all passing. See http://b/issue?id=3164771 Change-Id: I2f3b03969a97618f1d4ba9dd91d782e1814914f0
* | | | Merge "Bug 3158404 : Performance improvement for browser complex script handle."claireho2010-11-031-47/+42
|\ \ \ \
| * | | | Bug 3158404 : Performance improvement for browser complex script handle.claireho2010-11-031-47/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Reduce the number of calls of normalization function. The purpose of NFC normalization is to compose base letter and non-spacing combining marks to be accented character. i.e. Convert A(U+0041) and acute(U+0301) to A with Acute(U+00C1). NFC includes three parts - decomposition, canonical sort and composition for entire string. It is very expensive. TextRunWalker class would like to convert '\t', '\n' and non-break space(\U+00A0) to space. NFC cannot achieve this purpose. So, it is not necessary to call normalization for Font::treatAsSpace(). This improvement saves the NFC nomalization calls for complex script text has '\t', '\n' or 0xA0 and does not have non-spacing combining marks. 2. FontAndroid.cpp scans text for space and punctuation in 2 separate loops. Combine these 2 loops to one pass. Change-Id: I6b1ff20dd1072cf1f03066ce1c87ad39d0040779
* | | | | Merge Chromium at r63472 : WebKit fixes.Iain Merrick2010-11-031-1/+1
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Chromium now uses protocol buffers so we need libprotobuf. See http://src.chromium.org/viewvc/chrome?view=rev&revision=63221 HttpCache takes an extra constructor argument. See http://src.chromium.org/viewvc/chrome?view=rev&revision=61789 Change-Id: I5e78b0de9a8ff86040b13212455eb37a4ed0e39e
* | | | Merge "Unref the picture instead of deleting it"Cary Clark2010-11-031-1/+10
|\ \ \ \
generated by cgit v1.1 at 2025-05-31 08:47:34 +0000