summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Remove a FIXME from JavaNPObjectV8 that was forking us from upstream"Steve Block2011-06-081-3/+0
|\
| * Remove a FIXME from JavaNPObjectV8 that was forking us from upstreamSteve Block2011-06-081-3/+0
| | | | | | | | | | | | | | | | | | Filed https://bugs.webkit.org/show_bug.cgi?id=62275 to track this issue upstream. This will reduce future merge conflicts. Change-Id: I22c0826c218bb81f58fb60609849b41b456e6e4c
* | Merge "Fix a whitespace diff with upstream to avoid a future merge conflict"Steve Block2011-06-081-1/+0
|\ \ | |/
| * Fix a whitespace diff with upstream to avoid a future merge conflictSteve Block2011-06-081-1/+0
| | | | | | | | Change-Id: Ia6d9bd8b0a8cd99a569599034b6138e29d89b24d
* | Merge "Fix some include guards in Android files"Steve Block2011-06-0856-127/+129
|\ \ | |/
| * Fix some include guards in Android filesSteve Block2011-06-0856-127/+129
| | | | | | | | | | | | | | | | | | This will become relevant after we merge beyond http://trac.webkit.org/changeset/81977 (and its follow-up build fixes r81982, r81988, r81990, r82018) which relies on all platforms' instances of FontPlatformData.h using the correct include guard. Change-Id: I58ec4c8ee23698c41d86794333d603b95f303764
* | Merge "Remove all contents of Source/ThirdParty other than ANGLE"Steve Block2011-06-083-189/+0
|\ \ | |/
| * Remove all contents of Source/ThirdParty other than ANGLESteve Block2011-06-083-189/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When ANGLE was moved to Source/ThirdParty as part of the merge to WebKit r75315, it was the only item in that directory, so we took all of Source/ThirdParty. Since then, other items have been added upstream to Source/ThirdParty which we don't need or want in our tree, eg http://trac.webkit.org/changeset/81709/trunk/Source/ThirdParty/gyp With this change we remove all contents of Source/ThirdParty other than ANGLE. Future merges will merge only ANGLE from this directory. Change-Id: I1eac0e2824de7f78610d0439e30dc6ba51b1d32d
* | Merge "refactor the TextureInfo out from SharedTexture, no functional change"Teng-Hui Zhu2011-06-076-50/+117
|\ \ | |/ |/|
| * refactor the TextureInfo out from SharedTexture, no functional changeTeng-Hui Zhu2011-06-076-50/+117
| | | | | | | | Change-Id: I9018a8079da1df2fd55c94aacd4ae96227ad2bd2
* | Update PlatformTouchEvent for Android to reflect upstreamed versionSteve Block2011-06-072-3/+0
| | | | | | | | | | | | See http://trac.webkit.org/changeset/81685 Change-Id: Ibc6c1336b696e39f27fd88d9b4e90fe6918ceba8
* | Move all Android modification to Settings to the end of the relevant blockSteve Block2011-06-072-41/+42
|/ | | | | | This will ease future merges Change-Id: I7203cfb0cdc52140802a11cd35c64a9cfd502d30
* Fix issues with setting viewstate before initializingJohn Reck2011-06-042-6/+11
| | | | | | | | | Allow drawing without a CachedRoot (just skip drawing extras in that case) Initialize PictureSet correctly when using the SkPicture ctor If delay-setting a layer on glWebViewState, set isAfterFirstLayout to true to force the baseLayer update. Change-Id: I9b24fd2e8450acf0138433edce8700c9ec227e52
* Merge "Fix the trailing pixels by inflate the invalidate screen rect"Teng-Hui Zhu2011-06-031-0/+2
|\
| * Fix the trailing pixels by inflate the invalidate screen rectTeng-Hui Zhu2011-06-031-0/+2
| | | | | | | | | | | | bug:4313230 Change-Id: I364f418c8e04219d985c4ff7a27328d4e0dbfbd2
* | Merge "Initial support for serializing the view state"John Reck2011-06-037-0/+129
|\ \
| * | Initial support for serializing the view stateJohn Reck2011-06-037-0/+129
| | | | | | | | | | | | | | | | | | Serializes only the base layer currently Change-Id: I5cff216a4fc1b08efe3a7955c616b91114f6bf0b
* | | Merge "Revert "Fix for antialiased text with shadows.""Derek Sollenberger2011-06-031-1/+0
|\ \ \
| * | | Revert "Fix for antialiased text with shadows."Derek Sollenberger2011-06-031-1/+0
| | | | | | | | | | | | | | | | | | | | This breaks master-gpl. We can resubmit this after updating the version of skia in master-gpl. This reverts commit a3d968a2da0ae3463991e973e38af6795ad36c2e
* | | | Merge "Add image/webp to the mimeType list."Shimeng (Simon) Wang2011-06-031-0/+1
|\ \ \ \
| * | | | Add image/webp to the mimeType list.Shimeng (Simon) Wang2011-06-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will let a webp image url be displayed directly inside browser. issue: 3291572 Change-Id: I6870c5461c5d746d11457b7afba26cb277b25bbb
* | | | | Merge "Add API to allow plugins to lock their orientation in full-screen mode."Derek Sollenberger2011-06-037-6/+91
|\ \ \ \ \
| * | | | | Add API to allow plugins to lock their orientation in full-screen mode.Derek Sollenberger2011-06-027-6/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL has companion changes in the framework and browser. bug: 3398386 Change-Id: I3427e61e47b66f4142581fb043eeebc613d71b51
* | | | | | Merge "Fix for antialiased text with shadows."Derek Sollenberger2011-06-031-0/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Fix for antialiased text with shadows.Derek Sollenberger2011-06-031-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | bug: 4502715 Change-Id: I5301526da2ff4962e7d1fda2b0ad39c407013e05
* | | | | am 3ae2cf5e: (-s ours) Merge from honeycomb-LTE - do not mergeJean-Baptiste Queru2011-06-020-0/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '3ae2cf5eef8df00445146297df2bef1f74537dbf': Update isFallbackFamily() with missing fonts
| * \ \ \ \ Merge from honeycomb-LTE - do not mergeJean-Baptiste Queru2011-05-261-1/+15
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic966b478eb67830bfe44fbf4d3b7984508300c66
| | * \ \ \ \ am 0da3e5e1: Update isFallbackFamily() with missing fontsRussell Brenner2011-05-261-1/+15
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '0da3e5e1d2b913ba0c47bfd1c7923bbce60faa6a': Update isFallbackFamily() with missing fonts
| | | * | | | | Update isFallbackFamily() with missing fontsRussell Brenner2011-05-261-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Skia maps numerous fonts to the standard system fonts. Only a few of these were matched by isFallbackFamily(). This brings them to parity, adding standards like arial, times, courier, and more. Bug: 4499169 Change-Id: I02a1816501c61f59ebaddb487bb0ff24cc5c1cca
* | | | | | | | Update RenderLayer.cpp with upstreamed version of crash fixSteve Block2011-06-021-9/+3
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See https://bugs.webkit.org/show_bug.cgi?id=56107 Bug: 4026385 Change-Id: I381b0d1ee115cd6eda92136d150b8cf7e33558ac
* | | | | | | Fix a whitespace diff in SubresourceLoader.cppSteve Block2011-06-021-1/+1
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will avoid future merge conflicts Change-Id: I5d4cc4665ed096b86a7f6dc892bd44ff4c590e65
* | | | | | Merge "Remove Android guard EMULATE_JSC_BINDINGS"Steve Block2011-06-023-72/+30
|\ \ \ \ \ \
| * | | | | | Remove Android guard EMULATE_JSC_BINDINGSSteve Block2011-06-023-72/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This flag is always set to true and will not be upstreamed, so should be removed, along with code for the 'else' case. Also clean up Android modifications to minimise diff and add guards. Change-Id: I7d3b7bab2fef772bffdf3a402cc318dbea5f5865
* | | | | | | Merge "Fix master-gpl build."Ben Murdoch2011-06-021-1/+4
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix master-gpl build.Ben Murdoch2011-06-021-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turn off prelinking of libwebcore. This has no effect in the master branch where the prelinker no longer exists, but will disable prelinking in the master-gpl branch and fix the build as libwebcore has grown in size with the last merge (to r80534). Change-Id: Id42fca910b4c6604fe127904c7e8704cc62cd768
* | | | | | | Merge "Fix compiler warning in CachedResourceLoader"Steve Block2011-06-021-2/+1
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Fix compiler warning in CachedResourceLoaderSteve Block2011-06-021-2/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure initializer list is in same order as members in header. Change-Id: I93dfd1c6bba851b8fb8fb839d2b5b1c226a78dcd
* | | | | | Always check weak global references before using themSteve Block2011-06-0211-238/+567
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We hold weak references to Java objects from native code in several places to avoid circular reference problems. These objects may become weakly reachable at any time, after which the GC could null our weak reference, so we have to null-check at every use. Note that weak references are nulled before the referent is finalized, so we can't rely on doing work in the finalizer to wait for the currently executing message to complete and to remove other messages from the queue. This effectively reverts https://android-git.corp.google.com/g/#change,30955 Bug: 4336862 Change-Id: I431fcac11220cb406c26e31aacb9bda7ea22776e
* | | | | | Merge "JavaScriptCore/config.h should not include WebCore/config.h"Steve Block2011-06-021-6/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | JavaScriptCore/config.h should not include WebCore/config.hSteve Block2011-06-021-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All WebKit ports other than Chromium use a separate set of include paths for building JSC vs WebCore, so source files pick up the appropriate version of config.h. Android uses a single set of include paths, so gets aroud this problem by adding WebCore/ to the include path first and including JavaScriptCore/config.h from WebCore/config.h. This is ugly and will cause problems in an upcoming merge due to new macros being defined in both files. The two files are very similar. JavaScriptCore/config.h adds only the following two defines ... - HAVE_STDINT_H - This is not used on Android - WTF_CHANGES This patch removes the include of JavaScriptCore/config.h from WebCore/config.h and adds WTF_CHANGES for Android. Note that Chromium uses only WebCore/config.h and adds WTF_CHANGES in a similar way. Change-Id: Ib9c93eda0023096aa40dde947b5a476c207542e0
* | | | | | Merge WebKit at r80534: Update ThirdPartyProject.propBen Murdoch2011-06-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6fd3f707dbb4d5f0e6c3dcd5f33a79d22a480ec8
* | | | | | Merge WebKit at r80534: Fix CSSComputedStyleDeclaration.cppBen Murdoch2011-06-022-48/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update our uses of CSSPrimitiveValue following http://trac.webkit.org/changeset/80463 Change-Id: I216382423f496b90af61b044b2a4bda9a6c322de
* | | | | | Merge WebKit at r80534: Fix JSNavigatorCustom.cppBen Murdoch2011-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | InternalFunction::info has been renamed InternalFunction::s_info so update our code to reflect this. See http://trac.webkit.org/changeset/79132 Change-Id: I8118b513fcee8b1e8e9e53241e1b0507cf3df68b
* | | | | | Merge WebKit at r80534: Fix GraphicsContextAndroid.cppBen Murdoch2011-06-021-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to provide an Android implementation of new setCTM() function. See http://trac.webkit.org/changeset/78704 Change-Id: Iefd0225495bec6f4945f02660a450018e4270593
* | | | | | Merge WebKit at r80534: Fix EditorClientAndroidBen Murdoch2011-06-022-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make EditorClientAndroid inherit from TextCheckerClient. See http://trac.webkit.org/changeset/78533 Add EditorClient callbacks. See http://trac.webkit.org/changeset/78532 Change-Id: Ia0f68e2047306415502d5ff1d40cd384c5db91e3
* | | | | | Merge WebKit to r80534: Fix ChromeClientAndroidBen Murdoch2011-06-022-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tabsToLinks() has been removed and keyboardUIMode() has been added. See http://trac.webkit.org/changeset/80279 Change-Id: Idd92678728737fa313cfababff4d9aadee83be76
* | | | | | Merge WebKit at r80534: Fix MediaPlayerPrivateAndroid.cppBen Murdoch2011-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update for MedaEngineRegistrar change. See http://trac.webkit.org/changeset/80473 Change-Id: I3931805339b8b66b371db01f3823daba2cedf56f
* | | | | | Merge WebKit at r80534: Fix FrameLoaderClientAndroid.Ben Murdoch2011-06-022-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new shouldStopLoadingForHistoryItem() stub. See http://trac.webkit.org/changeset/79107 Rename FrameLoaderClient::decidePolicyForMIMEType to decidePolicyForResponse. See http://trac.webkit.org/changeset/80475 Change-Id: If094cc923b5d3b56c25a79847961bb11790f50d1
* | | | | | Merge WebKit at r80534: Fix IconDatabase uses.Ben Murdoch2011-06-024-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebCore::iconDatabase() now returns a reference rather than a pointer. Update our calls to reflect this. See http://trac.webkit.org/changeset/80299 Change-Id: Iebf2f199fd8913e227572753cee2cf3a2e380985
* | | | | | Merge WebKit at r80534: Fix JavaMethod.cppBen Murdoch2011-06-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partial cherry pick of http://trac.webkit.org/changeset/81040 Need to add the JSC guard (it was added unguraded in http://trac.webkit.org/changeset/79904) Change-Id: I880e241e2369ee4ffc616286d195989655e18cc2
generated by cgit v1.1 at 2024-09-19 19:31:05 +0000