OSDN Git Service
The Android Automerger [Mon, 13 Jun 2011 13:44:24 +0000 (06:44 -0700)]
merge in ics-release history after reset to master
Ben Murdoch [Fri, 10 Jun 2011 16:13:42 +0000 (17:13 +0100)]
Clarify comments about initialising V8 in WebViewCore ctor.
Change-Id: Icad45701d81d3ff07470ee2f6d2087c3a3252e84
Ben Murdoch [Fri, 10 Jun 2011 14:04:35 +0000 (15:04 +0100)]
Cleanspec after V8 Crankshaft is configurable in makefile.
Change-Id: Iefed33742e16e18fb762cc259153bf9fd584336a
Ben Murdoch [Thu, 9 Jun 2011 16:03:33 +0000 (17:03 +0100)]
Merge WebKit at r84325: Update ThirdPartyProject.prop
Change-Id: I3bd83b97b64c96cc5518cd7c5e4135421a9609f5
Ben Murdoch [Mon, 6 Jun 2011 17:46:54 +0000 (18:46 +0100)]
Merge WebKit at r74325: Build fix.
Cherry pick of upstream patch http://trac.webkit.org/changeset/87424
Change-Id: I6546831e7cecf11bbfd194f0620c56f293b56f2d
Ben Murdoch [Fri, 10 Jun 2011 13:53:17 +0000 (14:53 +0100)]
Merge WebKit at r84325: Fix MediaControls.
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
Ben Murdoch [Tue, 7 Jun 2011 12:24:18 +0000 (13:24 +0100)]
Merge Webkit at r84325: Fix SelectText.cpp
BidiRun is no longer stored on BidiResolver - it has it's
own class. Update our code to reflect this.
See http://trac.webkit.org/changeset/83240
Change-Id: Ib5ec7e585a531605f55bcc5530b2039fd11f8115
Ben Murdoch [Tue, 7 Jun 2011 10:45:31 +0000 (11:45 +0100)]
Merge WebKit at r84325: Fix uses of JavaInstance.
The JavaInstance class is now an interface, so use the
provided JavaInstanceJobject implementation instead.
See http://trac.webkit.org/changeset/82950
Change-Id: I782e3887e4f059733fbc054ca1d9d97d94e817ef
Ben Murdoch [Tue, 7 Jun 2011 10:29:37 +0000 (11:29 +0100)]
Merge WebKit at r84325: Fix EditorClientAndroid.
Update EditorClient ::requestCheckingOfString with new
parameter.
See http://trac.webkit.org/changeset/82952
Change-Id: I36b1708ded2dca0210cba593b660f2a47f7e3609
Ben Murdoch [Tue, 7 Jun 2011 10:26:09 +0000 (11:26 +0100)]
Merge WebKit at r84325: Fix FrameLoaderClient.
Update signatures for dispatchDidReceiveTitle and setTitle with
new parameter.
See http://trac.webkit.org/changeset/82580
Change-Id: I2a74302b7f43d70103680752fba1e80b5272fb7f
Ben Murdoch [Mon, 6 Jun 2011 17:29:13 +0000 (18:29 +0100)]
Merge WebKit at r84325: Fix RenderLayerCompositor.cpp
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
Ben Murdoch [Mon, 6 Jun 2011 17:05:11 +0000 (18:05 +0100)]
Merge WebKit at r84325: Fix GraphicsContextAndroid.cpp
GraphicsContext::roundToDevicePixels has a new parameter.
See http://trac.webkit.org/changeset/83216
Change-Id: I9f215b450c790ac1e6a54959e5cbee43d3a25694
Ben Murdoch [Thu, 9 Jun 2011 12:37:56 +0000 (13:37 +0100)]
Merge WebKit at r84325: Fix ImageBufferData.h
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
Ben Murdoch [Mon, 6 Jun 2011 12:20:18 +0000 (13:20 +0100)]
Merge WebKit at r84325: Fix makefiles.
See http://trac.webkit.org/changeset/82562 for
new XMLTreeViewer generation.
Change-Id: I52c8d510602e7e77ea6a134510f8e5bb6b0c4d9a
Ben Murdoch [Thu, 9 Jun 2011 12:37:59 +0000 (13:37 +0100)]
Merge WebKit at r84325: Fix conflicts.
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
The Android Automerger [Fri, 10 Jun 2011 13:43:35 +0000 (06:43 -0700)]
merge in ics-release history after reset to master
Ben Murdoch [Thu, 2 Jun 2011 11:07:03 +0000 (12:07 +0100)]
Merge WebKit at r84325: Initial merge by git.
Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
Ben Murdoch [Fri, 10 Jun 2011 09:41:12 +0000 (10:41 +0100)]
Remove files from the top level directory that we don't need.
These files aren't used by Android and have been maintained poorly
through merges so just remove them.
Change-Id: Ia0651092b6ac7e5b9cdee557949f296fe1465146
Kristian Monsen [Thu, 9 Jun 2011 20:53:00 +0000 (21:53 +0100)]
Fix build break for emulator
JavaTypeString is only available for V8.
Change-Id: I53a1d36b61268496486264cbc6c96fe1e0a5fbd3
Steve Block [Thu, 9 Jun 2011 18:59:55 +0000 (19:59 +0100)]
Fix a bug in the V8 JNI bindings when creating JNI method signatures
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
Brian Carlstrom [Thu, 9 Jun 2011 19:36:44 +0000 (12:36 -0700)]
Merge "Implement net::URLRequest::Delegate::OnCertificateRequested"
Steve Block [Thu, 9 Jun 2011 18:59:55 +0000 (19:59 +0100)]
Fix a bug in the V8 JNI bindings when creating JNI method signatures
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
Brian Carlstrom [Thu, 2 Jun 2011 08:05:19 +0000 (01:05 -0700)]
Implement net::URLRequest::Delegate::OnCertificateRequested
Following the example of OnSSLCertificateError, implement OnCertificateRequested
ERROR CASE CLIENT CERT CASE
net::URLRequest::Delegate::OnSSLCertificateError net::URLRequest::Delegate::OnCertificateRequested
WebRequest::OnSSLCertificateError WebRequest::OnCertificateRequested
WebUrlLoaderClient::reportSslCertError WebUrlLoaderClient::requestClientCert
WebFrame::reportSslCertError WebFrame::requestClientCert
android.webkit.BrowserFrame.reportSslCertError android.webkit.BrowserFrame.requestClientCert
<... See frameworks/base ...> <... See frameworks/base ...>
android.webkit.BrowserFrame.nativeSslCertErrorProceed android.webkit.BrowserFrame.nativeSslClientCert
WebCoreFrameBridge::SslCertErrorProceed WebCoreFrameBridge::SslClientCert
WebUrlLoaderClient::proceedSslCertError WebUrlLoaderClient::sslClientCert
WebRequest::proceedSslCertError WebRequest::sslClientCert
net::URLRequest::ContinueDespiteLastError net::URLRequest::ContinueWithCertificate
Change-Id: I6513678a3c553bf329640119ff96df9a39a41e49
John Reck [Wed, 8 Jun 2011 15:58:28 +0000 (08:58 -0700)]
Merge "Serialize LayerAndroid"
Steve Block [Wed, 8 Jun 2011 15:26:01 +0000 (08:26 -0700)]
Merge changes 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
Steve Block [Tue, 7 Jun 2011 14:53:41 +0000 (15:53 +0100)]
Merge WebKit at r82507: Update ThirdPartyProject.prop
Change-Id: I55c6d71a66d40ec65751b040c6cc1cb383b7f691
Steve Block [Mon, 6 Jun 2011 12:43:08 +0000 (13:43 +0100)]
Merge WebKit at r82507: Cherry-pick change r88166 to add INSPECTOR guards to ScriptProfiler
See http://trac.webkit.org/changeset/88166
Change-Id: Ifb3277d49c14dd600979c8c21c876ed8bc0e4a62
Steve Block [Wed, 8 Jun 2011 14:18:16 +0000 (15:18 +0100)]
Merge WebKit at r82507: Work around a V8 bug
Change-Id: Ia1b847a20bc16091075630655fef79cd90cd8297
Steve Block [Tue, 7 Jun 2011 14:45:49 +0000 (15:45 +0100)]
Merge WebKit at r82507: JNIType renamed to JavaType
See http://trac.webkit.org/changeset/81860
Change-Id: I7ba9cf3f5a739f4d94e9189f6eb6dd4f8f645787
Steve Block [Fri, 3 Jun 2011 12:35:12 +0000 (13:35 +0100)]
Merge WebKit at r82507: IconDatabaseClient interface expanded
See http://trac.webkit.org/changeset/81719
Change-Id: Ida2b2a8ac767182bc2c93cbe60399ed39f91c99c
Steve Block [Fri, 3 Jun 2011 14:16:57 +0000 (15:16 +0100)]
Merge WebKit at r82507: Don't use new loss-free code path in HTMLCanvasElement::toDataURL()
See http://trac.webkit.org/changeset/81213
Change-Id: I1280ec90bd80fbb5cb4450e892f96678b988fa66
Steve Block [Fri, 3 Jun 2011 13:56:51 +0000 (14:56 +0100)]
Merge WebKit at r82507: IcondDatabaseBase::iconForPageURL() renamed
See http://trac.webkit.org/changeset/81484
Change-Id: I72f818d5d0075c63b658c2d8457d2182a7968c05
Steve Block [Fri, 3 Jun 2011 13:43:36 +0000 (14:43 +0100)]
Merge WebKit at r82507: IconDatabaseBase::Open() signature changed
See http://trac.webkit.org/changeset/81824
Change-Id: I2e3b588b7d38211310bd6bf488f1a8d3f6edac5d
Steve Block [Fri, 3 Jun 2011 13:16:27 +0000 (14:16 +0100)]
Merge WebKit at r82507: Node::isContentEditable() renamed
See http://trac.webkit.org/changeset/81965
Change-Id: I9a4e628938c8cd1238140eb7e5617700487ca227
Steve Block [Fri, 3 Jun 2011 12:33:46 +0000 (13:33 +0100)]
Merge WebKit at r82507: Use icon database through IconDatabaseBase
See http://trac.webkit.org/changeset/80900
Change-Id: Ia724c78b9db4665a0c30cc214c2d6fa61e81f888
Steve Block [Fri, 3 Jun 2011 12:06:00 +0000 (13:06 +0100)]
Merge WebKit at r82507: toInputElement() is now a member of Node
See http://trac.webkit.org/changeset/80811
Change-Id: Icd8612c886ae6caa198c051ecf1d6f2681172387
Steve Block [Fri, 3 Jun 2011 11:59:27 +0000 (12:59 +0100)]
Merge WebKit at r82507: FrameLoaderClient::objectContentType() signature changed
See http://trac.webkit.org/changeset/82001
Change-Id: Ie31b15d7e6f2cc9d91215d45da48e958e2987242
Steve Block [Fri, 3 Jun 2011 11:21:06 +0000 (12:21 +0100)]
Merge WebKit at r82507: StringImpl::computeHash() removed
See http://trac.webkit.org/changeset/81563
Change-Id: Ie125edaee69cc24bc4db035773feed9bc68747a5
Steve Block [Thu, 2 Jun 2011 18:03:22 +0000 (19:03 +0100)]
Merge WebKit at r82507: Stub out FontPlatformData::setOrientation()
See http://trac.webkit.org/changeset/80582 and
http://trac.webkit.org/changeset/80589
Change-Id: I77941a880d7bb8347efcf6969a378ed941fce0e6
Steve Block [Thu, 2 Jun 2011 17:59:22 +0000 (18:59 +0100)]
Merge WebKit at r82507: Path::strokeBoundingRect() is now const
See http://trac.webkit.org/changeset/80557
Change-Id: I89dae78bbc5aa95920db4d604fcbecabd90cc84e
Steve Block [Thu, 2 Jun 2011 17:55:57 +0000 (18:55 +0100)]
Merge WebKit at r82507: Add missing UnusedParam.h include in ApplicationCacheGroup.cpp
This is a partial cherry-pick of http://trac.webkit.org/changeset/86949
Change-Id: I3516e5ca899ed44747b15bff019b146e0dea6b64
Steve Block [Thu, 2 Jun 2011 17:49:50 +0000 (18:49 +0100)]
Merge WebKit at r82507: Continue to use Android's version of FontPlatformData.h
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
Steve Block [Thu, 2 Jun 2011 17:44:31 +0000 (18:44 +0100)]
Merge WebKit at r82507: Update signature of FontCustomPlatformData::fontPlatformData()
See http://trac.webkit.org/changeset/80582
Change-Id: I2c4ecc1abd1b639aa10affc04b5549a8a2fb2ab7
Steve Block [Tue, 7 Jun 2011 14:53:15 +0000 (15:53 +0100)]
Merge WebKit at r82507: Fix conflicts due to JNI refactoring
- 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
Steve Block [Wed, 8 Jun 2011 13:29:18 +0000 (06:29 -0700)]
Merge "Remove a FIXME from JavaNPObjectV8 that was forking us from upstream"
Steve Block [Wed, 8 Jun 2011 09:42:33 +0000 (10:42 +0100)]
Merge WebKit at r82507: Fix conflicts due to new StorageTracker
- 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
Steve Block [Wed, 8 Jun 2011 09:42:08 +0000 (10:42 +0100)]
Merge WebKit at r82507: Fix conflicts
- 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
Steve Block [Tue, 7 Jun 2011 14:47:53 +0000 (15:47 +0100)]
Merge WebKit at r82507: Fix makefiles
Change-Id: Ia541ed77797442b5894b6fb88b3b829cc59c3535
Steve Block [Wed, 25 May 2011 18:08:45 +0000 (19:08 +0100)]
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Steve Block [Wed, 8 Jun 2011 12:37:27 +0000 (13:37 +0100)]
Remove a FIXME from JavaNPObjectV8 that was forking us from upstream
Filed https://bugs.webkit.org/show_bug.cgi?id=62275 to track this
issue upstream.
This will reduce future merge conflicts.
Change-Id: I22c0826c218bb81f58fb60609849b41b456e6e4c
Steve Block [Wed, 8 Jun 2011 11:41:18 +0000 (04:41 -0700)]
Merge "Fix a whitespace diff with upstream to avoid a future merge conflict"
Steve Block [Wed, 8 Jun 2011 11:35:22 +0000 (12:35 +0100)]
Fix a whitespace diff with upstream to avoid a future merge conflict
Change-Id: Ia6d9bd8b0a8cd99a569599034b6138e29d89b24d
Steve Block [Wed, 8 Jun 2011 11:19:03 +0000 (04:19 -0700)]
Merge "Fix some include guards in Android files"
Steve Block [Wed, 8 Jun 2011 10:55:45 +0000 (11:55 +0100)]
Fix some include guards in Android files
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
Steve Block [Wed, 8 Jun 2011 09:30:00 +0000 (02:30 -0700)]
Merge "Remove all contents of Source/ThirdParty other than ANGLE"
Steve Block [Wed, 8 Jun 2011 09:19:41 +0000 (10:19 +0100)]
Remove all contents of Source/ThirdParty other than ANGLE
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
John Reck [Tue, 7 Jun 2011 00:31:38 +0000 (17:31 -0700)]
Serialize LayerAndroid
For now skip other layer types
Doesn't support animtations
Change-Id: Id1ff75f3d4d213f56561fc5d9c01f7ffee05cc79
Teng-Hui Zhu [Tue, 7 Jun 2011 17:56:28 +0000 (10:56 -0700)]
Merge "refactor the TextureInfo out from SharedTexture, no functional change"
Steve Block [Tue, 7 Jun 2011 17:11:45 +0000 (18:11 +0100)]
Update PlatformTouchEvent for Android to reflect upstreamed version
See http://trac.webkit.org/changeset/81685
Change-Id: Ibc6c1336b696e39f27fd88d9b4e90fe6918ceba8
Teng-Hui Zhu [Tue, 7 Jun 2011 00:12:56 +0000 (17:12 -0700)]
refactor the TextureInfo out from SharedTexture, no functional change
Change-Id: I9018a8079da1df2fd55c94aacd4ae96227ad2bd2
Steve Block [Tue, 7 Jun 2011 15:28:27 +0000 (16:28 +0100)]
Move all Android modification to Settings to the end of the relevant block
This will ease future merges
Change-Id: I7203cfb0cdc52140802a11cd35c64a9cfd502d30
John Reck [Sat, 4 Jun 2011 07:48:50 +0000 (00:48 -0700)]
Fix issues with setting viewstate before initializing
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
Teng-Hui Zhu [Sat, 4 Jun 2011 00:11:23 +0000 (17:11 -0700)]
Merge "Fix the trailing pixels by inflate the invalidate screen rect"
Teng-Hui Zhu [Fri, 3 Jun 2011 23:57:07 +0000 (16:57 -0700)]
Fix the trailing pixels by inflate the invalidate screen rect
bug:
4313230
Change-Id: I364f418c8e04219d985c4ff7a27328d4e0dbfbd2
John Reck [Fri, 3 Jun 2011 22:21:11 +0000 (15:21 -0700)]
Merge "Initial support for serializing the view state"
John Reck [Thu, 2 Jun 2011 23:04:42 +0000 (16:04 -0700)]
Initial support for serializing the view state
Serializes only the base layer currently
Change-Id: I5cff216a4fc1b08efe3a7955c616b91114f6bf0b
Derek Sollenberger [Fri, 3 Jun 2011 18:22:56 +0000 (11:22 -0700)]
Merge "Revert "Fix for antialiased text with shadows.""
Shimeng (Simon) Wang [Fri, 3 Jun 2011 16:24:40 +0000 (09:24 -0700)]
Merge "Add image/webp to the mimeType list."
Derek Sollenberger [Fri, 3 Jun 2011 15:07:32 +0000 (08:07 -0700)]
Revert "Fix for antialiased text with shadows."
This breaks master-gpl. We can resubmit this after updating the version of skia in master-gpl.
This reverts commit
a3d968a2da0ae3463991e973e38af6795ad36c2e
Derek Sollenberger [Fri, 3 Jun 2011 12:50:01 +0000 (05:50 -0700)]
Merge "Add API to allow plugins to lock their orientation in full-screen mode."
Derek Sollenberger [Fri, 3 Jun 2011 12:48:42 +0000 (05:48 -0700)]
Merge "Fix for antialiased text with shadows."
Derek Sollenberger [Fri, 3 Jun 2011 12:02:52 +0000 (08:02 -0400)]
Fix for antialiased text with shadows.
bug:
4502715
Change-Id: I5301526da2ff4962e7d1fda2b0ad39c407013e05
Shimeng (Simon) Wang [Fri, 3 Jun 2011 00:42:17 +0000 (17:42 -0700)]
Add image/webp to the mimeType list.
This will let a webp image url be displayed directly inside browser.
issue:
3291572
Change-Id: I6870c5461c5d746d11457b7afba26cb277b25bbb
Jean-Baptiste Queru [Thu, 2 Jun 2011 20:58:15 +0000 (13:58 -0700)]
am
3ae2cf5e: (-s ours) Merge from honeycomb-LTE - do not merge
* commit '
3ae2cf5eef8df00445146297df2bef1f74537dbf':
Update isFallbackFamily() with missing fonts
Steve Block [Thu, 2 Jun 2011 17:24:54 +0000 (18:24 +0100)]
Update RenderLayer.cpp with upstreamed version of crash fix
See https://bugs.webkit.org/show_bug.cgi?id=56107
Bug:
4026385
Change-Id: I381b0d1ee115cd6eda92136d150b8cf7e33558ac
Steve Block [Thu, 2 Jun 2011 16:22:44 +0000 (17:22 +0100)]
Fix a whitespace diff in SubresourceLoader.cpp
This will avoid future merge conflicts
Change-Id: I5d4cc4665ed096b86a7f6dc892bd44ff4c590e65
Steve Block [Thu, 2 Jun 2011 15:39:50 +0000 (08:39 -0700)]
Merge "Remove Android guard EMULATE_JSC_BINDINGS"
Steve Block [Thu, 2 Jun 2011 15:17:03 +0000 (16:17 +0100)]
Remove Android guard EMULATE_JSC_BINDINGS
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
Ben Murdoch [Thu, 2 Jun 2011 14:30:42 +0000 (07:30 -0700)]
Merge "Fix master-gpl build."
Steve Block [Thu, 2 Jun 2011 14:14:56 +0000 (07:14 -0700)]
Merge "Fix compiler warning in CachedResourceLoader"
Steve Block [Thu, 2 Jun 2011 12:24:01 +0000 (13:24 +0100)]
Fix compiler warning in CachedResourceLoader
Make sure initializer list is in same order as members in header.
Change-Id: I93dfd1c6bba851b8fb8fb839d2b5b1c226a78dcd
Ben Murdoch [Thu, 2 Jun 2011 13:18:15 +0000 (14:18 +0100)]
Fix master-gpl build.
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
Derek Sollenberger [Wed, 1 Jun 2011 17:57:34 +0000 (13:57 -0400)]
Add API to allow plugins to lock their orientation in full-screen mode.
This CL has companion changes in the framework and browser.
bug:
3398386
Change-Id: I3427e61e47b66f4142581fb043eeebc613d71b51
Steve Block [Thu, 12 May 2011 11:48:14 +0000 (12:48 +0100)]
Always check weak global references before using them
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
Steve Block [Thu, 2 Jun 2011 11:01:03 +0000 (04:01 -0700)]
Merge "JavaScriptCore/config.h should not include WebCore/config.h"
Ben Murdoch [Fri, 27 May 2011 11:26:57 +0000 (12:26 +0100)]
Merge WebKit at r80534: Update ThirdPartyProject.prop
Change-Id: I6fd3f707dbb4d5f0e6c3dcd5f33a79d22a480ec8
Ben Murdoch [Tue, 31 May 2011 13:52:35 +0000 (14:52 +0100)]
Merge WebKit at r80534: Fix CSSComputedStyleDeclaration.cpp
Update our uses of CSSPrimitiveValue following
http://trac.webkit.org/changeset/80463
Change-Id: I216382423f496b90af61b044b2a4bda9a6c322de
Ben Murdoch [Thu, 26 May 2011 16:14:57 +0000 (17:14 +0100)]
Merge WebKit at r80534: Fix JSNavigatorCustom.cpp
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
Ben Murdoch [Tue, 24 May 2011 19:00:38 +0000 (20:00 +0100)]
Merge WebKit at r80534: Fix GraphicsContextAndroid.cpp
Need to provide an Android implementation of new setCTM()
function.
See http://trac.webkit.org/changeset/78704
Change-Id: Iefd0225495bec6f4945f02660a450018e4270593
Ben Murdoch [Tue, 24 May 2011 17:31:28 +0000 (18:31 +0100)]
Merge WebKit at r80534: Fix EditorClientAndroid
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
Ben Murdoch [Tue, 24 May 2011 15:57:26 +0000 (16:57 +0100)]
Merge WebKit to r80534: Fix ChromeClientAndroid
tabsToLinks() has been removed and keyboardUIMode() has
been added. See http://trac.webkit.org/changeset/80279
Change-Id: Idd92678728737fa313cfababff4d9aadee83be76
Ben Murdoch [Tue, 24 May 2011 15:28:55 +0000 (16:28 +0100)]
Merge WebKit at r80534: Fix MediaPlayerPrivateAndroid.cpp
Update for MedaEngineRegistrar change.
See http://trac.webkit.org/changeset/80473
Change-Id: I3931805339b8b66b371db01f3823daba2cedf56f
Ben Murdoch [Tue, 24 May 2011 15:15:42 +0000 (16:15 +0100)]
Merge WebKit at r80534: Fix FrameLoaderClientAndroid.
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
Ben Murdoch [Tue, 24 May 2011 15:12:30 +0000 (16:12 +0100)]
Merge WebKit at r80534: Fix IconDatabase uses.
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
Ben Murdoch [Tue, 24 May 2011 15:08:20 +0000 (16:08 +0100)]
Merge WebKit at r80534: Fix JavaMethod.cpp
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
Ben Murdoch [Tue, 24 May 2011 15:06:24 +0000 (16:06 +0100)]
Merge WebKit at r80534: Fix Java Bridge.
Fix conflicts and reflect the upstream changes made in
http://trac.webkit.org/changeset/80467.
Note that our JNIUtilityPrivate.cpp is significantly forked from
upstream.
Change-Id: I390f1089d861fa29b6c15118638d029dea4356d8
Ben Murdoch [Tue, 24 May 2011 14:08:28 +0000 (15:08 +0100)]
Merge WebKit at r80534: Fix ImageSourceAndroid.cpp
SharedBuffer::buffer now private, we should use SharedBuffer::data()
instead.
See http://trac.webkit.org/changeset/78548
Add implementation of bytesDecodedToDetermineProperties.
See http://trac.webkit.org/changeset/78652
Change-Id: Ic113f711f3b8d553e35ba98246fd6bd9093fdb06
Ben Murdoch [Tue, 24 May 2011 13:37:08 +0000 (14:37 +0100)]
Merge WebKit at r80534: Update uses of PLATFORM(SKIA).
PLATFORM(SKIA) is replaced with USE(SKIA), see
http://trac.webkit.org/changeset/79578
Fix conflicts and update our code to reflect this.
Change-Id: Ia23956874418552eb8f107d389557a4cdcb225b6
Ben Murdoch [Tue, 24 May 2011 13:28:54 +0000 (14:28 +0100)]
Merge WebKit at r80534: Fix uses of rounding hacks.
Font rounding hacks have been removed upstream, so there
is no need for our local code anymore. Remove all uses
of the ANDROID_DISABLE_ROUNDING_HACKS macro.
Note that this brings our behavior in line with upstream -
Android will see a change in behavior to before the merge
as we did not disable rounding hacks in all cases.
- SVGInlineTextBox::SVGInlineTextBox() - we don't pass a value for
disableRoundingHacks, so we don't disable hacks, so this behaviour will
change as rounding hacks are disabled now.
- RenderText::createTextBox() - We pass a value for
disableRoundingHacks, true if any parent is a text control.
So we will change behavior in any case where the parent is not
a text control.
Note that although we may see a change in behavior, that change is
consistent with the upstream codebase.
See http://trac.webkit.org/changeset/78846
Change-Id: I5d4d7298083acc519199c4c38ab5acdef5bdc537
Ben Murdoch [Tue, 24 May 2011 13:09:24 +0000 (14:09 +0100)]
Merge WebKit at r80534: Fix makefiles.
Add new and remove deleted files to fix makefiles.
See http://trac.webkit.org/changeset/79861 for new
XSLTreeViewer generation.
Also remove a stub from TemporaryLInkStubs that we now get
by compiling the correct files in JSC (see
http://trac.webkit.org/changeset/78634).
Change-Id: I550b035b7c9c915b42738366da7817dca020c9a8