summaryrefslogtreecommitdiffstats
path: root/Source/WebCore
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge "Turn the Surface Texture path on for baseTile"Teng-Hui Zhu2011-06-178-65/+156
|\
| * Turn the Surface Texture path on for baseTileTeng-Hui Zhu2011-06-178-65/+156
| | | | | | | | Change-Id: I852c546b2c62419ccfb96ed1c0d157e49a3b1aef
* | Merge "Interface clean up for porting Surface Texture, no functional change."Teng-Hui Zhu2011-06-178-76/+176
|\ \ | |/
| * Interface clean up for porting Surface Texture, no functional change.Teng-Hui Zhu2011-06-168-76/+176
| | | | | | | | Change-Id: I0d43dd94a1bb4666d20a39b2b272337e89a21d8b
* | Fix rounded rectangle background colour.Ben Murdoch2011-06-161-0/+1
| | | | | | | | | | | | | | | | | | Apply WebKit change http://trac.webkit.org/changeset/83002 to our GraphicsContext port. Bug: 4674341 Change-Id: I1399ae0f12aff3f24417a7d6f36006a73e8e48ff
* | Fix the crash caused by recent webkit RenderLayerCompositor changeTeng-Hui Zhu2011-06-151-0/+9
|/ | | | | | | | | | | | We used to rely on the fact that RenderLayerBacking is the only subclass of GraphicsLayerClient, but now the RenderLayerCompositor also inherit it and is used for iframe. That cause us to get invalid pointer in GraphicsLayerAndroid. The solution here is to disable the new webkit approach b/c we have our own iframe support already. bug:4592195 Change-Id: Ia786233907d83028fdc6865c28fbbd5291564ad0
* Fix build by adding missing WebTiming bindings fileSteve Block2011-06-151-0/+1
| | | | Change-Id: I959b25a9447154395f168132f908c0f4512d4be6
* Adds WebTiming IDL files to build and sets ENABLE_WEB_TIMINGSteve Block2011-06-142-2/+8
| | | | | Bug: 4442995 Change-Id: I9c37d7022946fd66e1ee635328182bf1456b0de7
* Cherry-pick WebKit change 85873 to fix a performance timing bugSteve Block2011-06-141-3/+0
| | | | | | | See http://trac.webkit.org/changeset/85873 Bug: 4442995 Change-Id: I27c5d678a534ec0b64d59868f6f77e51c477e89d
* Merge WebKit at branches/chromium/742 r88085: Initial merge by git.Steve Block2011-06-14125-667/+21646
| | | | Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
* Move all ANDROID defines to wtf/Platform.hSteve Block2011-06-141-130/+1
| | | | | | | | | | | | | | This patch moves many defines from WebCore/config.h to keep all of the Android defines together. Also, WebCore/config.h should not be used by JavaScriptCore (though currently it is on Android), whereas wtf/Platform.h is always included. Some Android defines in WebCore/config.h are already usptreamed, but will be removed in https://bugs.webkit.org/show_bug.cgi?id=62602 Change-Id: Ic6d8c45f4f846a2a7a2d9766179302526c10e2af
* Merge "Ignore webkit-text-size-adjust: none"John Reck2011-06-131-0/+13
|\
| * Ignore webkit-text-size-adjust: noneJohn Reck2011-06-131-0/+13
| | | | | | | | | | | | Bug: 4486008 Change-Id: Iaf810878c6ed216e2431a7718de899a9e8e0d6f8
* | Merge WebKit at r74325: Build fix.Ben Murdoch2011-06-102-0/+4
| | | | | | | | | | | | Cherry pick of upstream patch http://trac.webkit.org/changeset/87424 Change-Id: I6546831e7cecf11bbfd194f0620c56f293b56f2d
* | Merge WebKit at r84325: Fix MediaControls.Ben Murdoch2011-06-105-585/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Shadow DOM work needs to be applied to our local edits to make SliderThumb work with touch events. Several upstream changes are relevant... http://trac.webkit.org/changeset/83256 http://trac.webkit.org/changeset/83397 http://trac.webkit.org/changeset/83545 http://trac.webkit.org/changeset/84222 Change-Id: Ie653c87e6e1d823c50ee22c406aaa79a22bcf530
* | Merge WebKit at r84325: Fix uses of JavaInstance.Ben Murdoch2011-06-102-1/+5
| | | | | | | | | | | | | | | | | | The JavaInstance class is now an interface, so use the provided JavaInstanceJobject implementation instead. See http://trac.webkit.org/changeset/82950 Change-Id: I782e3887e4f059733fbc054ca1d9d97d94e817ef
* | Merge WebKit at r84325: Fix RenderLayerCompositor.cppBen Murdoch2011-06-101-5/+1
| | | | | | | | | | | | | | | | | | iframe compositing propogation now works for <object> and framesets so the methods have been renamed - implement that renaming in our code. See http://trac.webkit.org/changeset/83518 Change-Id: Id1fd6d47f5ac4546f6eddf443658b4b481542292
* | Merge WebKit at r84325: Fix GraphicsContextAndroid.cppBen Murdoch2011-06-101-1/+1
| | | | | | | | | | | | | | | | GraphicsContext::roundToDevicePixels has a new parameter. See http://trac.webkit.org/changeset/83216 Change-Id: I9f215b450c790ac1e6a54959e5cbee43d3a25694
* | Merge WebKit at r84325: Fix ImageBufferData.hBen Murdoch2011-06-102-4/+8
| | | | | | | | | | | | | | | | | | | | Need to include the Android ImageBufferData header. To avoid recursive includes, rename android/ImageBufferData.h to android/ImageBufferDataAndroid.h See http://trac.webkit.org/changeset/83786 Change-Id: Ica2d0c5350810b918d034d0ac227eb6255939584
* | Merge WebKit at r84325: Fix makefiles.Ben Murdoch2011-06-106-47/+29
| | | | | | | | | | | | | | See http://trac.webkit.org/changeset/82562 for new XMLTreeViewer generation. Change-Id: I52c8d510602e7e77ea6a134510f8e5bb6b0c4d9a
* | Merge WebKit at r84325: Fix conflicts.Ben Murdoch2011-06-1020-259/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Platform.h ENABLE_FULLSCREEN_API (http://trac.webkit.org/changeset/83997) WTF_USE_SKIA (http://trac.webkit.org/changeset/84106) JSNavigatorCustom.cpp V8NavigatorCustom.cpp ENABLE(APPLICATION_INSTALLED) (http://trac.webkit.org/changeset/83287) CSSStyleSelector.cpp ANDROID_CSS_RING (http://trac.webkit.org/changeset/83986) Document.cpp ANDROID_META_SUPPORT (http://trac.webkit.org/changeset/83349) ANDROID_INSTRUMENT (http://trac.webkit.org/changeset/82992) HTMLInputElement.cpp ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS (http://trac.webkit.org/changeset/82534) RangeInputType.cpp ENABLE(TOUCH_EVENTS) (http://trac.webkit.org/changeset/83256/) ChromeClient.h ANDROID_INSTALLABLE_WEB_APPS (http://trac.webkit.org/changeset/83375) EventHandler.cpp PLATFORM(ANDROID) (http://trac.webkit.org/changeset/83522) Settings ANDROID_PLUGINS (http://trac.webkit.org/changeset/83201) ANDROID_BLOCK_NETWORK_IMAGE (http://trac.webkit.org/changeset/83628) Gradient.cpp Graphicscontext.cpp HTMLCanvasElement.cpp USE(SKIA) && !PLATFORM(ANDROID) (http://trac.webkit.org/changeset/84088) USE(SKIA) && !PLATFORM(ANDROID) (http://trac.webkit.org/changeset/84101) PluginView.h ANDROID_PLUGINS (http://trac.webkit.org/changeset/84071) RenderBox.h ANDROID_LAYOUT (http://trac.webkit.org/changeset/82611) RenderIframe.cpp (moved code to RenderPart.cpp) PLATFORM(ANDROID) (http://trac.webkit.org/changeset/83518) RenderLayer.cpp ANDROID_OVERFLOW_SCROLL (http://trac.webkit.org/changeset/83899) RenderLayer.h RenderLayerBacking.cpp ANDROID_OVERFLOW_SCROLL (http://trac.webkit.org/changeset/83820) Change-Id: Ieabe98f4e01610b6a73e961b673e2fa99b0010e7
* | Merge WebKit at r84325: Initial merge by git.Ben Murdoch2011-06-101222-27398/+56152
| | | | | | | | Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
* | Fix build break for emulatorKristian Monsen2011-06-091-2/+2
| | | | | | | | | | | | JavaTypeString is only available for V8. Change-Id: I53a1d36b61268496486264cbc6c96fe1e0a5fbd3
* | Fix a bug in the V8 JNI bindings when creating JNI method signaturesSteve Block2011-06-091-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | This was introduced by the latest merge to WebKit r82507. WebKit now uses a new JavaTypeString, distinct from JavaTypeObject, for representing strings in the JNI bridge. We need to account for this when building the JNI method signature. See https://bugs.webkit.org/show_bug.cgi?id=62389 for details. Bug: 4585284 Change-Id: I6a54679b954c32bf03d715da3c958c61baa5fecc
* | Merge "Serialize LayerAndroid"John Reck2011-06-084-12/+36
|\ \
| * | Serialize LayerAndroidJohn Reck2011-06-074-12/+36
| | | | | | | | | | | | | | | | | | | | | For now skip other layer types Doesn't support animtations Change-Id: Id1ff75f3d4d213f56561fc5d9c01f7ffee05cc79
* | | Merge changes ↵Steve Block2011-06-081393-19335/+60016
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I55c6d71a,Ifb3277d4,Ia1b847a2,I7ba9cf3f,Ida2b2a8a,I1280ec90,I72f818d5,I2e3b588b,I9a4e6289,Ia724c78b,Icd8612c8,Ie31b15d7,Ie125edae,I77941a88,I89dae78b,I3516e5ca,I1a4c17b5,I2c4ecc1a,I9c8e6537,Ifac13115,Ie1f80e09,Ia541ed77,I60ce9d78 * changes: Merge WebKit at r82507: Update ThirdPartyProject.prop Merge WebKit at r82507: Cherry-pick change r88166 to add INSPECTOR guards to ScriptProfiler Merge WebKit at r82507: Work around a V8 bug Merge WebKit at r82507: JNIType renamed to JavaType Merge WebKit at r82507: IconDatabaseClient interface expanded Merge WebKit at r82507: Don't use new loss-free code path in HTMLCanvasElement::toDataURL() Merge WebKit at r82507: IcondDatabaseBase::iconForPageURL() renamed Merge WebKit at r82507: IconDatabaseBase::Open() signature changed Merge WebKit at r82507: Node::isContentEditable() renamed Merge WebKit at r82507: Use icon database through IconDatabaseBase Merge WebKit at r82507: toInputElement() is now a member of Node Merge WebKit at r82507: FrameLoaderClient::objectContentType() signature changed Merge WebKit at r82507: StringImpl::computeHash() removed Merge WebKit at r82507: Stub out FontPlatformData::setOrientation() Merge WebKit at r82507: Path::strokeBoundingRect() is now const Merge WebKit at r82507: Add missing UnusedParam.h include in ApplicationCacheGroup.cpp Merge WebKit at r82507: Continue to use Android's version of FontPlatformData.h Merge WebKit at r82507: Update signature of FontCustomPlatformData::fontPlatformData() Merge WebKit at r82507: Fix conflicts due to JNI refactoring Merge WebKit at r82507: Fix conflicts due to new StorageTracker Merge WebKit at r82507: Fix conflicts Merge WebKit at r82507: Fix makefiles Merge WebKit at r82507: Initial merge by git
| * | | Merge WebKit at r82507: Cherry-pick change r88166 to add INSPECTOR guards to ↵Steve Block2011-06-082-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ScriptProfiler See http://trac.webkit.org/changeset/88166 Change-Id: Ifb3277d49c14dd600979c8c21c876ed8bc0e4a62
| * | | Merge WebKit at r82507: JNIType renamed to JavaTypeSteve Block2011-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/81860 Change-Id: I7ba9cf3f5a739f4d94e9189f6eb6dd4f8f645787
| * | | Merge WebKit at r82507: Don't use new loss-free code path in ↵Steve Block2011-06-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTMLCanvasElement::toDataURL() See http://trac.webkit.org/changeset/81213 Change-Id: I1280ec90bd80fbb5cb4450e892f96678b988fa66
| * | | Merge WebKit at r82507: StringImpl::computeHash() removedSteve Block2011-06-081-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/81563 Change-Id: Ie125edaee69cc24bc4db035773feed9bc68747a5
| * | | Merge WebKit at r82507: Stub out FontPlatformData::setOrientation()Steve Block2011-06-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/80582 and http://trac.webkit.org/changeset/80589 Change-Id: I77941a880d7bb8347efcf6969a378ed941fce0e6
| * | | Merge WebKit at r82507: Path::strokeBoundingRect() is now constSteve Block2011-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/80557 Change-Id: I89dae78bbc5aa95920db4d604fcbecabd90cc84e
| * | | Merge WebKit at r82507: Add missing UnusedParam.h include in ↵Steve Block2011-06-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ApplicationCacheGroup.cpp This is a partial cherry-pick of http://trac.webkit.org/changeset/86949 Change-Id: I3516e5ca899ed44747b15bff019b146e0dea6b64
| * | | Merge WebKit at r82507: Continue to use Android's version of FontPlatformData.hSteve Block2011-06-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each platform's version of this file is being merged upstream. See http://trac.webkit.org/changeset/81977 (and its follow-up build fixes r81982, r81988, r81990, r82018). Change-Id: I1a4c17b5784de436ecd57e7e429837dd6c3dabb6
| * | | Merge WebKit at r82507: Update signature of ↵Steve Block2011-06-082-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | FontCustomPlatformData::fontPlatformData() See http://trac.webkit.org/changeset/80582 Change-Id: I2c4ecc1abd1b639aa10affc04b5549a8a2fb2ab7
| * | | Merge WebKit at r82507: Fix conflicts due to JNI refactoringSteve Block2011-06-082-57/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - JavaNPObjectV8.cpp Due to new JavaInstance::getField() http://trac.webkit.org/changeset/80653 - JNIUtilityPrivate.cpp - Android has a number of local modifications to convert numeric NPVariant values to a JNI jstring, using toString() via JNI. However, after the upstream refactoring, we no longer convert NPVariant directly to jvalue. Instead, we go via a new JavaValue type, which represents strings as JavaTypeString using WTF::String. This patch updates the Android modifications to set the JavaValue using WTF::String methods, without using JNI. Note that the spec for these conversions - http://jdk6.java.net/plugin2/liveconnect - does not require the use of toString(), so this is OK. - Android also adds handling for converting arrays from NPVariant to jvalue. However, the intermediate JavaValue type does not yet have support for arrays. We get around this with an ugly hack, where we continue to create a jarray and set this as the object field of the JavaValue. When converting from a JavaValue to a jvalue, we add handling for arrays. http://trac.webkit.org/changeset/82194
| * | | Merge WebKit at r82507: Fix conflicts due to new StorageTrackerSteve Block2011-06-085-95/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - FileSystemAndroid.cpp, FileSystemPOSIX.cpp Use new common version of listDirectory(), which is identical to the existing Android version. - StorageNamespace.h, StorageNamespaceImpl.h Conflict due to Android's clearPage() - PageGroup.cpp Conflict due to Android's clearDomStorage() See http://trac.webkit.org/changeset/80892 Change-Id: Ifac131155f5019959de8761438cd0372547b0e6c
| * | | Merge WebKit at r82507: Fix conflictsSteve Block2011-06-0817-165/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - RenderLayerBacking.cpp Due to ANDROID_OVERFLOW_SCROLL http://trac.webkit.org/changeset/81715 - Document.cpp Due to domTreeVersion and ANDROID_STYLE_VERSION http://trac.webkit.org/changeset/80797 - CachedResourceLoader.cpp Due to temporary debugging and ANDROID_BLOCK_NETWORK_IMAGE http://trac.webkit.org/changeset/80695 - Settings.cpp/h http://trac.webkit.org/changeset/81289 http://trac.webkit.org/changeset/81635 - MediaPlayer.cpp Whitespace only http://trac.webkit.org/changeset/80874 - RenderBox.cpp Due to isHorizontalWritingMode http://trac.webkit.org/changeset/81716 - RenderLayer.cpp/h Due to ANDROID_OVERFLOW_SCROLL http://trac.webkit.org/changeset/81981 - CSSStyleSelector.cpp Due to ANDROID_CSS_RING http://trac.webkit.org/changeset/80582 http://trac.webkit.org/changeset/80993 http://trac.webkit.org/changeset/80998 http://trac.webkit.org/changeset/81684 http://trac.webkit.org/changeset/82378 - CSSParser.cpp Due to ANDROID_CSS_RING http://trac.webkit.org/changeset/80582 http://trac.webkit.org/changeset/81684 - StyleElement.cpp Due to cherry pick of http://trac.webkit.org/changeset/80787 http://trac.webkit.org/changeset/82054 - EventHandler.cpp Due to ANDROID_PLUGINS http://trac.webkit.org/changeset/81618 http://trac.webkit.org/changeset/81835 - SliderThumbElement.cpp Due to touch events http://trac.webkit.org/changeset/81216 - MediaControls.cpp Due to touch events http://trac.webkit.org/changeset/80857 Note that the WebKit history for this file is confusing as it was renamed in http://trac.webkit.org/changeset/83545 and then re-added in http://trac.webkit.org/changeset/84222 but trac is not smart enough to track history backwards from http://trac.webkit.org/changeset/84222. Change-Id: Ie1f80e09ae7c3befa7a18773cf846ff130e4354e
| * | | Merge WebKit at r82507: Fix makefilesSteve Block2011-06-085-29/+9
| | | | | | | | | | | | | | | | Change-Id: Ia541ed77797442b5894b6fb88b3b829cc59c3535
| * | | Merge WebKit at r82507: Initial merge by gitSteve Block2011-06-081387-19217/+60058
| | | | | | | | | | | | | | | | Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
* | | | 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-083-8/+8
|\ \ \ \ | |/ / /
| * | | Fix some include guards in Android filesSteve Block2011-06-083-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 "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
generated by cgit v1.1 at 2024-09-11 23:46:49 +0000