summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android/jni
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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
* | Clarify comments about initialising V8 in WebViewCore ctor.Ben Murdoch2011-06-101-2/+3
| | | | | | | | Change-Id: Icad45701d81d3ff07470ee2f6d2087c3a3252e84
* | Merge WebKit at r84325: Fix uses of JavaInstance.Ben Murdoch2011-06-101-6/+14
| | | | | | | | | | | | | | | | | | The JavaInstance class is now an interface, so use the provided JavaInstanceJobject implementation instead. See http://trac.webkit.org/changeset/82950 Change-Id: I782e3887e4f059733fbc054ca1d9d97d94e817ef
* | Implement net::URLRequest::Delegate::OnCertificateRequestedBrian Carlstrom2011-06-092-0/+111
|/ | | | | | | | | | | | | | | | | | | 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
* Merge "Serialize LayerAndroid"John Reck2011-06-081-1/+327
|\
| * Serialize LayerAndroidJohn Reck2011-06-071-1/+327
| | | | | | | | | | | | | | For now skip other layer types Doesn't support animtations Change-Id: Id1ff75f3d4d213f56561fc5d9c01f7ffee05cc79
* | Merge WebKit at r82507: Work around a V8 bugSteve Block2011-06-081-0/+10
| | | | | | | | Change-Id: Ia1b847a20bc16091075630655fef79cd90cd8297
* | 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: IcondDatabaseBase::iconForPageURL() renamedSteve Block2011-06-083-5/+9
| | | | | | | | | | | | 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: 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-081-1/+1
| | | | | | | | | | | | See http://trac.webkit.org/changeset/80811 Change-Id: Icd8612c886ae6caa198c051ecf1d6f2681172387
* | Fix some include guards in Android filesSteve Block2011-06-0810-24/+24
|/ | | | | | | | | 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
* Fix issues with setting viewstate before initializingJohn Reck2011-06-041-2/+8
| | | | | | | | | 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 "Initial support for serializing the view state"John Reck2011-06-034-0/+116
|\
| * Initial support for serializing the view stateJohn Reck2011-06-034-0/+116
| | | | | | | | | | | | Serializes only the base layer currently Change-Id: I5cff216a4fc1b08efe3a7955c616b91114f6bf0b
* | Add API to allow plugins to lock their orientation in full-screen mode.Derek Sollenberger2011-06-022-4/+6
| | | | | | | | | | | | | | This CL has companion changes in the framework and browser. bug: 3398386 Change-Id: I3427e61e47b66f4142581fb043eeebc613d71b51
* | Always check weak global references before using themSteve Block2011-06-026-188/+463
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 WebKit at r80534: Fix IconDatabase uses.Ben Murdoch2011-06-023-12/+12
|/ | | | | | | | | 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
* Fix reboot loop on master ToTKristian Monsen2011-05-311-1/+1
| | | | Change-Id: I34534273f70c1fe32b83f994808de03616c85922
* Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't ↵Kristian Monsen2011-05-311-4/+5
| | | | | | | | | | | | | | | bypass proxy Passing the extra string argument, blacklist, to the proxy in chromium. Need CL in frameworks/base: https://android-git.corp.google.com/g/#change,112400 And external/chromium: https://android-git.corp.google.com/g/#change,111832 Change-Id: Ie8ca84b5ebf9701391dbd8a5097638e24ac2cb85
* Merge "Fix the way we maintain the list of Pictures in PictureSet. This ↵Nicolas Roard2011-05-253-106/+195
|\ | | | | | | improves drawing performances on the base surface by a decent amount."
| * Fix the way we maintain the list of Pictures in PictureSet.Nicolas Roard2011-05-243-106/+195
| | | | | | | | | | | | | | This improves drawing performances on the base surface by a decent amount. Change-Id: I59b63c0e5748eed2c729024c11a5da390faefda7
* | Merge "merge from honeycomb mr2"Russell Brenner2011-05-251-5/+5
|\ \
| * | merge from honeycomb mr2Russell Brenner2011-05-251-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move check for pending style recalc The previous implementation had no way to notify the caller as to whether or not the recording was successful. Now, recordContent detects the pending recalc and returns null to indicate that no recording was done. bug: 4474358 Change-Id: I511d6f1118c0a122ee893167311f3cc82f2cbf7e
* | | Merge WebKit at r78450: FrameLoader::url() removedSteve Block2011-05-251-3/+2
| | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/76872 Change-Id: I54790419f4e3b7dcd1e6123d6ff4bda8d7997066
* | | Merge WebKit at r78450: IntRect::bottom()/right() renamedSteve Block2011-05-251-12/+12
| | | | | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/77286 and http://trac.webkit.org/changeset/77398 Change-Id: I0ae670bff327fb981e037f5394c55bfb4aeb81eb
* | | Merge WebKit at r78450: Fix remaining conflictsSteve Block2011-05-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Document.cpp Conflict due to AX object cache disabled on Android See http://trac.webkit.org/changeset/78314 - CachedResourceLoader.cpp/h Conflict due to ANDROID_BLOCK_NETWORK_IMAGE See http://trac.webkit.org/changeset/76701 - Source/WebCore/page/ChromeClient.h Conflict due to ANDROID_INSTALLABLE_WEB_APPS See http://trac.webkit.org/changeset/77509 - FrameView.cpp Conflict due to Android FrameView::updatePositionedObjects() See http://trac.webkit.org/changeset/77274 - ScrollView.h Conflict due to Android ScrollView::actualWidth/Height/ScrollX/ScrollY() See http://trac.webkit.org/changeset/76831 - TemporaryLinkStubs.cpp and MIMETypeRegistry.cpp conflict due to Android stubbed out MIMETypeRegistry::getMIMETypeForExtension() See http://trac.webkit.org/changeset/77368 and https://android-git.corp.google.com/g/#change,37272 - ImageDecoder.cpp Conflict due to Android excluding code See http://trac.webkit.org/changeset/77427 - ImageDecoder.h Conflict due to ANDROID guard upstreamed as SKIA guard See http://trac.webkit.org/changeset/77946 - InlineTextBox.cpp Conflict due to ANDROID_DISABLE_ROUNDING_HACKS See http://trac.webkit.org/changeset/76743 and http://trac.webkit.org/changeset/77286 - RenderBlockLineLayout.cpp Conflict due to ANDROID_LAYOUT See http://trac.webkit.org/changeset/77062 Change-Id: Ide4d58dc52418b8fc1a965a9524eb57cd46b4859
* | | Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guardSteve Block2011-05-251-8/+5
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | This replaces, and therefore conflicts with, Android's existing ENABLE_ARCHIVE guard. This change resolves the conflicts by taking the upstream guard in WebCore, updates WebKit to use the new guard, and enables this guard on Android. See http://trac.webkit.org/changeset/78439 See also http://trac.webkit.org/changeset/78342 for FrameLoader.cpp Change-Id: I28ebaf3d69ea4c352ab4cfbf91c33a8ba25f89b5
* | Merge WebKit at r76408: Fix calls to RenderLayer::scrollToOffset()Ben Murdoch2011-05-231-1/+1
|/ | | | | | | | As of http://trac.webkit.org/changeset/76291 RenderLayer::scrollToOffset only takes two parameters (the x and y offset). Update our callsites to reflect this. It seems safe to disregard the booleans. Change-Id: I63bc103e4fc961968055770792aead82be82435a
* Merge Chromium at 10.0.621.0: CookieList moved out of CookieMonsterKristian Monsen2011-05-201-2/+2
| | | | | | | Upstream CL: http://src.chromium.org/viewvc/chrome/trunk/src/net/http/http_cache.h?view=diff&r1=69413&r2=69414 Change-Id: I618b42f163c0a4cf329fe6fb95be4b86bca8f202
* Fix build when WEBARCHIVE is disabledSteve Block2011-05-181-1/+1
| | | | Change-Id: Ibbc124a51f2c58188eb8132a57adc5d87373f25c
* Merge WebKit at r75993: Fix uses of cache() functionBen Murdoch2011-05-162-7/+7
| | | | | | | WebCore::cache() is renamed to WebCore::memoryCache() See http://trac.webkit.org/changeset/75857 Change-Id: Id102b534c784191461a4d077058e5c25d5741d57
* Merge WebKit at r75993: Move WebKit/android files to SourceBen Murdoch2011-05-1636-0/+13718
Change-Id: Ifa871f8320bdb3a09fe189fffecc23f702c394b9
generated by cgit v1.1 at 2025-09-14 18:50:00 +0000