summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Adds WebTiming IDL files to build and sets ENABLE_WEB_TIMINGSteve Block2011-06-143-2/+9
| | | | | 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: Update ThirdPartyProject.propSteve Block2011-06-141-2/+4
| | | | Change-Id: Ic297de43b73b2ebce1d20053990f9d71bb54a16f
* Merge WebKit at branches/chromium/742 r88085: Implement new ↵Steve Block2011-06-141-0/+2
| | | | | | | | | ChromeViewClient::webView() This is only required on Chromoium See http://trac.webkit.org/changeset/85823 Change-Id: I61069d27bfbdabb88474c759e2bb8723e5913783
* Merge WebKit at branches/chromium/742 r88085: Initial merge by git.Steve Block2011-06-14147-780/+23146
| | | | Change-Id: I0501b484b9528e31b0026e5ad64416dd6541cdde
* Move all ANDROID defines to wtf/Platform.hSteve Block2011-06-142-148/+104
| | | | | | | | | | | | | | 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 "Add javascript 'select' event"Russell Brenner2011-06-131-0/+6
|\
| * Add javascript 'select' eventRussell Brenner2011-06-131-0/+6
| | | | | | | | | | | | | | | | | | | | The jni code uses lower-level apis for controlling text selections that are hard-wired as non-user actions. This change adds an additional call from the jni code to signal that the selection changed due to user action. Bug: 4444489 Change-Id: I5a637ad9826455e21d43d1e28476b1c814cb65f7
* | 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
* | | Clarify comments about initialising V8 in WebViewCore ctor.Ben Murdoch2011-06-101-2/+3
| | | | | | | | | | | | Change-Id: Icad45701d81d3ff07470ee2f6d2087c3a3252e84
* | | Cleanspec after V8 Crankshaft is configurable in makefile.Ben Murdoch2011-06-101-1/+2
| | | | | | | | | | | | Change-Id: Iefed33742e16e18fb762cc259153bf9fd584336a
* | | Merge WebKit at r84325: Update ThirdPartyProject.propBen Murdoch2011-06-101-2/+2
| | | | | | | | | | | | Change-Id: I3bd83b97b64c96cc5518cd7c5e4135421a9609f5
* | | 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 SelectText.cppBen Murdoch2011-06-101-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge WebKit at r84325: Fix uses of JavaInstance.Ben Murdoch2011-06-103-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 EditorClientAndroid.Ben Murdoch2011-06-102-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Update EditorClient ::requestCheckingOfString with new parameter. See http://trac.webkit.org/changeset/82952 Change-Id: I36b1708ded2dca0210cba593b660f2a47f7e3609
* | | Merge WebKit at r84325: Fix FrameLoaderClient.Ben Murdoch2011-06-102-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | Update signatures for dispatchDidReceiveTitle and setTitle with new parameter. See http://trac.webkit.org/changeset/82580 Change-Id: I2a74302b7f43d70103680752fba1e80b5272fb7f
* | | 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-108-50/+32
| | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/82562 for new XMLTreeViewer generation. Change-Id: I52c8d510602e7e77ea6a134510f8e5bb6b0c4d9a
* | | Merge WebKit at r84325: Fix conflicts.Ben Murdoch2011-06-1021-269/+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-102522-40484/+102535
| | | | | | | | | | | | Change-Id: Ic1a909300ecc0a13ddc6b4e784371d2ac6e3d59b
* | | Remove files from the top level directory that we don't need.Ben Murdoch2011-06-104-13404/+0
| | | | | | | | | | | | | | | | | | | | | These files aren't used by Android and have been maintained poorly through merges so just remove them. Change-Id: Ia0651092b6ac7e5b9cdee557949f296fe1465146
* | | 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-082860-30090/+112049
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: Update ThirdPartyProject.propSteve Block2011-06-081-2/+2
| | | | | | | | | | | | | | | | Change-Id: I55c6d71a66d40ec65751b040c6cc1cb383b7f691
| * | | 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