Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge WebKit r47420 | Ben Murdoch | 2009-08-18 | 43 | -276/+394 |
| | |||||
* | Merge commit 'goog/master' into merge | Ben Murdoch | 2009-08-18 | 2 | -0/+21 |
|\ | | | | | | | | | | | | | Conflicts: WebCore/bindings/v8/ScriptController.cpp WebCore/page/Geolocation.cpp WebCore/platform/android/GeolocationServiceAndroid.cpp | ||||
| * | Fix #2058833. For mobile sites, add "width=device-width" if viewport width | Grace Kloba | 2009-08-17 | 2 | -0/+21 |
| | | | | | | | | is not defined as our default viewport width is 800px now. | ||||
* | | Compilation fixes. | Ben Murdoch | 2009-08-17 | 1 | -1/+1 |
| | | |||||
* | | dom, html and loader merges | Andrei Popescu | 2009-08-12 | 2 | -7/+1 |
| | | |||||
* | | Merge in WebKit r47029. | Ben Murdoch | 2009-08-11 | 150 | -892/+3153 |
|/ | |||||
* | Add a callback for parsing apple-touch-icon. | Patrick Scott | 2009-08-05 | 3 | -0/+34 |
| | | | | | | | Call through FrameLoaderClient when an apple-touch-icon attribute is parsed. Instead of always downloaded the icon, just report the url so that if it is needed, it can downloaded by java. It is also a lot more code to let WebCore handle storage and retrieval of the icon. | ||||
* | am 14d2a338: Add security fix as seen in http://trac.webkit.org/changeset/44799 | Cary Clark | 2009-06-26 | 1 | -2/+6 |
|\ | | | | | | | | | | | | | Merge commit '14d2a338a0dd9fe7f2e7833ce90aed2f6eef6e34' * commit '14d2a338a0dd9fe7f2e7833ce90aed2f6eef6e34': Add security fix as seen in http://trac.webkit.org/changeset/44799 | ||||
| * | Add security fix as seen in http://trac.webkit.org/changeset/44799 | Cary Clark | 2009-06-26 | 1 | -2/+6 |
| | | |||||
* | | Update our <select> to work with the latest webkit. | Leon Scroggins | 2009-06-19 | 1 | -7/+0 |
| | | | | | | | | | | | | | | Remove a webkit change that makes some functions public for our use. Instead, use a pointer to a base class where those functions are already public. In one case where a function has been removed, call another function which behaves the same. | ||||
* | | Merge commit 'goog/master-webkit-merge' into webkit-merge-44544 | Feng Qian | 2009-06-18 | 127 | -1609/+1814 |
|\ \ | |||||
| * | | Get WebKit r44544. | Feng Qian | 2009-06-17 | 127 | -1609/+1814 |
| | | | |||||
* | | | am fa67f45c: Fix WebKit keygen. Has submitted the change to webkit as bug 26016. | Grace Kloba | 2009-06-18 | 1 | -0/+4 |
|\ \ \ | |/ / |/| / | |/ | | | | | | | Merge commit 'fa67f45c81b502d6f7125a91131c43f1b8a0ee6b' * commit 'fa67f45c81b502d6f7125a91131c43f1b8a0ee6b': Fix WebKit keygen. Has submitted the change to webkit as bug 26016. | ||||
| * | Fix WebKit keygen. Has submitted the change to webkit as bug 26016. | Grace Kloba | 2009-06-18 | 1 | -0/+4 |
| | | |||||
| * | browser security patches | Cary Clark | 2009-06-03 | 2 | -0/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 25420: REGRESSION: XMLHttpRequest allows loading from another origin - fix: http://trac.webkit.org/changeset/42983 Bug 24575: Cross-origin XMLHttpRequest is always allowed - fix: http://trac.webkit.org/projects/webkit/changeset/41667 Bug 21456: UXSS after navigation via directly referencing document - fix: http://trac.webkit.org/changeset/42223 Bug 22655: Stack overflow crash in WebCore::RenderBlock::layout() with deeply nested <div>s - fix: http://trac.webkit.org/projects/webkit/changeset/41938 | ||||
* | | AI 145796: Land the WebKit merge @r42026. | Feng Qian | 2009-04-10 | 53 | -1584/+1528 |
| | | | | | | | | Automated import of CL 145796 | ||||
* | | AI 144499: Remove some unnecessary ifdef ANDROID code to make our merges ↵ | Leon Scroggins | 2009-04-03 | 1 | -6/+0 |
| | | | | | | | | | | | | simpler. Rather than using a private function, we now use public functions to accomplish the same task. Automated import of CL 144499 | ||||
* | | AI 144288: Remove an #ifdef ANDROID.... We no longer care what the ↵ | Leon Scroggins | 2009-04-02 | 1 | -4/+0 |
|/ | | | | | | selection of the textarea is on focus, since we set the selection before we edit it anyway. Automated import of CL 144288 | ||||
* | auto import from //depot/cupcake/@136594 | The Android Open Source Project | 2009-03-05 | 152 | -2172/+1896 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 264 | -0/+37157 |
| | |||||
* | auto import from //depot/cupcake/@135843 | The Android Open Source Project | 2009-03-03 | 264 | -37157/+0 |
| | |||||
* | auto import from //branches/cupcake/...@127436 | The Android Open Source Project | 2009-01-22 | 9 | -132/+0 |
| | |||||
* | auto import from //branches/cupcake/...@126645 | The Android Open Source Project | 2009-01-15 | 1 | -30/+8 |
| | |||||
* | auto import from //branches/cupcake/...@125939 | The Android Open Source Project | 2009-01-09 | 5 | -50/+1 |
| | |||||
* | Code drop from //branches/cupcake/...@124589 | The Android Open Source Project | 2008-12-17 | 161 | -4391/+4995 |
| | |||||
* | Initial Contribution | The Android Open Source Project | 2008-10-21 | 87 | -1350/+2571 |
| | |||||
* | external/webkit r30707 | Upstream | 1970-01-12 | 254 | -0/+35535 |