OSDN Git Service
Kristian Monsen [Wed, 3 Nov 2010 10:21:33 +0000 (10:21 +0000)]
Hook chromium logging up in WebKit
Change-Id: Ide08371e0bc8f74ef80fe25d416623bd03ac6038
Kristian Monsen [Mon, 1 Nov 2010 14:28:16 +0000 (14:28 +0000)]
Add support for file uploads in WebKit
This also moves some of the android file handling to Java so it is not
duplicated in both places.
This CL needs https://android-git.corp.google.com/g/#change,77400
in frameworks/base
Change-Id: I90c1726e6c323a9de3fd64f2e6feef4b64171053
claireho [Wed, 3 Nov 2010 19:52:05 +0000 (12:52 -0700)]
Merge "Bug
3158404 : Performance improvement for browser complex script handle."
claireho [Tue, 2 Nov 2010 21:26:59 +0000 (14:26 -0700)]
Bug
3158404 : Performance improvement for browser complex script handle.
1. Reduce the number of calls of normalization function.
The purpose of NFC normalization is to compose base letter and non-spacing
combining marks to be accented character. i.e. Convert A(U+0041) and
acute(U+0301) to A with Acute(U+00C1).
NFC includes three parts - decomposition, canonical sort and composition
for entire string. It is very expensive. TextRunWalker class would like
to convert '\t', '\n' and non-break space(\U+00A0) to space. NFC cannot
achieve this purpose. So, it is not necessary to call normalization for
Font::treatAsSpace().
This improvement saves the NFC nomalization calls for complex script text
has '\t', '\n' or 0xA0 and does not have non-spacing combining marks.
2. FontAndroid.cpp scans text for space and punctuation in 2 separate
loops. Combine these 2 loops to one pass.
Change-Id: I6b1ff20dd1072cf1f03066ce1c87ad39d0040779
Iain Merrick [Tue, 2 Nov 2010 12:51:09 +0000 (12:51 +0000)]
Merge Chromium at r63472 : WebKit fixes.
Chromium now uses protocol buffers so we need libprotobuf.
See http://src.chromium.org/viewvc/chrome?view=rev&revision=63221
HttpCache takes an extra constructor argument.
See http://src.chromium.org/viewvc/chrome?view=rev&revision=61789
Change-Id: I5e78b0de9a8ff86040b13212455eb37a4ed0e39e
Cary Clark [Wed, 3 Nov 2010 14:46:49 +0000 (07:46 -0700)]
Merge "Unref the picture instead of deleting it"
Cary Clark [Wed, 3 Nov 2010 14:21:19 +0000 (10:21 -0400)]
Unref the picture instead of deleting it
This fixes a couple of bugs related to layers
and hardware acceleration.
The picture used by select text is now accessed
asynchronously from the UI thread. The UI thread
now unrefs it rather than deleting it outright.
The layer position may not be up to date when
the cursor rings are drawn, so update them if
the cursor ring is in a layer.
bug:
3112657
bug:
3030370
Change-Id: I99d07175ec30dcba895a26cf1d44bc0364430793
Jeff Brown [Wed, 3 Nov 2010 00:38:28 +0000 (17:38 -0700)]
Merge "Add volume mute key."
Nicolas Roard [Wed, 3 Nov 2010 00:07:14 +0000 (17:07 -0700)]
Fix for deadlock
Bug:
3155066
Change-Id: I3e249050c779d10db75f97b177e09144a52f70b1
Nicolas Roard [Tue, 2 Nov 2010 19:52:48 +0000 (12:52 -0700)]
Set the page background color in BaseLayerAndroid
This allows us to show the correct background even if the tiles aren't yet painted.
Change-Id: Ia3ef97770aadb5f64490e44f20110ea21578ccd0
Cary Clark [Tue, 2 Nov 2010 13:36:37 +0000 (06:36 -0700)]
Merge "add function to find color on picture's edge"
Nicolas Roard [Sat, 30 Oct 2010 01:39:15 +0000 (18:39 -0700)]
Update the layers only
C++ counterpart to https://android-git.corp.google.com/g/#change,77500
Bug:
2975990
Change-Id: I3b8fd27f991d6776059a15eef36d0c9a7b44f9bb
Jeff Brown [Mon, 1 Nov 2010 22:24:52 +0000 (15:24 -0700)]
Add volume mute key.
Also fixed incorrect keycode constant for numpad parens.
Bug:
2912307
Change-Id: I65d02ca1c131638ea70f333bf06982747f34223c
Cary Clark [Thu, 28 Oct 2010 21:29:48 +0000 (17:29 -0400)]
add function to find color on picture's edge
bug:
3065048
Change-Id: I18ef06a4b9ac3bef077f08efd738958bd5abaafe
Steve Block [Mon, 1 Nov 2010 16:45:35 +0000 (09:45 -0700)]
Merge "Disable -Wsign-promo when building WebKit to avoid excessive warnings from Chromium headers"
Steve Block [Mon, 1 Nov 2010 16:15:34 +0000 (16:15 +0000)]
Disable -Wsign-promo when building WebKit to avoid excessive warnings from Chromium headers
If the root of the problem is fixed upstream, this warning can be
re-enabled.
Bug:
3143773
Change-Id: Ic419e353e3d0536d3a3c86f9e8e4615d30d9fb25
Steve Block [Mon, 1 Nov 2010 13:16:30 +0000 (13:16 +0000)]
Fix WebCoreStringToJString() to not delete the local reference to the new jstring
The JNI spec allows for local objects to be GC'ed before the JNI frame
returns, so this is dangerous.
Also rename the method to WtfStringToJstring() to match the existing
jstringToWtfString() and update call sites to JNIEnv::NewString() to
make use of it.
Change-Id: I84aa25ba1aca2aee346bf6e3d83a58afc3a95219
Shimeng (Simon) Wang [Fri, 29 Oct 2010 18:44:01 +0000 (11:44 -0700)]
Merge "Enhance auto hyphenation."
Shimeng (Simon) Wang [Fri, 29 Oct 2010 00:14:27 +0000 (17:14 -0700)]
Enhance auto hyphenation.
1. Bypass leading white spaces, since webkit does pass them down.
2. Return better hyphenation point, since previously it's more
aggressive and causes display issue in Google books.
issue:
2672163
Change-Id: I8ae47f7c553f533f752d6f7c697cf2fffd421e5b
Steve Block [Fri, 29 Oct 2010 15:51:22 +0000 (08:51 -0700)]
Merge changes I28fb1392,I6b881465
* changes:
CookieManager.getCookie() should return null rather than the empty string
Hook up remaining CookieManager methods
Iain Merrick [Fri, 29 Oct 2010 11:42:54 +0000 (12:42 +0100)]
Notify WebKit of redirects in the Chrome HTTP stack.
In this CL we just defer the redirect until WebKit has had a chance
to check it, and potentially cancel it.
There's a comment in the old code asking what to do if we're given
a bad request. Looks like this should never happen; it's a DCHECK in
Chrome so I've turned it into an ASSERT here.
We only follow redirects if WebKit does not modify the URL (this is
the same behaviour as Chrome).
Change-Id: I0c8b8cd61c501527a29dda5aca521a7df4a3ccef
Steve Block [Fri, 29 Oct 2010 12:24:17 +0000 (13:24 +0100)]
CookieManager.getCookie() should return null rather than the empty string
This is to match the behaviour of the Android Java HTTP stack.
Bug:
3116410
Change-Id: I28fb1392c36754a7c2fd78bc76281db8318a1056
Steve Block [Thu, 28 Oct 2010 14:35:47 +0000 (15:35 +0100)]
Hook up remaining CookieManager methods
hasCookies(), removeExpiredCookie(), removeSessionCookie() and setCookie()
Requires a change to frameworks/base ...
https://android-git.corp.google.com/g/76898
Bug:
3116410
Change-Id: I6b881465f78e090ed29b215785c4018119ccc5d8
Iain Merrick [Fri, 29 Oct 2010 10:22:24 +0000 (03:22 -0700)]
Merge "Allow Gmail attachments to be viewed."
Ben Murdoch [Tue, 26 Oct 2010 12:32:48 +0000 (13:32 +0100)]
Clear chromium side autofill profiles when java syncs a null profile.
This implements the native code needed to support the deletion
of a profile through the editor UI.
Change-Id: I7966551324d709612bff7cafeaf8a2cf93c218f0
Cary Clark [Thu, 28 Oct 2010 18:07:18 +0000 (11:07 -0700)]
Merge "allow contained draws to identify a link"
Cary Clark [Thu, 28 Oct 2010 17:01:20 +0000 (13:01 -0400)]
allow contained draws to identify a link
The first cut of rewriting hiding and clipping links if
they are obscured by a subsequent draw looks for the
contained text to find the original link in the picture.
Some links contain only bitmaps, and others, like text
fields, may contain nothing at all. To identify these,
look for bitmaps, and to cover the text field case, look for
a background erase. These draws can be used to identify
where the link is in the picture.
Because bitmaps and background erases can also obscure
links, distinguish between draws that are contained by
the link from those that overlap it.
bug:
3120589
Change-Id: Ied8fe2378f27253a162f5f9636f5ade12ce6013c
Iain Merrick [Thu, 28 Oct 2010 12:49:52 +0000 (13:49 +0100)]
Allow Gmail attachments to be viewed.
When displaying attachments, WebKit calls downloadFile() on an
Android-specific URL. This was crashing because it expected to
have a URLRequest available; however, there's a different code
path in WebRequest.cpp for Android URLs that doesn't create a
URLRequest.
This CL hoists the implementation of downloadFile() into
WebUrlLoaderClient, and gets the necessary headers from the
WebResponse object in didReceiveResponse (which should always
be called before downloadFile).
Gmail appends the MIME type to the URL after a ? separator,
and we have to extract this to display the file correctly.
Tests:
- Can display .txt attachments in Gmail (now fixed)
- Can download .apk files (checking for regressions)
Change-Id: I966220977972da7a2de29e663d7781b1de0e6fd4
Steve Block [Thu, 28 Oct 2010 14:48:45 +0000 (07:48 -0700)]
Merge "CookieManager.getCookie() should include HTTP-only cookies"
Derek Sollenberger [Thu, 28 Oct 2010 13:17:21 +0000 (06:17 -0700)]
Merge "Cleaning up BackedDoubleBufferedTexture."
Iain Merrick [Thu, 28 Oct 2010 09:39:47 +0000 (10:39 +0100)]
Use Tasks for WebRequest -> WebUrlLoaderClient callbacks.
We were using some hand-rolled boilerplate for inter-thread communication,
with all data packed into the same LoaderData struct. This CL uses the
Chromium utility function NewRunnableMethod to pack up the parameters, so
the callback methods don't have to be static and can have different
parameters. Also using smart pointers wherever possible.
Testing: manually verified that both synchronous and asynchronous requests
work correctly with no leaks. Will also do stress-testing to check for
race conditions.
Change-Id: I934a2ee795138f8eee43803a94bb7494ee73031d
Steve Block [Thu, 28 Oct 2010 12:48:16 +0000 (13:48 +0100)]
CookieManager.getCookie() should include HTTP-only cookies
This matches the behaviour of the Android Java HTTP stack
Change-Id: I280e524a849dc93bae54795543b1440c3be98c27
Steve Block [Wed, 27 Oct 2010 14:47:41 +0000 (15:47 +0100)]
Make sure we delete local references to jclass objects
Change-Id: I1b398bd0a84ce366eb2e686e5f14335d7aa5ed31
Nicolas Roard [Wed, 27 Oct 2010 21:24:10 +0000 (14:24 -0700)]
Fix for split text bug.
Bug:
3134026
Change-Id: I0ccaf27b8ede58603aeb2284c56527d4fe0a589b
(cherry picked from commit
ca3a75fc3f9712c15e4a84ebcfd48699963896bb)
Steve Block [Wed, 27 Oct 2010 20:33:41 +0000 (13:33 -0700)]
Merge "Fix a missing namespace in WebCache"
Steve Block [Wed, 27 Oct 2010 20:24:20 +0000 (21:24 +0100)]
Fix a missing namespace in WebCache
Change-Id: I6d1bf42b3f5a81b24613ca4c62ba4e02400a63b0
Steve Block [Wed, 27 Oct 2010 19:29:18 +0000 (12:29 -0700)]
Merge "Hook up CookieManager.getCookie() for Chromium HTTP stack"
Steve Block [Wed, 27 Oct 2010 15:59:53 +0000 (16:59 +0100)]
Hook up CookieManager.getCookie() for Chromium HTTP stack
Requires a change to frameworks/base ...
https://android-git.corp.google.com/g/76605
Bug:
3116410
Change-Id: I1b66c1ac9f9aaf5388ad1da92f54b1f16d4a3626
Steve Block [Wed, 27 Oct 2010 18:47:48 +0000 (11:47 -0700)]
Merge "Hook up CookieManager.acceptCookie() and setAcceptCookie() for the Chromium HTTP stack"
Steve Block [Mon, 25 Oct 2010 11:20:52 +0000 (12:20 +0100)]
Hook up CookieManager.acceptCookie() and setAcceptCookie() for the Chromium HTTP stack
We also update PlatformBridge::cookiesEnabled() to query the Chromium
HTTP stack directly. This avoids calling
CookieClient::cookiesEnabled(), which calls the Java
CookieManager::acceptCookie() which in turns calls back to native
code.
Also requires a change to frameworks/base ...
https://android-git.corp.google.com/g/76065
Bug:
3116410
Change-Id: Id853463f3bcef76b220e8c44dd2b30c0d6752624
Steve Block [Wed, 27 Oct 2010 18:44:05 +0000 (11:44 -0700)]
Merge "Fix some problems in WebCoreFrameBridge when using JNIEnv::NewString()"
Shimeng (Simon) Wang [Wed, 27 Oct 2010 17:39:33 +0000 (10:39 -0700)]
Merge "Update playback state after full screen video return."
Shimeng (Simon) Wang [Tue, 26 Oct 2010 21:10:27 +0000 (14:10 -0700)]
Update playback state after full screen video return.
This change will correctly update the play/pause button when
a full screen video is returned in the middle.
issue:
3102273
Change-Id: Icf5e9194393fa30dd6d9195045df21480842aa6b
Kristian Monsen [Wed, 27 Oct 2010 17:05:22 +0000 (10:05 -0700)]
Merge "Fix for simulator build"
Kristian Monsen [Wed, 27 Oct 2010 16:47:28 +0000 (17:47 +0100)]
Fix for simulator build
Added include in non-upstreamed section
Change-Id: I16556b1e46b43c509de04078487f13af2a9a3b72
Steve Block [Wed, 27 Oct 2010 15:47:51 +0000 (16:47 +0100)]
Fix some problems in WebCoreFrameBridge when using JNIEnv::NewString()
- Remove superfluous casts to unsigned short*
- Avoid converting from Unicode to UTF8 and back
Change-Id: Ib7cbc610f1b27ecd52082bf412afa7c7b3fec4b2
Cary Clark [Tue, 26 Oct 2010 14:56:53 +0000 (10:56 -0400)]
rewrite select text and others for layers
Layers contain pictures, and draw them offset from the top of
the page. Several readers of pictures need to account for this
displacement when computing what part of the picture intersects
a tap on the screen.
The tap may not correspond to the first layer that intersects
it, so all layers must be checked to find the best match. The
root layer usually draws everywhere, so for a match to correspond
to the root, the match must additionally intersect text.
Layers may create offscreen bitmaps when drawing to correctly
alpha blend the results to the screen, but this causes the items
in the bitmap to draw to an unexpected location when the picture
is treated as a spatial database. To get around this, call the
SkCanvas::save() from the overridden saveLayer() to push and
pop the canvas layer state without creating an offscreen.
WebCore/platform/graphics/android/LayerAndroid.cpp
WebCore/platform/graphics/android/LayerAndroid.h
- In find(), iterate through all children, instead of stopping
on the first match.
- Check to see if the child actually draws at the desired location,
and if it draws text there as well.
- Specify a slop factor to allow for inaccuracies in touch.
- Check the root for text before checking the children.
WebKit/android/nav/CachedFrame.cpp
WebKit/android/nav/CachedFrame.h
- Modify the (x,y) co-ordinate by the layer's offset, when
finding the picture corresponding to a point.
WebKit/android/nav/CachedLayer.cpp
WebKit/android/nav/CachedLayer.h
- More plumbing to adjust the point if the picture is contained
in an offset layer.
WebKit/android/nav/CachedRoot.cpp
WebKit/android/nav/CachedRoot.h
- Correct the (x,y) locations by the layer offset.
- Add some debugging (disabled by default)
WebKit/android/nav/ParsedCanvas.h
- One stop shopping that calls save() from saveLayer().
- Reset the bounder to null to balance its ref count.
WebKit/android/nav/SelectText.cpp
WebKit/android/nav/SelectText.h
- Rearrange the way pictures are tracked. Record the picture
corresponding to the input location when the selection starts,
requiring that the picture remain unchanged as the selection
extends.
- Only draw adornments for when the corresponding picture is
drawn. This fixes a Gmail specific problem, where the layers
come and go as the page scrolls.
- Always use the supplied visible bounds instead of computing
it from the canvas.
- Correct location points by layer offsets.
- Add to the picture ref count so it can't be deleted during
selection.
WebKit/android/nav/WebView.cpp
- Simplify visibleRect code.
- Simplify all SelectText interfaces.
bug:
3114609
Change-Id: I43dc3252fc86c4b6500edcd650126b2559f530e3
Derek Sollenberger [Wed, 27 Oct 2010 14:56:34 +0000 (10:56 -0400)]
Cleaning up BackedDoubleBufferedTexture.
The cleanup consisted of removing unused fields, ensuring mutexes
are only used for cross-thread interactions, and adding comments.
Change-Id: Ie008cd8f803299d418439793f21feb90d8325a8e
Steve Block [Wed, 27 Oct 2010 10:29:59 +0000 (11:29 +0100)]
Update Chromium HTTP stack to get database and cache paths from CookieSyncManager
Currently these paths are obtained from the BrowserFrame via JNI.
However, the paths are not synced to the BrowserFrame until the
WebCore thread has started up. This means that if the
WebRequestContext is created on the IO thread, the paths may not be
available.
This change moves the paths from BrowserFrame to CookieSyncManager to
avoid the need to wait for the WebCore thread.
Note that the new methods may be called on either the UI or WebCore
threads, so are synchronised.
Requires a change to frameworks/base ...
https://android-git.corp.google.com/g/76580
Change-Id: I61f88772d13901d66892118c79db3cac412e6bd1
Steve Block [Wed, 27 Oct 2010 08:58:13 +0000 (09:58 +0100)]
Fix WebRequestContext::get() to be threadsafe
This allows the method to be called from both the WebCore thread and
the UI thread, as required to hook up CookieManager.
Change-Id: I895d14909b14f0baba77fb2cb75926d9103ee01f
Steve Block [Wed, 27 Oct 2010 08:49:32 +0000 (09:49 +0100)]
Fixes style in WebRequestContext
Previously this file used Chromium style, as it extends a Chromium
class. However, I think it's best to switch to WebKit style to prevent
Chromium style from leaking into the rest of WebKit.
Also switches static member methods to file-scope static functions
where possible.
Finally, return WebRequestContext* rather than URLRequestContext* to
allow us to call methods in the derived class. this will be required
to hook up CookieManager.
Change-Id: Ifdca62230a3728e338904ef1b9b392640af06a92
Derek Sollenberger [Wed, 27 Oct 2010 12:54:47 +0000 (05:54 -0700)]
Merge "Cleanup the getAvailableTexture() function."
Iain Merrick [Wed, 27 Oct 2010 11:23:51 +0000 (12:23 +0100)]
Fix build break.
Missing edit in I50da7599, ended up on the wrong CL.
Change-Id: I4d4c6713fbfe30cdc8cdf0e733c4725b33a09673
Iain Merrick [Wed, 27 Oct 2010 09:59:48 +0000 (10:59 +0100)]
Only AV formats should be handled by MediaPlayer (C++ side)
Fixing JNI bindings. See Java-side change for details (Id39b770b).
Change-Id: I50da7599475476ebaaf9609f44e13fbdf212c90e
Derek Sollenberger [Tue, 26 Oct 2010 17:42:04 +0000 (13:42 -0400)]
Cleanup the getAvailableTexture() function.
We now check to see if the tile owns a texture and immediately
return if that is the case. I also updated the documentation.
Change-Id: I88a6f2e38ef33fd37f5926c793c9e775e646bef2
Nicolas Roard [Fri, 22 Oct 2010 00:02:16 +0000 (17:02 -0700)]
Remove locks in BaseTile. Also fix the bug where the browser hangs when closing a tab.
Bug:
3112610
Change-Id: I4f4854a8a0688fc24b512e7671a2ad0708121075
Nicolas Roard [Tue, 19 Oct 2010 23:34:10 +0000 (16:34 -0700)]
Fix random crashes when HW acceleration is turned on.
Bug:
3107362
Change-Id: I354a07369056e696deed7458a4f4e14d54b7f6c8
Ben Murdoch [Tue, 26 Oct 2010 18:21:04 +0000 (11:21 -0700)]
Merge "Fix potential crash in Nav Cache code introduced by WebKit merge"
Steve Block [Tue, 26 Oct 2010 17:55:48 +0000 (10:55 -0700)]
Merge "libwebcore cleanspec."
Ben Murdoch [Tue, 26 Oct 2010 17:51:19 +0000 (18:51 +0100)]
libwebcore cleanspec.
Reports of build errors in master, fixed by a clean build.
Change-Id: Idfee8a890cc69f4b69b1d72738525c43770e65b8
Ben Murdoch [Tue, 26 Oct 2010 17:27:56 +0000 (18:27 +0100)]
Fix potential crash in Nav Cache code introduced by WebKit merge
The refactoring in the nav cache code caused by the recent merge
to webkit r70209 can crash. Fix that.
Bug:
3132882
Change-Id: I98b605ae2fdf24cf0f25adc919f2dbba581abef0
Nicolas Roard [Mon, 25 Oct 2010 08:24:41 +0000 (01:24 -0700)]
Add DEBUG_COUNT stuff
Change-Id: I99a0d2bc23da6299228ba5adea7cf161e01d8fbf
(cherry picked from commit
8f12379d1df1bc5f2e85bce687d89ba20d4a5e9e)
Leon Scroggins [Fri, 22 Oct 2010 22:16:01 +0000 (18:16 -0400)]
Update selection after keypresses.
Bug:
3054784
Change-Id: I5430969dc532feea10a960eb4117b3a3108ed702
Ben Murdoch [Mon, 25 Oct 2010 18:10:19 +0000 (19:10 +0100)]
Fix a layering violation in Document.
PlatformBridge already has the necessary functionality.
Change-Id: I67a5d68890d3976da69cff0c20f7b48931366b1d
Ben Murdoch [Fri, 22 Oct 2010 12:02:34 +0000 (13:02 +0100)]
Merge WebKit at r70209: Update WebKit revision
Change-Id: I9a95c19b76015bfb43393e0570bd35f155dc7809
Ben Murdoch [Mon, 25 Oct 2010 15:02:11 +0000 (16:02 +0100)]
Merge Webkit at r70209: Add Android expected results for new layout tests
fast/dom/DeviceOrientation/create-event-onorientationchange.html
See http://trac.webkit.org/changeset/69984
Change-Id: I345106587049a3e59040aa2c449432ac6d7fe5b1
Ben Murdoch [Mon, 25 Oct 2010 17:27:58 +0000 (18:27 +0100)]
Merge WebKit at r70209: Cherry pick build fix
See https://bugs.webkit.org/show_bug.cgi?id=48243 for details.
Change-Id: Idf1bf291f2370e611ebb2595f820598f68925336
Ben Murdoch [Fri, 22 Oct 2010 19:08:15 +0000 (20:08 +0100)]
Merge Webkit at r70209: defaultLanguage has been renamed.
It is now known as defaultPlatformLanguage.
See http://trac.webkit.org/changeset/70095
Change-Id: I523e93e78317a2e365429a8027967aa46d0370fa
Ben Murdoch [Fri, 22 Oct 2010 18:48:55 +0000 (19:48 +0100)]
Merge Webkit at r70209: Add stub for proxyServersForURL function.
This is a new function added to WebKit platform API. Currently left
unimplemented.
See http://trac.webkit.org/changeset/68951
Change-Id: I7bf33d1b054980918e42cee8da8ecd8494f0b543
Ben Murdoch [Fri, 22 Oct 2010 15:59:05 +0000 (16:59 +0100)]
Merge Webkit at r70209: StringBuilder.h moved to WTF.
See http://trac.webkit.org/changeset/69594
Change-Id: I17d01eae838c03ac198dd8b0df3717d058806aca
Ben Murdoch [Fri, 22 Oct 2010 15:04:33 +0000 (16:04 +0100)]
Merge Webkit at r70209: Path::debugString has been removed.
See http://trac.webkit.org/changeset/69505
Change-Id: Ic9e275531354b166d3a262399a1caa4482c5c5d3
Ben Murdoch [Fri, 22 Oct 2010 15:02:07 +0000 (16:02 +0100)]
Merge Webkit at r70209: ImageColorSpace type no longer exists.
It has been replaced with ColorSpace. Also DeviceColorSpace
has been renamed ColorSpaceDeviceRGB.
See http://trac.webkit.org/changeset/70143
Change-Id: Ib603dcef04dcfa51fca142d8b3d03689a18e110f
Ben Murdoch [Fri, 22 Oct 2010 14:50:17 +0000 (15:50 +0100)]
Merge Webkit at r70209: DeprecatedInputType is now private.
See http://trac.webkit.org/changeset/68749
Bug:
3132882
Change-Id: I51dfa144c5c289c759caa48e7dedc9020b7d8f12
Ben Murdoch [Fri, 22 Oct 2010 12:52:39 +0000 (13:52 +0100)]
Merge Webkit at r70209: Fix conflicts
WebCore/page/FrameView.cpp
http://trac.webkit.org/changeset/69896
WebCore/html/parser/HTMLDocumentParser.cpp
http://trac.webkit.org/changeset/69283
WebCore/html/HTMLPlugInElement.h
http://trac.webkit.org/changeset/69596
WebCore/html/HTMLInputElement.cpp
http://trac.webkit.org/changeset/68996
http://trac.webkit.org/changeset/69378
WebCore/plugins/npapi.cpp
http://trac.webkit.org/changeset/69808
WebCore/css/CSSComputedStyleDeclaration.cpp
http://trac.webkit.org/changeset/69220
WebCore/css/CSSParser.cpp
http://trac.webkit.org/changeset/69196
WebCore/rendering/style/RenderStyle.h
http://trac.webkit.org/changeset/68680
WebCore/rendering/RenderImage.cpp
http://trac.webkit.org/changeset/68917
WebCore/platform/android/FileSystemAndroid.cpp
http://trac.webkit.org/changeset/69594
WebCore/inspector/InspectorController.h
http://trac.webkit.org/changeset/68767
See also Android change I4c724f2f52a5a9db6dca6b58032b6a902aac74b5 which
is why this is a conflict.
JavaScriptCore/parser/Parser.cpp
http://trac.webkit.org/changeset/69516
Change-Id: I5a708c6590ba029a2b3ecc3b30478ea303e1f2f5
Ben Murdoch [Fri, 22 Oct 2010 12:49:51 +0000 (13:49 +0100)]
Merge Webkit at r70209: Fix Makefiles.
Change-Id: Ib60d9a927bad38e128765e122e86bcc547a785cf
Ben Murdoch [Fri, 22 Oct 2010 12:02:20 +0000 (13:02 +0100)]
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Derek Sollenberger [Tue, 26 Oct 2010 13:04:10 +0000 (06:04 -0700)]
Merge "Minor cleanup of the DoubleBufferedTexture."
Nicolas Roard [Mon, 25 Oct 2010 22:53:18 +0000 (15:53 -0700)]
Merge "Remove any scheduled painting for BaseTile that are going to be deallocated."
Nicolas Roard [Mon, 25 Oct 2010 08:25:04 +0000 (01:25 -0700)]
Remove any scheduled painting for BaseTile that are going to be deallocated.
Change-Id: I9f46df074fedb3b157f54b2f03b33ecc80fca9ab
Ben Murdoch [Mon, 25 Oct 2010 17:41:48 +0000 (10:41 -0700)]
Merge "Remove unused dispatchDidLoadResourceByXMLHttpRequest"
Ben Murdoch [Fri, 22 Oct 2010 15:51:56 +0000 (16:51 +0100)]
Remove unused dispatchDidLoadResourceByXMLHttpRequest
See http://trac.webkit.org/changeset/57210
Change-Id: I82ddff6e4d04e2c36dad2518e4e27a695728bc95
Steve Block [Fri, 22 Oct 2010 16:47:02 +0000 (17:47 +0100)]
Hide details of private browsing for URLRequestContext from Chromium AutoFill code
Change-Id: I58a388ecf16b2af4f1cd31afb39d0aa6c5c44a24
Steve Block [Fri, 22 Oct 2010 12:51:33 +0000 (13:51 +0100)]
Add a JNI method to determine which HTTP stack is in use
This will be required when hooking up CookieManager to the Chromium
stack, as we need to decide in Java whether or not to call into native
code.
Bug:
3116410
Change-Id: I4e148ad2c38a6e5771912dc419f52c8098027958
Kristian Monsen [Fri, 22 Oct 2010 18:39:01 +0000 (19:39 +0100)]
Fix for ALT_HTTP build break
Was broken by this CL:
https://android-git.corp.google.com/g/#change,75473
Change-Id: I6f60fd1e19eafe84f9d2f72f556493a25c2caf0e
Shimeng (Simon) Wang [Fri, 22 Oct 2010 00:27:10 +0000 (17:27 -0700)]
For non user-scrolled scroll, don't send scroll event.
This is in conjunction with Java side CL:
https://android-git.corp.google.com/g/75647
issue:
3063945
Change-Id: I3f0bb11e25ee4ea7615980e2bc6cefb2064d4d9d
Derek Sollenberger [Fri, 22 Oct 2010 15:22:18 +0000 (11:22 -0400)]
Minor cleanup of the DoubleBufferedTexture.
Change-Id: Ie3236502942eed684ac6b4602493cbf384fe8ba0
Derek Sollenberger [Wed, 20 Oct 2010 15:19:43 +0000 (11:19 -0400)]
Cleanup DoubleBufferedTexture and SharedTexture classes.
The cleanup consisted of...
1. removing uneeded mutex calls
2. ensuring user's of the class fully initialize them before use
3. hiding protected variables to prevent potential misuse by subclasses
There will be a follow on CL focusing on cleaning up the use of mutexes
in BackedDoubleBufferedTexture.
Change-Id: Ia642d54d8a5b154ac287640a07d8b2c0e5d85334
Ben Murdoch [Fri, 22 Oct 2010 11:42:07 +0000 (12:42 +0100)]
Add missing indexedDB tests at r68651.
These were missed in the merge to r67178 and are needed for the next
merge to r70157.
Change-Id: Ic76e75ffe5ed40e83534cee470ca10c9718aba8b
Steve Block [Fri, 22 Oct 2010 10:56:55 +0000 (03:56 -0700)]
Merge "Hook up CookieManager.removeAllCookie() for the Chromium HTTP stack"
Steve Block [Thu, 21 Oct 2010 16:46:42 +0000 (17:46 +0100)]
Hook up CookieManager.removeAllCookie() for the Chromium HTTP stack
Requires a change to frameworks/base ...
https://android-git.corp.google.com/g/75471
Bug:
3086308
Change-Id: I062015c990f6bc3d77ec22c746bd8465ed74bd08
Steve Block [Fri, 22 Oct 2010 08:54:35 +0000 (01:54 -0700)]
Merge "Fix a compiler warning in WebRequest.cpp"
Steve Block [Fri, 22 Oct 2010 08:49:48 +0000 (09:49 +0100)]
Fix a compiler warning in WebRequest.cpp
Change-Id: I4ece067b344b7a132f04451ce9810993d8ed73f0
Steve Block [Thu, 21 Oct 2010 11:33:17 +0000 (12:33 +0100)]
Fix naming for JNI registration methods
Change-Id: I1aba39bdcf217bff751e42d2a335cd230b8193f7
Ben Murdoch [Thu, 21 Oct 2010 22:31:03 +0000 (15:31 -0700)]
am
d844e1f0: (-s ours) am
2da7ed0b: Cherry-pick WebKit security fix (webkit.org r67967) Do not merge
Merge commit '
d844e1f030065939140c0fa927fe89b367d5bd40'
* commit '
d844e1f030065939140c0fa927fe89b367d5bd40':
Cherry-pick WebKit security fix (webkit.org r67967) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 22:31:00 +0000 (15:31 -0700)]
am
c194fa2c: (-s ours) am
ee4c9585: Cherry-pick WebKit security fix (webkit.org r69345) Do not merge
Merge commit '
c194fa2ce4ff53dae520be0ee6759a6f9f367db0'
* commit '
c194fa2ce4ff53dae520be0ee6759a6f9f367db0':
Cherry-pick WebKit security fix (webkit.org r69345) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 22:30:57 +0000 (15:30 -0700)]
am
219c89f0: (-s ours) am
3017f37b: Cherry-pick WebKit security fix (webkit.org r68705) Do not merge
Merge commit '
219c89f043c10eba31fc94db69a8136bbc115d1d'
* commit '
219c89f043c10eba31fc94db69a8136bbc115d1d':
Cherry-pick WebKit security fix (webkit.org r68705) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 22:30:54 +0000 (15:30 -0700)]
am
122a6b03: (-s ours) am
910dc2ab: Cherry-pick WebKit security fix (webkit.org r69476) Do not merge
Merge commit '
122a6b03f21c5ec726d905d08531bdb8f1c7a376'
* commit '
122a6b03f21c5ec726d905d08531bdb8f1c7a376':
Cherry-pick WebKit security fix (webkit.org r69476) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 22:30:50 +0000 (15:30 -0700)]
am
d377cc76: (-s ours) am
80a0e2c2: Cherry-pick WebKit security fix (webkit.org r68408) Do not merge
Merge commit '
d377cc767167c529a2effc0b1740b31f01ba6f9d'
* commit '
d377cc767167c529a2effc0b1740b31f01ba6f9d':
Cherry-pick WebKit security fix (webkit.org r68408) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 22:30:46 +0000 (15:30 -0700)]
am
741c2272: (-s ours) am
d3bed0e7: Cherry-pick WebKit security fix (webkit.org r68096) Do not merge
Merge commit '
741c22725f573421f088db6a32064bf210ba80ae'
* commit '
741c22725f573421f088db6a32064bf210ba80ae':
Cherry-pick WebKit security fix (webkit.org r68096) Do not merge
Ben Murdoch [Thu, 21 Oct 2010 22:30:42 +0000 (15:30 -0700)]
am
7616c8cd: (-s ours) am
8da84207: Cherry-pick WebKit security fix (webkit.org r68485) Do not merge
Merge commit '
7616c8cd53cceb7d29b9382fc6754e46725af8fc'
* commit '
7616c8cd53cceb7d29b9382fc6754e46725af8fc':
Cherry-pick WebKit security fix (webkit.org r68485) Do not merge