summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r84325: Initial merge by git.Ben Murdoch2011-06-102202-37944/+92955
| | | | Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
* Fix build break for emulatorKristian Monsen2011-06-091-2/+2
| | | | | | JavaTypeString is only available for V8. Change-Id: I53a1d36b61268496486264cbc6c96fe1e0a5fbd3
* Merge "Implement net::URLRequest::Delegate::OnCertificateRequested"Brian Carlstrom2011-06-098-3/+164
|\
| * Implement net::URLRequest::Delegate::OnCertificateRequestedBrian Carlstrom2011-06-098-3/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | 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-086-13/+368
|\
| * Serialize LayerAndroidJohn Reck2011-06-076-13/+368
| | | | | | | | | | | | | | For now skip other layer types Doesn't support animtations Change-Id: Id1ff75f3d4d213f56561fc5d9c01f7ffee05cc79
* | Merge changes ↵Steve Block2011-06-082498-29149/+102650
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Work around a V8 bugSteve Block2011-06-081-0/+10
| | | | | | | | | | | | Change-Id: Ia1b847a20bc16091075630655fef79cd90cd8297
| * | 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: IconDatabaseClient interface expandedSteve Block2011-06-082-4/+38
| | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/81719 Change-Id: Ida2b2a8ac767182bc2c93cbe60399ed39f91c99c
| * | 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: IcondDatabaseBase::iconForPageURL() renamedSteve Block2011-06-084-9/+15
| | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/81484 Change-Id: I72f818d5d0075c63b658c2d8457d2182a7968c05
| * | Merge WebKit at r82507: IconDatabaseBase::Open() signature changedSteve Block2011-06-081-1/+1
| | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/81824 Change-Id: I2e3b588b7d38211310bd6bf488f1a8d3f6edac5d
| * | Merge WebKit at r82507: Node::isContentEditable() renamedSteve Block2011-06-081-1/+1
| | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/81965 Change-Id: I9a4e628938c8cd1238140eb7e5617700487ca227
| * | Merge WebKit at r82507: Use icon database through IconDatabaseBaseSteve Block2011-06-081-1/+1
| | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/80900 Change-Id: Ia724c78b9db4665a0c30cc214c2d6fa61e81f888
| * | Merge WebKit at r82507: toInputElement() is now a member of NodeSteve Block2011-06-082-2/+2
| | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/80811 Change-Id: Icd8612c886ae6caa198c051ecf1d6f2681172387
| * | Merge WebKit at r82507: FrameLoaderClient::objectContentType() signature changedSteve Block2011-06-082-4/+3
| | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/82001 Change-Id: Ie31b15d7e6f2cc9d91215d45da48e958e2987242
| * | 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-086-29/+10
| | | | | | | | | | | | Change-Id: Ia541ed77797442b5894b6fb88b3b829cc59c3535
| * | Merge WebKit at r82507: Initial merge by gitSteve Block2011-06-082482-29009/+102620
| | | | | | | | | | | | 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-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
|\ \ \ \
generated by cgit v1.1 at 2025-05-30 04:13:14 +0000