summaryrefslogtreecommitdiffstats
path: root/JavaScriptCore
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r74534: Initial merge by git.Ben Murdoch2011-05-10155-6040/+9644
| | | | Change-Id: I6ccd1154fa1b19c2ec2a66878eb675738735f1eb
* Better support for exiting full screenTeng-Hui Zhu2011-05-091-0/+4
| | | | | | | | When exiting the full screen, we need to let the webkit know the status. bug:4312214 Change-Id: I4e475da3b426176fd232551e16fbe740994d8d36
* Merge WebKit at r72805: Fix MakefilesSteve Block2011-01-061-1/+0
| | | | | | | | | | This is a partial revert of "Merge Webkit at r73109: Fix Makefiles." Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: Iac42b5b4232b71fab322bf99e74e7fb6c7be10c5
* Merge WebKit at r72805: Initial merge by GitSteve Block2011-01-0660-5196/+4537
| | | | | | | Note that this is a backwards merge from Chromium release 9.0.600.0 to 9.0.597.0, to align with the Chromium 9 stable release branch. Change-Id: I5d2bb4e8cee9d39ae8485abf48bdb55ecf8b3790
* Merge Webkit at r73109: Fix Makefiles.Shimeng (Simon) Wang2010-12-221-1/+8
| | | | Change-Id: If8cc4cfc06399c67b08cf5157852de90876c3d55
* Merge WebKit at r73109: Initial merge by git.Shimeng (Simon) Wang2010-12-22114-5765/+6883
| | | | Change-Id: I61f1a66d9642e3d8405d3ac6ccab2a53421c75d8
* Layers implementation in GL.Nicolas Roard2010-12-161-0/+1
| | | | | | | | | | | | - add textures management code for layers in TilesManager - add the layers drawing GL code - modify BaseLayerAndroid::drawGL() to paint the layers - modify TexturesGenerator to process layers painting requests Note: some further refactoring (when getting rid of SkLayer as a base class) will let us remove some redudant function, e.g. setAnchorPoint/setAnchorPointZ (bug:3292285) Change-Id: I3cc88575f331104d45c89e84ba27f3af755aa845
* Merge WebKit at r72274: Initial merge by git.Russell Brenner2010-12-0255-551/+2182
| | | | Change-Id: Ie51f0b4a16da82942bd516dce59cfb79ebbe25fb
* Merge WebKit at r71558: Initial merge by git.Teng-Hui Zhu2010-11-1734-248/+498
| | | | Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
* Merge Webkit at r70949: Fix conflicts.John Reck2010-11-091-17/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-0985-899/+1561
| | | | Change-Id: I77b8645c083b5d0da8dba73ed01d4014aab9848e
* Merge Webkit at r70209: Fix conflictsBen Murdoch2010-10-261-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore/page/FrameView.cpp http://trac.webkit.org/changeset/69896 WebCore/html/parser/HTMLDocumentParser.cpp http://trac.webkit.org/changeset/69283 WebCore/html/HTMLPlugInElement.h http://trac.webkit.org/changeset/69596 WebCore/html/HTMLInputElement.cpp http://trac.webkit.org/changeset/68996 http://trac.webkit.org/changeset/69378 WebCore/plugins/npapi.cpp http://trac.webkit.org/changeset/69808 WebCore/css/CSSComputedStyleDeclaration.cpp http://trac.webkit.org/changeset/69220 WebCore/css/CSSParser.cpp http://trac.webkit.org/changeset/69196 WebCore/rendering/style/RenderStyle.h http://trac.webkit.org/changeset/68680 WebCore/rendering/RenderImage.cpp http://trac.webkit.org/changeset/68917 WebCore/platform/android/FileSystemAndroid.cpp http://trac.webkit.org/changeset/69594 WebCore/inspector/InspectorController.h http://trac.webkit.org/changeset/68767 See also Android change I4c724f2f52a5a9db6dca6b58032b6a902aac74b5 which is why this is a conflict. JavaScriptCore/parser/Parser.cpp http://trac.webkit.org/changeset/69516 Change-Id: I5a708c6590ba029a2b3ecc3b30478ea303e1f2f5
* Merge Webkit at r70209: Fix Makefiles.Ben Murdoch2010-10-262-1/+6
| | | | Change-Id: Ib60d9a927bad38e128765e122e86bcc547a785cf
* Merge WebKit at r70209: Initial merge by GitBen Murdoch2010-10-26164-2170/+6103
| | | | Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
* Merge WebKit at r68651 : Initial merge by git.Kristian Monsen2010-10-0766-381/+2269
| | | | Change-Id: I3d6bff59f17eedd6722723354f386fec9be8ad12
* Merge WebKit at r67908: Initial merge by GitSteve Block2010-09-2949-437/+1231
| | | | Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972
* Merge WebKit at r67178 : Initial merge by git.Iain Merrick2010-09-1646-266/+1661
| | | | Change-Id: I57e01163b6866cb029cdadf405a0394a3918bc18
* Merge WebKit at r66666 : Initial merge by git.Kristian Monsen2010-09-1172-1607/+2026
| | | | Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
* Merge WebKit at r66079 : Initial merge by gitSteve Block2010-09-0235-625/+1192
| | | | Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
* Merge WebKit at r65615 : Initial merge by git.Iain Merrick2010-08-23135-2275/+3825
| | | | Change-Id: Ifbf384f4531e3b58475a662e38195c2d9152ae79
* Merge Webkit at r65072 : Fix conflicts.Ben Murdoch2010-08-131-4/+0
| | | | | | | | | | | | HTMLInputElement.cpp: New include. See http://trac.webkit.org/changeset/64616 TemporaryLinkStubs.cpp, Navigator.h: Relocation of string forwarders. See http://trac.webkit.org/changeset/65021 GraphicsContext.h, ImageSource.h: addition of WebCore namespace on Chromium's NativeImagePtr type. See http://trac.webkit.org/changeset/64584 Platform.h: Renaming of iPhone PLATFORM macros. See http://trac.webkit.org/changeset/64798 Change-Id: Ife412e30f733fe6bb66321a3600814d6499ddf70
* Merge Webkit at r65072 : Fix Makefiles.Ben Murdoch2010-08-121-0/+3
| | | | Change-Id: I2da1ae98ee39f7f817d4b4363140872b931ac8bf
* Merge WebKit at r65072 : Initial merge by git.Ben Murdoch2010-08-1299-1763/+4512
| | | | Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
* Merge WebKit at r64523 : Initial merge by git.Steve Block2010-08-0926-281/+861
| | | | Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
* Merge Webkit at r64264 : Fix Makefiles.Kristian Monsen2010-08-041-2/+1
| | | | Change-Id: Ie4783363cff9eb7f70d6bbfec1a6237b5f5a72b5
* Merge Webkit at r64264 : Fix conflicts.Kristian Monsen2010-08-041-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Tracs of the changes: WebCore/html/HTMLDocumentParser.cpp http://trac.webkit.org/changeset/63998/trunk/WebCore/html/HTMLDocumentParser.cpp WebCore/page/EventHandler.cpp WebCore/page/EventHandler.h http://trac.webkit.org/changeset/63888 WebCore/page/Page.cpp http://trac.webkit.org/changeset/64208 WebCore/page/Settings.cpp WebCore/page/Settings.h http://trac.webkit.org/changeset/64110 WebCore/rendering/RenderLayerCompositor.h http://trac.webkit.org/changeset/64054/trunk/WebCore/rendering/RenderLayerCompositor.h WebCore/rendering/RenderTableSection.cpp http://trac.webkit.org/changeset/63994/trunk/WebCore/rendering/RenderTableSection.cpp WebCore/rendering/break_lines.cpp http://trac.webkit.org/changeset/64207 Change-Id: I34167b43899ee5066e33b40867cd569ce53f9207
* Merge WebKit at r64264 : Initial merge by git.Kristian Monsen2010-08-0457-1199/+3022
| | | | Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
* Merge WebKit at r63859 : Initial merge by git.Ben Murdoch2010-07-2779-1148/+3193
| | | | Change-Id: Ie8096c63ec7c991c9a9cba8bdd9c3b74a3b8ed62
* Merge WebKit at r63173 : Initial merge by git.Leon Clarke2010-07-2089-934/+3635
| | | | Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44
* Merge WebKit at r62496: Initial merge by gitSteve Block2010-07-0980-3364/+3577
| | | | Change-Id: Ie3da0770eca22a70a632e3571f31cfabc80facb2
* Merge WebKit at r61871: Update makefilesKristian Monsen2010-07-021-0/+2
| | | | Change-Id: I85e597beedb768af8d3cf4aa269ecdeb2af9a113
* Merge WebKit at r61871: Initial merge by git.Kristian Monsen2010-07-0272-256/+4676
| | | | Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
* Merge webkit.org at r61121: Initial merge by git.Ben Murdoch2010-06-16108-1527/+4697
| | | | Change-Id: Icd6db395c62285be384d137164d95d7466c98760
* Merge webkit.org at r60469 : Initial merge by git.Leon Clarke2010-06-0895-30226/+30677
| | | | Change-Id: I66a0047aa2af802f66bb0c7f2a8b02247a596234
* Merge WebKit at r60074: Fix Android makefilesSteve Block2010-05-271-0/+1
| | | | Change-Id: I549373cf00e9cc72060eccaf55e6a3efb0623df0
* Merge WebKit at r60074: Initial merge by gitSteve Block2010-05-27145-3474/+6019
| | | | Change-Id: I18a2dc5439e36c928351ea829d8fb4e39b062fc7
* Merge WebKit at r59636: Fix makefilesKristian Monsen2010-05-252-0/+2
| | | | Change-Id: Ie53e458fbec03234aeb3ba16ce4d90aa629d3575
* Merge WebKit at r59636: Initial merge by gitKristian Monsen2010-05-25109-3836/+7752
| | | | Change-Id: I59b289c4e6b18425f06ce41cc9d34c522515de91
* Merge Webkit at r58956: Update Android makefiles.Ben Murdoch2010-05-142-3/+10
| | | | Change-Id: Ie3bcd0e3d0363ad5fdfa26e275af3cca5f147ca2
* Merge Webkit at r58956: Fix conflicts.Ben Murdoch2010-05-141-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix conflict: JavaScriptCore/wtf/MathExtras.h: Take theirs due to recently upstreamed change http://trac.webkit.org/changeset/58110 Fix conflict: WebCore/dom/Node.cpp: Take both. The Android part can be removed post-merge. Fix conflict: WebCore/platform/ScrollView.cpp Fix conflict: WebCore/platform/ScrollView.h Fix conflict: WebCore/platform/android/ScrollViewAndroid.cpp: Remove ScrollView::platformProhibitsScrolling and ScrollView::scrollRectIntoViewRecursively as they have been removed upstream in http://trac.webkit.org/changeset/58428, http://trac.webkit.org/changeset/58445 and http://trac.webkit.org/changeset/58611. platformProhibitsScrolling was an Android specific function called only from scrollRectIntoViewRecursively. Fix conflict: WebCore/bindings/v8/ScriptCallStack.cpp: Take both (we have an Android specific addition). Fix conflict: WebCore/html/HTMLOptionElement.cpp: Take theirs, our fix has been upstreamed in http://trac.webkit.org/changeset/58490. Fix conflict: WebCore/rendering/RenderBox.cpp: Take theirs. See http://trac.webkit.org/changeset/58177 Fix conflict: WebCore/css/CSSStyleSelector.cpp Take both (Android specific addition). Fix conflict: WebCore/css/CSSParser.cpp Take both (Android specific addition). Fix conflict: WebCore/bridge/jni/jni_jsobject.h: Take theirs. see http://trac.webkit.org/changeset/58775 Fix conflict: FileSystemAndroid.cpp: Fix conflict: FileSystemPOSIX.cpp: Take ours. Our changes have been upstreamed but beyond 58596. See http://trac.webkit.org/changeset/59226 Change-Id: I92c7e319bea9edcc2eb08726654b5c1e163effaf
* Merge Webkit at r58956: Initial merge by Git.Ben Murdoch2010-05-14123-2031/+6248
| | | | Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
* Merge webkit.org at r58033 : Fix MakefilesSteve Block2010-05-111-1/+1
| | | | Change-Id: Ie97b3c249bbda11ec4bc249be915f88361858d85
* Merge webkit.org at r58033 : Initial merge by gitSteve Block2010-05-11269-5657/+17805
| | | | Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
* Merge webkit.org at r55033 : Initial merge by gitSteve Block2010-04-2755-1799/+3292
| | | | Change-Id: I98a4af828067cc243ec3dc5e5826154dd88074b5
* Remove ANDROID guard now that Android fix to MathExtras.h has been upstreamedSteve Block2010-04-221-2/+0
| | | | | | | | | | | | Android's stlport now provides isinf etc. in the std namespace (see https://android-git.corp.google.com/g/41036). This allows us to remove the Android special-case from MathExtras.h (see https://android-git.corp.google.com/g/41037). This change has now been upstreamed in http://trac.webkit.org/changeset/58110 so we can remove the ANDROID guard marking this change. Change-Id: I7c06a5a5a8f9a0a7909a649e68424688bf02893a
* Refactor how we set up the layers hierarchy when using fixedNicolas Roard2010-03-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | composited layers, and fix the z-index position. Bug:2497910 Bug:2450006 We add a new COMPOSITED_FIXED_ELEMENTS define to isolate the changes in the webkit common code. We previously had a problem where the hierarchy of GraphicsLayer (i.e. the backed surfaces associated to the composited RenderLayer) was not reflecting that layers were children of a fixed layer. The workaround we currently have is not fully satisfactory, due to the way we draw layers on screen (in some cases layers were wrongly translated, see Bug:2497910). Instead, modifying the webkit common code simplify things a lot, and makes the patch more likely to be upstreamed to webkit, as it's now a reasonably well-delimited feature (use composited layers for fixed elements). What we do now is to consider fixed elements as a stacking context, which makes all layers children of such elements children too in the GraphicsLayer hierarchy, and modifying the offset of those children accordingly (in RenderLayer.cpp). In addition, we fixes the z-index bugs we had by signaling that there is a fixed element to its siblings, and turning the siblings as composited layers as well (so that the ordering works fully UI-side). Change-Id: I735c6c14d955ef54653f0053187d3495bef1f332
* Re-enable the layersNicolas Roard2010-02-241-1/+1
|
* While upstreaming the JSC JIT patch to the open source Webkit trunk,Huahui Wu2010-02-231-0/+1
| | | | | | there were a few small changes upon the review comments. This CL makes corresponding changes in Android code base to be consistent with the open source Webkit trunk.
* disable webkit layersCary Clark2010-02-211-1/+1
| | | | | With layers enabled, servicing timers saturate the CPU at times. This also fixes a compile-time switch in FindCanvas to disable layers.
* Merge "Updates WebKit's use of cmath to expect isfinite, isinf, isnan and ↵Steve Block2010-02-171-7/+3
|\ | | | | | | signbit to be in the std namespace"
generated by cgit v1.1 at 2025-05-18 05:39:18 +0000