summaryrefslogtreecommitdiffstats
path: root/Source/WebKit/android
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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
* Implement net::URLRequest::Delegate::OnCertificateRequestedBrian Carlstrom2011-06-097-0/+157
| | | | | | | | | | | | | | | | | | | 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-082-1/+332
|\
| * Serialize LayerAndroidJohn Reck2011-06-072-1/+332
| | | | | | | | | | | | | | 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-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
* | Fix some include guards in Android filesSteve Block2011-06-0853-119/+121
|/ | | | | | | | | 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-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 "Initial support for serializing the view state"John Reck2011-06-035-0/+127
|\
| * Initial support for serializing the view stateJohn Reck2011-06-035-0/+127
| | | | | | | | | | | | 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-026-6/+89
| | | | | | | | | | | | | | 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-029-233/+553
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 EditorClientAndroidBen Murdoch2011-06-022-1/+8
| | | | | | | | | | | | | | | | | | 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
* | Merge WebKit to r80534: Fix ChromeClientAndroidBen Murdoch2011-06-022-2/+5
| | | | | | | | | | | | | | tabsToLinks() has been removed and keyboardUIMode() has been added. See http://trac.webkit.org/changeset/80279 Change-Id: Idd92678728737fa313cfababff4d9aadee83be76
* | Merge WebKit at r80534: Fix MediaPlayerPrivateAndroid.cppBen Murdoch2011-06-021-1/+1
| | | | | | | | | | | | | | Update for MedaEngineRegistrar change. See http://trac.webkit.org/changeset/80473 Change-Id: I3931805339b8b66b371db01f3823daba2cedf56f
* | Merge WebKit at r80534: Fix FrameLoaderClientAndroid.Ben Murdoch2011-06-022-5/+10
| | | | | | | | | | | | | | | | | | | | 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
* | Merge WebKit at r80534: Fix IconDatabase uses.Ben Murdoch2011-06-024-14/+14
| | | | | | | | | | | | | | | | | | 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
* | Merge "Revert "Use AudioTrack::event_type not int in callback""Glenn Kasten2011-06-011-1/+1
|\ \
| * | Revert "Use AudioTrack::event_type not int in callback"Glenn Kasten2011-06-011-1/+1
| | | | | | | | | This reverts commit 8d0d3a015e5f96c7eb2101fba5abcdf76958ff41
* | | Merge "Use AudioTrack::event_type not int in callback"Glenn Kasten2011-06-011-1/+1
|\ \ \ | |/ /
| * | Use AudioTrack::event_type not int in callbackGlenn Kasten2011-06-011-1/+1
| |/ | | | | | | Change-Id: I451b5a7560ca21d07a5b71e9a4c0eb4c15aab7a9
* | Support the screen shot while the video is paused.Teng-Hui Zhu2011-06-011-0/+4
|/ | | | | | | | | | | | | | | | | | | | Basically, the GL textures generated for the surface texture will be used for showing the screenshot. Surface texture will be recycled every time a new video starts. But GL textures will be recycled either when running out of memory bound, or when the mediaplayer is deleted. 1. Add the VideoLayerManager as a static instance to manage the info of textures allocated for the screenshot. The basic info will be added into the manager while the video is played and prepared. During the draw time, the matirx info will be updated, too. 2. When there are too many screenshots are created, then we will discard the oldest one and just show the grey static rectangle to replace the screenshot. The corresponding framework change is 112501. Change-Id: Ifea60c96532500f9c93062cc97f7c4ef978046b0
* 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
* Fix more compilation error when nav_debug_ui is on.Shimeng (Simon) Wang2011-05-262-20/+20
| | | | Change-Id: I0e28ab1afcd98f01723730e84b51d43811baacc4
* Fix compilation error when debug_nav_ui is turned on.Shimeng (Simon) Wang2011-05-251-0/+2
| | | | Change-Id: I554f12a3d1ee2baa04288467e6fd46b1cdce9f9c
* 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 chromium at 10.0.634.0: Compile fixes"Kristian Monsen2011-05-254-11/+11
|\ \
| * | Merge chromium at 10.0.634.0: Compile fixesKristian Monsen2011-05-254-11/+11
| |/ | | | | | | | | | | | | | | | | | | | | base/thread.h moved to base/threading/thread.h: http://codereview.chromium.org/6028009 base/condition_variable.h base/lock.h moved to base/synchronization and classes added to base namespace: http://codereview.chromium.org/6018013 Change-Id: I74d14224d6b17df33bc1cc9a5521fd267f4e830c
* | 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 changes ↵Steve Block2011-05-2514-136/+147
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I78ff6a85,Ic85c6405,Ibf903baa,I3a0459db,I35140385,I54790419,I6bfe5d24,Ia9f39b83,I5bcecd5a,I1de96683,I543c6810,I8a5b0878,I0ae670bf,Ide4d58dc,I28ebaf3d,I499d6631,Ie5090e0d,I6d3e5f1f * changes: Merge WebKit at r78450: Update ThirdPartyProject.prop Merge WebKit at r78450: Add new Font::canExpandAroundIdeographsInComplexText() Merge WebKit at r78450: Add new ChromeClient::selectItemAlignmentFollowsMenuWritingDirection() Merge WebKit at r78450: FrameLoaderClient::didRunInsecureContent() signature changed Merge WebKit at r78450: HTMLAreaElement::getRect() renamed Merge WebKit at r78450: FrameLoader::url() removed Merge WebKit at r78450: HTMLParserQuirks removed Merge WebKit at r78450: TextRun::padding() renamed Merge WebKit at r78450: Use new FontMetrics Merge WebKit at r78450: GraphicsContext current path removed Merge WebKit at r78450: TransformationMatrix multiply methods renamed and meaning changed Merge WebKit at r78450: FontCustomPlatformData::fontPlatformData() signature changed Merge WebKit at r78450: IntRect::bottom()/right() renamed Merge WebKit at r78450: Fix remaining conflicts Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guard Merge WebKit at r78450: Fix conflicts in media controls Merge WebKit at r78450: Fix Makefiles Merge WebKit at r78450: Initial merge by git.
| * | Merge WebKit at r78450: Add new ↵Steve Block2011-05-252-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | ChromeClient::selectItemAlignmentFollowsMenuWritingDirection() See http://trac.webkit.org/changeset/76983 Change-Id: Ibf903baa41bc599ef99edb6ea26e3f62e9133c35
| * | Merge WebKit at r78450: FrameLoaderClient::didRunInsecureContent() signature ↵Steve Block2011-05-252-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | changed See http://trac.webkit.org/changeset/77602 Change-Id: I3a0459dba328a57688a9a2a0ae6a8d7a9121e240
| * | Merge WebKit at r78450: HTMLAreaElement::getRect() renamedSteve Block2011-05-251-1/+1
| | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/78261 Change-Id: I3514038557683146ace616982a0706b6c0fb1f95
| * | Merge WebKit at r78450: FrameLoader::url() removedSteve Block2011-05-252-6/+5
| | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/76872 Change-Id: I54790419f4e3b7dcd1e6123d6ff4bda8d7997066
| * | Merge WebKit at r78450: HTMLParserQuirks removedSteve Block2011-05-251-2/+0
| | | | | | | | | | | | | | | | | | See http://trac.webkit.org/changeset/77963 Change-Id: I6bfe5d2412d99d2a187cc83f565a8eba6fe01267
| * | Merge WebKit at r78450: IntRect::bottom()/right() renamedSteve Block2011-05-258-117/+127
| | | | | | | | | | | | | | | | | | | | | 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
* | | Use the correct type for the new quota for HTML5 Database and AppCacheSteve Block2011-05-242-15/+17
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | The WebCore DatabaseTracker uses 'unsigned long long' for quotas. We receive the new quota from Java as a jlong, which is 64bit signed. This change ... - Fixes the JNI methods to use 'long long' - Updates m_newQuota to use 'unsigned long long' to avoid ugly casts - Uses a boolean to track whether the new quota has been set yet, which is neater than a magic value and avoids deadlock if a value of -1 is set Change-Id: Ieab200164baf8c1647a2d47da759d3c31f0369f8
generated by cgit v1.1 at 2025-06-02 01:34:28 +0000