OSDN Git Service
Kristian Monsen [Mon, 6 Sep 2010 16:18:53 +0000 (17:18 +0100)]
Merge Webkit at r66666 : Fix conflicts.
css/CSSParser.cpp
Replaced m_mediaQuery = 0 with ASSERT(!m_mediaQuery):
http://trac.webkit.org/changeset/66334/trunk/WebCore/css/CSSParser.cpp
dom/Document.cpp
Removed a function call next to an Android specific change:
http://trac.webkit.org/changeset/66247/trunk/WebCore/dom/Document.cpp
html/HTMLPlugInElement.cpp
Removed a function next to an Android change:
http://trac.webkit.org/changeset/66653/trunk/WebCore/html/HTMLPlugInElement.cpp
page/Settings.h
Whitespace change in this CL:
http://trac.webkit.org/changeset/66570/trunk/WebCore/page/Settings.h
svg/SVGFontFaceUriElement.h
Small change next to an Android change:
http://trac.webkit.org/changeset/66397/trunk/WebCore/svg/SVGFontFaceUriElement.h
Change-Id: I8d395474f9a08d3a1432249da9a1aa06b01765e0
Kristian Monsen [Wed, 8 Sep 2010 11:18:00 +0000 (12:18 +0100)]
Merge WebKit at r66666 : Initial merge by git.
Change-Id: I57dedeb49859adc9c539e760f0e749768c66626f
Leon Scroggins [Fri, 14 May 2010 19:38:53 +0000 (15:38 -0400)]
Allow WebKit to scroll selection on screen.
Requires a change to frameworks/base
Bug
2679411
Bug
2659028
Change-Id: I482cefadc24c620c6d07cbce44acc216bdb9b8df
Steve Block [Fri, 10 Sep 2010 12:01:08 +0000 (05:01 -0700)]
am
574b2420: am
946ea101: Cherry-pick security fix in WebKit change 66052
Merge commit '
574b2420d2e43cab716a4ae8b5c18ff48dd7ee9f'
* commit '
574b2420d2e43cab716a4ae8b5c18ff48dd7ee9f':
Cherry-pick security fix in WebKit change 66052
Steve Block [Fri, 10 Sep 2010 12:01:06 +0000 (05:01 -0700)]
am
d8a7ee4d: (-s ours) am
93f07dbc: Cherry-pick security fix in WebKit change 65826
Merge commit '
d8a7ee4d40714f2434265e0f76549ef9ce79a036'
* commit '
d8a7ee4d40714f2434265e0f76549ef9ce79a036':
Cherry-pick security fix in WebKit change 65826
Steve Block [Fri, 10 Sep 2010 11:58:10 +0000 (04:58 -0700)]
am
e21fd1b6: am
badca5a6: Cherry-pick security fix in WebKit change 65748
Merge commit '
e21fd1b62f9e51013dcbdc28fdb35b7e5751397d'
* commit '
e21fd1b62f9e51013dcbdc28fdb35b7e5751397d':
Cherry-pick security fix in WebKit change 65748
Steve Block [Fri, 10 Sep 2010 11:58:07 +0000 (04:58 -0700)]
am
4b59a578: am
0a05678e: Cherry-pick security fix in WebKit change 65329
Merge commit '
4b59a578dfea4d5ae9b902b834ca44cc28ac993b'
* commit '
4b59a578dfea4d5ae9b902b834ca44cc28ac993b':
Cherry-pick security fix in WebKit change 65329
Steve Block [Fri, 10 Sep 2010 11:58:02 +0000 (04:58 -0700)]
am
7777773e: (-s ours) am
6dba6e09: Cherry-pick security fix in WebKit change 65280
Merge commit '
7777773eaa086fa6180ab47e86dd7d903a2e7b2f'
* commit '
7777773eaa086fa6180ab47e86dd7d903a2e7b2f':
Cherry-pick security fix in WebKit change 65280
Steve Block [Fri, 10 Sep 2010 11:54:59 +0000 (04:54 -0700)]
am
229c8c38: (-s ours) am
3f2f7e2f: Cherry-pick security fix in WebKit change 65090
Merge commit '
229c8c38532f7fb3da4cb45a4d18f559613af829'
* commit '
229c8c38532f7fb3da4cb45a4d18f559613af829':
Cherry-pick security fix in WebKit change 65090
Steve Block [Fri, 10 Sep 2010 11:49:59 +0000 (04:49 -0700)]
am
4c6e224c: am
e1d3e323: Cherry-pick security fix in WebKit change 64293
Merge commit '
4c6e224cc337ee1c7b0f677b0f1f78408e42052e'
* commit '
4c6e224cc337ee1c7b0f677b0f1f78408e42052e':
Cherry-pick security fix in WebKit change 64293
Steve Block [Fri, 10 Sep 2010 11:49:53 +0000 (04:49 -0700)]
am
a9b9e574: am
da4ffba3: Cherry-pick security fix in WebKit change 64077
Merge commit '
a9b9e574f280df13a7bd1d3c2adc93e56ac74276'
* commit '
a9b9e574f280df13a7bd1d3c2adc93e56ac74276':
Cherry-pick security fix in WebKit change 64077
Steve Block [Fri, 10 Sep 2010 11:49:47 +0000 (04:49 -0700)]
am
359de72a: am
237faca5: Cherry-pick security fix in WebKit change 63773
Merge commit '
359de72a0d7182dbfbcccc0f9909b1421b1751a9'
* commit '
359de72a0d7182dbfbcccc0f9909b1421b1751a9':
Cherry-pick security fix in WebKit change 63773
Steve Block [Fri, 10 Sep 2010 11:49:40 +0000 (04:49 -0700)]
am
e772cff7: (-s ours) am
440c0366: Cherry-pick security fix in WebKit change 63772
Merge commit '
e772cff7e4f4e6838bc95ad69c7b17a12b11ed43'
* commit '
e772cff7e4f4e6838bc95ad69c7b17a12b11ed43':
Cherry-pick security fix in WebKit change 63772
Steve Block [Fri, 10 Sep 2010 11:44:34 +0000 (04:44 -0700)]
am
a8a44d01: am
be2b5a3f: Cherry-pick security fix in WebKit change 62873
Merge commit '
a8a44d01c8c57974c92ba7d924cf600cde71ed27'
* commit '
a8a44d01c8c57974c92ba7d924cf600cde71ed27':
Cherry-pick security fix in WebKit change 62873
Steve Block [Fri, 10 Sep 2010 11:44:29 +0000 (04:44 -0700)]
am
866b5c80: (-s ours) am
d8dd893d: Cherry-pick security fix in WebKit change 62271
Merge commit '
866b5c801e7591db2d365b09b35a90d337eb147c'
* commit '
866b5c801e7591db2d365b09b35a90d337eb147c':
Cherry-pick security fix in WebKit change 62271
Steve Block [Fri, 10 Sep 2010 11:35:16 +0000 (04:35 -0700)]
am
48c3fafe: am
eea24577: Cherry-pick security fix in WebKit change 62134
Merge commit '
48c3fafefe720cb153f52c69ea70e95c86d28e89'
* commit '
48c3fafefe720cb153f52c69ea70e95c86d28e89':
Cherry-pick security fix in WebKit change 62134
Steve Block [Fri, 10 Sep 2010 11:35:05 +0000 (04:35 -0700)]
am
9836c30e: am
a926fcfd: Cherry-pick security fix in WebKit change 61709
Merge commit '
9836c30e301e8c144507e06ef2482d33c89a7d1c'
* commit '
9836c30e301e8c144507e06ef2482d33c89a7d1c':
Cherry-pick security fix in WebKit change 61709
Steve Block [Fri, 10 Sep 2010 11:32:59 +0000 (04:32 -0700)]
am
946ea101: Cherry-pick security fix in WebKit change 66052
Merge commit '
946ea101a7673e7f566d52b1ba81f85b75666d16' into gingerbread-plus-aosp
* commit '
946ea101a7673e7f566d52b1ba81f85b75666d16':
Cherry-pick security fix in WebKit change 66052
Steve Block [Fri, 10 Sep 2010 11:32:57 +0000 (04:32 -0700)]
am
93f07dbc: Cherry-pick security fix in WebKit change 65826
Merge commit '
93f07dbc620b468fe98b72a93f0d0e84c40353cd' into gingerbread-plus-aosp
* commit '
93f07dbc620b468fe98b72a93f0d0e84c40353cd':
Cherry-pick security fix in WebKit change 65826
Steve Block [Fri, 10 Sep 2010 11:32:54 +0000 (04:32 -0700)]
am
badca5a6: Cherry-pick security fix in WebKit change 65748
Merge commit '
badca5a6d49b048c5dc9c5a847ab2d729b936b09' into gingerbread-plus-aosp
* commit '
badca5a6d49b048c5dc9c5a847ab2d729b936b09':
Cherry-pick security fix in WebKit change 65748
Steve Block [Fri, 10 Sep 2010 11:32:52 +0000 (04:32 -0700)]
am
0a05678e: Cherry-pick security fix in WebKit change 65329
Merge commit '
0a05678e32a04623b93aa4d3990d14877ee80386' into gingerbread-plus-aosp
* commit '
0a05678e32a04623b93aa4d3990d14877ee80386':
Cherry-pick security fix in WebKit change 65329
Steve Block [Fri, 10 Sep 2010 11:32:49 +0000 (04:32 -0700)]
am
6dba6e09: Cherry-pick security fix in WebKit change 65280
Merge commit '
6dba6e09f232d333432972b64d0074cbee59ca7a' into gingerbread-plus-aosp
* commit '
6dba6e09f232d333432972b64d0074cbee59ca7a':
Cherry-pick security fix in WebKit change 65280
Steve Block [Fri, 10 Sep 2010 11:32:46 +0000 (04:32 -0700)]
am
3f2f7e2f: Cherry-pick security fix in WebKit change 65090
Merge commit '
3f2f7e2fd4924ef8eaf542740438ede42a81732e' into gingerbread-plus-aosp
* commit '
3f2f7e2fd4924ef8eaf542740438ede42a81732e':
Cherry-pick security fix in WebKit change 65090
Steve Block [Fri, 10 Sep 2010 11:32:42 +0000 (04:32 -0700)]
am
e1d3e323: Cherry-pick security fix in WebKit change 64293
Merge commit '
e1d3e323642600e02d50760bd7dacd11e4ccfa83' into gingerbread-plus-aosp
* commit '
e1d3e323642600e02d50760bd7dacd11e4ccfa83':
Cherry-pick security fix in WebKit change 64293
Steve Block [Fri, 10 Sep 2010 11:32:39 +0000 (04:32 -0700)]
am
da4ffba3: Cherry-pick security fix in WebKit change 64077
Merge commit '
da4ffba387f70730453d4533272dd55870dd81bb' into gingerbread-plus-aosp
* commit '
da4ffba387f70730453d4533272dd55870dd81bb':
Cherry-pick security fix in WebKit change 64077
Steve Block [Fri, 10 Sep 2010 11:32:35 +0000 (04:32 -0700)]
am
237faca5: Cherry-pick security fix in WebKit change 63773
Merge commit '
237faca5ff0377c7fda5c4dcc0f287e67fe66091' into gingerbread-plus-aosp
* commit '
237faca5ff0377c7fda5c4dcc0f287e67fe66091':
Cherry-pick security fix in WebKit change 63773
Steve Block [Fri, 10 Sep 2010 11:32:31 +0000 (04:32 -0700)]
am
440c0366: Cherry-pick security fix in WebKit change 63772
Merge commit '
440c0366ae0192fb737c7dd87dc2d7156266b3f7' into gingerbread-plus-aosp
* commit '
440c0366ae0192fb737c7dd87dc2d7156266b3f7':
Cherry-pick security fix in WebKit change 63772
Steve Block [Fri, 10 Sep 2010 11:32:27 +0000 (04:32 -0700)]
am
be2b5a3f: Cherry-pick security fix in WebKit change 62873
Merge commit '
be2b5a3fe0063db46087ef38f78a1e2aa7b47631' into gingerbread-plus-aosp
* commit '
be2b5a3fe0063db46087ef38f78a1e2aa7b47631':
Cherry-pick security fix in WebKit change 62873
Steve Block [Fri, 10 Sep 2010 11:32:22 +0000 (04:32 -0700)]
am
d8dd893d: Cherry-pick security fix in WebKit change 62271
Merge commit '
d8dd893d690e9d208fe4a71b7d62374687d279f4' into gingerbread-plus-aosp
* commit '
d8dd893d690e9d208fe4a71b7d62374687d279f4':
Cherry-pick security fix in WebKit change 62271
Steve Block [Fri, 10 Sep 2010 11:32:15 +0000 (04:32 -0700)]
am
eea24577: Cherry-pick security fix in WebKit change 62134
Merge commit '
eea2457721313546f0b5ddab3836282e338847b9' into gingerbread-plus-aosp
* commit '
eea2457721313546f0b5ddab3836282e338847b9':
Cherry-pick security fix in WebKit change 62134
Steve Block [Fri, 10 Sep 2010 11:32:10 +0000 (04:32 -0700)]
am
a926fcfd: Cherry-pick security fix in WebKit change 61709
Merge commit '
a926fcfd627808c13994eb22aa991c82fd57673a' into gingerbread-plus-aosp
* commit '
a926fcfd627808c13994eb22aa991c82fd57673a':
Cherry-pick security fix in WebKit change 61709
Steve Block [Thu, 9 Sep 2010 10:55:43 +0000 (11:55 +0100)]
Cherry-pick security fix in WebKit change 66052
See http://trac.webkit.org/changeset/66052
Bug:
2986936
Change-Id: I42d1b546b328e28d8dd817c5904fa1d0ee0b759c
Steve Block [Thu, 9 Sep 2010 10:56:25 +0000 (11:56 +0100)]
Cherry-pick security fix in WebKit change 65826
See http://trac.webkit.org/changeset/65826
Bug:
2986936
Change-Id: Ie69df8dfa6314d46e5dbf51663ebb207995b8d3b
Steve Block [Thu, 9 Sep 2010 10:55:57 +0000 (11:55 +0100)]
Cherry-pick security fix in WebKit change 65748
See http://trac.webkit.org/changeset/65748
Bug:
2986936
Change-Id: Idd9927f39d49b8eadd589f1513cf5210cd9dfee0
Steve Block [Thu, 9 Sep 2010 10:52:21 +0000 (11:52 +0100)]
Cherry-pick security fix in WebKit change 65329
See http://trac.webkit.org/changeset/65329
Bug:
2986936
Change-Id: I664cc00bba4cdd68cc5e23d2566279de614f5f64
Steve Block [Thu, 9 Sep 2010 10:17:57 +0000 (11:17 +0100)]
Cherry-pick security fix in WebKit change 65280
See http://trac.webkit.org/changeset/65280
Bug:
2986936
Change-Id: Ia70edaa46747536a9e7adc05493ef70a9baec610
Steve Block [Thu, 9 Sep 2010 10:18:29 +0000 (11:18 +0100)]
Cherry-pick security fix in WebKit change 65090
See http://trac.webkit.org/changeset/65090
Note that this required a manual merge due to our not having
http://trac.webkit.org/changeset/60251
Bug:
2986936
Change-Id: I035ec5d92c4e31cc8f7667dfc46e22d2a02cda97
Steve Block [Thu, 9 Sep 2010 10:17:44 +0000 (11:17 +0100)]
Cherry-pick security fix in WebKit change 64293
See http://trac.webkit.org/changeset/64293
Bug:
2986936
Change-Id: I2b4e9d218909872260e031032356b02038b73ced
Steve Block [Thu, 9 Sep 2010 10:17:13 +0000 (11:17 +0100)]
Cherry-pick security fix in WebKit change 64077
See http://trac.webkit.org/changeset/64077
Bug:
2986936
Change-Id: Ic3e825e880f2094f274758af93a0949b0b9278f0
Steve Block [Thu, 9 Sep 2010 10:16:44 +0000 (11:16 +0100)]
Cherry-pick security fix in WebKit change 63773
See http://trac.webkit.org/changeset/63773
Bug:
2986936
Change-Id: I5536ceeee25b07476a92e4531862c7c9d7beb6c8
Steve Block [Thu, 9 Sep 2010 10:20:02 +0000 (11:20 +0100)]
Cherry-pick security fix in WebKit change 63772
See http://trac.webkit.org/changeset/63772
Note that this is only a partial cherry-pick. I don't think that the
fix to RenderBlock::canMergeContiguousAnonymousBlocks() is required as
we don't have this method in our version of WebKit. The method was
added in http://trac.webkit.org/changeset/60201). Attempting to make
the fix without this change, or cherry-picking this change too, would
be too high risk.
Bug:
2986936
Change-Id: I8d9f1924611e693e340dcb2f05a43d5673ef23b1
Steve Block [Thu, 9 Sep 2010 11:00:30 +0000 (12:00 +0100)]
Cherry-pick security fix in WebKit change 62873
See http://trac.webkit.org/changeset/62873
Bug:
2986936
Change-Id: I8353bade3fb14aedeaa517e6bc8331cd05ee3fd8
Steve Block [Thu, 9 Sep 2010 10:53:31 +0000 (11:53 +0100)]
Cherry-pick security fix in WebKit change 62271
See http://trac.webkit.org/changeset/62271
Bug:
2986936
Change-Id: I368b10ff368aef5317c01b18524f1e0521df056e
Steve Block [Thu, 9 Sep 2010 10:53:17 +0000 (11:53 +0100)]
Cherry-pick security fix in WebKit change 62134
See http://trac.webkit.org/changeset/62134
Bug:
2986936
Change-Id: Ie5c1698e58b9183519aae5dfa8cf5fb8f158feb1
Steve Block [Thu, 9 Sep 2010 11:00:49 +0000 (12:00 +0100)]
Cherry-pick security fix in WebKit change 61709
See http://trac.webkit.org/changeset/61709
Bug:
2986936
Change-Id: Ib2be95d12bb89c57b6f30d57cd6422bbbf364fc6
Kristian Monsen [Wed, 8 Sep 2010 20:27:21 +0000 (21:27 +0100)]
Set mime type for special android urls
Change-Id: I66f1643c78563c8aa7d9941b788f7533a8185cb4
Steve Block [Tue, 7 Sep 2010 20:47:51 +0000 (21:47 +0100)]
Remove WEBKIT_MERGE_REVISION in favour of ThirdPartyProject.prop
Change-Id: Id7330a7535f9cf00557ad11627d40f2ad1ca9537
Steve Block [Tue, 7 Sep 2010 15:06:44 +0000 (16:06 +0100)]
Adds a number of fast/ LayoutTest directories to the triaged set
Tests are added at r66079. All tests pass
fast/constructors/
fast/cookies/
fast/dom/Attr/
fast/dom/CSSStyleDeclaration/
fast/dom/DOMImplementation/
fast/dom/DeviceMotion/
fast/dom/EntityReference/
fast/dom/HTMLAnchorElement/
fast/dom/HTMLButtonElement/
fast/dom/HTMLFontElement/
fast/dom/HTMLFormElement/
fast/dom/HTMLHtmlElement/
fast/dom/HTMLKeygenElement/
fast/dom/HTMLLabelElement/
fast/dom/HTMLMetaElement/
fast/dom/HTMLTableRowElement/
fast/dom/HTMLTableSectionElement/
fast/dom/Node/
fast/dom/NodeList/
fast/dom/Selection/
fast/dom/StyleSheet/
fast/dom/Text/
fast/dom/TreeWalker/
fast/dom/beforeload/
fast/dom/getElementsByClassName/
fast/leaks/
Change-Id: I9a2c401151f7abf5bb22b764b1327022ab651e04
Kristian Monsen [Mon, 6 Sep 2010 10:57:53 +0000 (11:57 +0100)]
Restoring the ability to set the stack from the shell.
This was lost in the last CL:
https://android-git.corp.google.com/g/#change,63956
Change-Id: I5737da8ae6da35fe33b87dc6de344b2dfb0c1a32
Steve Block [Fri, 3 Sep 2010 17:46:30 +0000 (18:46 +0100)]
Add fast/url LayoutTests at r66079
All tests pass.
Change-Id: I2564b234be722a743e48ad07e3995a654202a208
Steve Block [Sat, 4 Sep 2010 19:46:56 +0000 (20:46 +0100)]
Revert "Bug fix
2337042 <base> URL + <img> URL = URL that starts with "/.""
This change broke LayoutTest fast/url/ipv4.html
This reverts commit
ff93a851c578d0b570c84b3a83a41a4930e7107c.
Change-Id: Ic27602be9fdd855fbc1517deed9e7e9737f5b9b5
Kristian Monsen [Thu, 2 Sep 2010 18:14:42 +0000 (11:14 -0700)]
Merge "Update to Merge WebKit at r61871: Floating-point support for text selection."
Steve Block [Thu, 2 Sep 2010 17:54:48 +0000 (10:54 -0700)]
Merge changes I54430bd1,I61a04cf7,I4961f561,I36170123,I5dc94bad,Ie2e1440f
* changes:
Merge WebKit at r66079 : Update WebKit revision
Merge WebKit at r66079 : Cherry-pick WebKit change 66211 to add missing IndexedDB guards
Merge WebKit at r66079 : ImageSource constructor now takes a premultipyAlpha argument
Merge WebKit at r66079 : Fix makefiles
Merge WebKit at r66079 : Fix conflicts
Merge WebKit at r66079 : Initial merge by git
Maksymilian Osowski [Thu, 2 Sep 2010 14:08:44 +0000 (15:08 +0100)]
Updated test_expectations.txt to use CRASH instead of SKIP.
Bug:
2970575
Change-Id: Ibbf9ce77a5549d7737b26649a4f5cffc670c9f2a
Steve Block [Fri, 27 Aug 2010 09:45:12 +0000 (10:45 +0100)]
Merge WebKit at r66079 : Update WebKit revision
Change-Id: I54430bd17e4fb66e436af90d4faeff77f8604834
Steve Block [Fri, 27 Aug 2010 11:46:16 +0000 (12:46 +0100)]
Merge WebKit at r66079 : Cherry-pick WebKit change 66211 to add missing IndexedDB guards
See http://trac.webkit.org/changeset/66211
Change-Id: I61a04cf700bc84dd5ff173cc79befc28497fddd2
Steve Block [Fri, 27 Aug 2010 11:40:23 +0000 (12:40 +0100)]
Merge WebKit at r66079 : ImageSource constructor now takes a premultipyAlpha argument
See http://trac.webkit.org/changeset/66039
Change-Id: I4961f5610c3061c90edf8cc32b83e4a6b8be12d1
Steve Block [Fri, 27 Aug 2010 11:54:49 +0000 (12:54 +0100)]
Merge WebKit at r66079 : Fix makefiles
Change-Id: I361701236c527552e183fe1eaf427c6f549ded90
Steve Block [Fri, 27 Aug 2010 11:31:11 +0000 (12:31 +0100)]
Merge WebKit at r66079 : Fix conflicts
- WebCore/dom/Document.cpp
Conflict due to Android guards around m_axObjectCache
See http://trac.webkit.org/changeset/65787
- WebCore/dom/Document.h
Conflict due to Android guards around m_axObjectCache whitespace diff
See http://trac.webkit.org/changeset/65787
and http://trac.webkit.org/changeset/66037
- WebCore/html/HTMLDocumentParser.cpp
Conflict due to ANDROID_INSTRUMENT
See http://trac.webkit.org/changeset/65692
- WebCore/platform/image-decoders/ImageDecoder.cpp
Conflict due to Android not implementing ImageDecoder::create()
See http://trac.webkit.org/changeset/66039
- WebCore/plugins/PluginView.h
Conflict due to PLUGIN_SCHEDULE_TIMER
See http://trac.webkit.org/changeset/65697
Change-Id: I5dc94bad471ea566dbabf965425938b732735d02
Steve Block [Fri, 27 Aug 2010 10:02:25 +0000 (11:02 +0100)]
Merge WebKit at r66079 : Initial merge by git
Change-Id: Ie2e1440fb9d487d24e52c247342c076fecaecac7
Kristian Monsen [Thu, 2 Sep 2010 14:41:28 +0000 (15:41 +0100)]
Update to Merge WebKit at r61871: Floating-point support for text selection.
The last CL only fixed when SUPPORT_COMPLEX_SCRIPTS was defined, this is the same fix for when it is not defined.
The previous CL:
https://android-git.corp.google.com/g/#change,56256
Webkit CL:
http://trac.webkit.org/changeset/61253
Change-Id: I9300786525fd6ec0ea2fc304c5d33e3ee00ccd3e
Maksymilian Osowski [Thu, 2 Sep 2010 12:55:45 +0000 (05:55 -0700)]
Merge "Updated the test_expectations.txt to use FAIL instead of IGNORE_RESULT."
Maksymilian Osowski [Wed, 1 Sep 2010 16:21:35 +0000 (17:21 +0100)]
Updated the test_expectations.txt to use FAIL instead of IGNORE_RESULT.
Bug:
2899965
Change-Id: Ia61ab8d7f269d4d3b2db4531fd8e2031b1ae44b4
Elliott Slaughter [Tue, 31 Aug 2010 22:29:02 +0000 (15:29 -0700)]
Use the correct types in SaveWebArchive.
Change-Id: I0a963a0e6b29be73aaede56bb58400ce1e81edb7
Elliott Slaughter [Tue, 24 Aug 2010 01:24:00 +0000 (18:24 -0700)]
Cleanup temporary incognito mode files after last tab closes.
Change-Id: Ib55ef570b181afc99991afb55b6880b7a13f69a7
Kristian Monsen [Wed, 1 Sep 2010 17:19:24 +0000 (10:19 -0700)]
Merge "Using Chrome http as default."
Cary Clark [Wed, 1 Sep 2010 17:13:56 +0000 (10:13 -0700)]
Merge "add web setting for enabling/disabling synthetic links"
Cary Clark [Tue, 31 Aug 2010 19:45:11 +0000 (15:45 -0400)]
add web setting for enabling/disabling synthetic links
According to this feature request
http://b/
1865484
Some webviews wish to load pages and ignore the
email, phone, and postal addresses. Add a way
to specify that preference to the WebView class.
depends on companion change in frameworks/base
Change-Id: Ibcd78ab632063d8ab403567fa40c329339e51572
Kristian Monsen [Wed, 1 Sep 2010 13:51:56 +0000 (14:51 +0100)]
Using Chrome http as default.
Will use the not default stack if USE_ALT_HTTP is defined in the shell.
Change-Id: I8232c906dcdfaefbb03d3765eb8201407e2cef5b
Maksymilian Osowski [Wed, 1 Sep 2010 11:08:36 +0000 (04:08 -0700)]
Merge "Added script to show the source of the test."
Maksymilian Osowski [Tue, 31 Aug 2010 17:08:06 +0000 (18:08 +0100)]
Added script to show the source of the test.
Change-Id: I192b0ecd7830f69193111ebf1d081dcd9495a51b
Kristian Monsen [Wed, 1 Sep 2010 08:59:24 +0000 (01:59 -0700)]
Merge "Move all external/chromiumn includes to one file"
Melanie Clements [Tue, 31 Aug 2010 17:10:56 +0000 (10:10 -0700)]
am
cd011297: am
ff93a851: Bug fix
2337042 <base> URL + <img> URL = URL that starts with "/."
Merge commit '
cd011297fda5b6f6093453d59c2624aaf878e2fb'
* commit '
cd011297fda5b6f6093453d59c2624aaf878e2fb':
Bug fix
2337042 <base> URL + <img> URL = URL that starts with "/."
Kristian Monsen [Sun, 29 Aug 2010 14:50:43 +0000 (15:50 +0100)]
Move all external/chromiumn includes to one file
There are several logging errors and warnings when including files from external/chromium
and the <cutils/log.h>. This commit moves all external/chromium includes to one place, and
and LOG_ASSERT to what it is in <cutils/log.h>
Change-Id: If908262cf1b859247d7b8a5880807a2e9ec16980
Melanie Clements [Tue, 31 Aug 2010 16:10:30 +0000 (09:10 -0700)]
am
ff93a851: Bug fix
2337042 <base> URL + <img> URL = URL that starts with "/."
Merge commit '
ff93a851c578d0b570c84b3a83a41a4930e7107c' into gingerbread-plus-aosp
* commit '
ff93a851c578d0b570c84b3a83a41a4930e7107c':
Bug fix
2337042 <base> URL + <img> URL = URL that starts with "/."
Cary Clark [Tue, 31 Aug 2010 13:20:16 +0000 (09:20 -0400)]
fix monkey crash in nav cache
WebView::motionUp() got the latest nav cache, extracted
some nodes from it with findAt(), then called setNavBounds()
which got a newer cache. The older cache node was sent
to CachedRoot::setCursor() which crashed trying to use
the state pointer.
The flaw was that, although motionUp requests the newest
cache up front, and then setNavBounds() requests the stale
cache, in rare circumstances it can receive a newer cache
as well.
The fix is to replace the setNavBounds() function with a
direct call on the valid cache.
Change-Id: If23ee9222f2b701d916911f4b667185f1c3d3d18
http://b/
2316138
Melanie Clements [Fri, 20 Aug 2010 18:19:20 +0000 (14:19 -0400)]
Bug fix
2337042 <base> URL + <img> URL = URL that starts with "/."
The Android browser inserts "/." at the beginning of the URL path
when processing an <img> in an HTML document with a <base> tag.
This does not cause any errors but should be fixed to comply with
RFC 3986 section 5.4.
This only happens at the first pass of the URL parsing, at the second
pass where the base and path are parsed together this is dealt with
correctly. I am therefore fixing it by modifying the parse() method
in KURL to check for a trailing '.' at the end of the base segment.
Change-Id: I0d641c8619e00aa2b08a33e271ef863cee5ed7ad
Cary Clark [Fri, 27 Aug 2010 23:05:46 +0000 (16:05 -0700)]
am
586c8632: (-s ours) am
90fa57cd: DO NOT MERGE make the text selection easier to hit
Merge commit '
586c86325776ca506c6380ab41f9e66a69704f45'
* commit '
586c86325776ca506c6380ab41f9e66a69704f45':
DO NOT MERGE make the text selection easier to hit
Steve Block [Fri, 27 Aug 2010 16:31:37 +0000 (09:31 -0700)]
Merge "Add ANGLE at r65615"
Steve Block [Fri, 27 Aug 2010 16:00:52 +0000 (17:00 +0100)]
Add ANGLE at r65615
ANGLE is now required for the Mac build, so should have been added
as part of the merge to r65615.
Change-Id: I048185d196cf3150651fff0e3761fc57928f18ce
Kristian Monsen [Fri, 27 Aug 2010 15:43:35 +0000 (08:43 -0700)]
Merge "Checking that all load operations are done in order."
Cary Clark [Fri, 27 Aug 2010 15:19:11 +0000 (08:19 -0700)]
am
90fa57cd: DO NOT MERGE make the text selection easier to hit
Merge commit '
90fa57cd8b940ab1b46a85da92d950392a77e9da' into gingerbread-plus-aosp
* commit '
90fa57cd8b940ab1b46a85da92d950392a77e9da':
DO NOT MERGE make the text selection easier to hit
Kristian Monsen [Mon, 23 Aug 2010 14:09:26 +0000 (15:09 +0100)]
Checking that all load operations are done in order.
Adding a m_loadState variable and checking that everything is happening when they are supposed to. There were some problems were race conditions between the threads created some issues.
Change-Id: I7fca570aa917eaaa741c3745f6b8417a656d18c4
Steve Block [Fri, 27 Aug 2010 14:42:46 +0000 (07:42 -0700)]
Merge "Restore LayoutTests/storage/sql-error-codes-expected.txt"
Steve Block [Fri, 27 Aug 2010 14:25:09 +0000 (15:25 +0100)]
Restore LayoutTests/storage/sql-error-codes-expected.txt
This should have been added in the merge to WebKit r61871, but was
accidentally removed when creating the Android V8-specific result.
See https://android-git.corp.google.com/g/#change,56250
Change-Id: I48849d32f649009bcb935911558f2543eebb3d2f
Cary Clark [Wed, 25 Aug 2010 21:49:25 +0000 (17:49 -0400)]
fix button cursor state
Clear the pressed state for buttons when the cursor is
shown indefinitely, and set look for the pressed cursor
state when recording the button colors.
Change-Id: I78095ec9a7580c372c66b83913447b8214a6a432
http://b/
2135321
Steve Block [Fri, 27 Aug 2010 11:26:09 +0000 (04:26 -0700)]
Merge "Use upstream version of ANDROID_HITTEST_WITHSIZE"
Steve Block [Thu, 12 Aug 2010 11:11:09 +0000 (12:11 +0100)]
Use upstream version of ANDROID_HITTEST_WITHSIZE
This change removes the last occurrences of ANDROID_HITTEST_WITHSIZE
and updates WebKit to use the upstream version of this logic. This
follows on from https://android-git.corp.google.com/g/#change,60166 which
merged the upstream logic into the Android tree but maintained the existing
behaviour for Android, guarded with ANDROID_HITTEST_WITHSIZE.
This change introduces the following functional changes ...
- HitTestResult::addNodeToRectBasedTestResult()
The Android version proceeded with the containment test if the node is null.
We now early out and continue the hit test. We also record the node's
shadowAncestorNode, rather than the node itself.
- RenderLayer::hitTestList()
The android version always updates the result, but only updates the
result layer if the result is not a rect based result.
We now always update result layer, but only update the result if the
result is not a rect based result.
- RenderSVGRoot::nodeAtPoint()
The Android version returned true only if it's not a rect based hit test.
Now we return true always.
- HitTestResult::m_isRectBased
In the Android version, a padding must have positive width and height.
Now we allow one of the two to be zero, provided the other is positive
All other changes are non-functional and should probably have been done as
part of https://android-git.corp.google.com/g/#change,60166
Note that the change to RenderBlock::nodeAtPoint() is a non-functional change
because we don't pass a rect to addNodeToRectBasedTestResult(), so the default
zero rect is used and the hit test always fails.
Change-Id: I4163fddad59ad6485df40cd48794aa262f76ced7
Steve Block [Fri, 27 Aug 2010 11:02:11 +0000 (04:02 -0700)]
Merge "Add missing Indexed DB tests at r65615"
Steve Block [Fri, 27 Aug 2010 10:19:51 +0000 (11:19 +0100)]
Add missing Indexed DB tests at r65615
These should have been added as part of the merge to WebKit r65615
See http://trac.webkit.org/changeset/65509
Change-Id: I18ff50f54caa6682e8adfc6ae152bce4e94636a9
Cary Clark [Thu, 26 Aug 2010 21:47:21 +0000 (17:47 -0400)]
DO NOT MERGE make the text selection easier to hit
Change-Id: I47b7aa04ebc2a8f0bf2c6b4399ef65e5f4c58d4e
http://b/
2626451
Kristian Monsen [Thu, 26 Aug 2010 17:41:44 +0000 (10:41 -0700)]
Merge "Create HttpAuthHandlerFactory to fix HTTP auth crashes."
Iain Merrick [Thu, 26 Aug 2010 17:38:42 +0000 (18:38 +0100)]
Create HttpAuthHandlerFactory to fix HTTP auth crashes.
We still need to hook in the necessary callbacks to present
the user with a login prompt.
Change-Id: Id4ccb8209d2ffdfcc35f9104a2e448ed552e6390
Steve Block [Thu, 26 Aug 2010 14:43:21 +0000 (15:43 +0100)]
Update get_layout_tests_dir_contents.php to account for new server document root
See https://android-git.corp.google.com/g/#change,63194 which updates apach2.py
to serve HTTP tests at server root
Bug:
2951727
Change-Id: I4a5777d71843c1c2fdcd74a69b13e3c4750a45a0
Maksymilian Osowski [Thu, 26 Aug 2010 15:19:04 +0000 (08:19 -0700)]
Merge "Updated the script to allow for chosing the mode (list files vs. list folders)."
Maksymilian Osowski [Tue, 24 Aug 2010 15:21:18 +0000 (16:21 +0100)]
Updated the script to allow for chosing the mode (list files vs. list folders).
Change-Id: I7a87e5591aef888f47cceaf3f30f5f2752e336aa
Steve Block [Thu, 26 Aug 2010 11:19:01 +0000 (04:19 -0700)]
Merge "Fix line endings on a couple of Android-specific expected results"
Steve Block [Thu, 26 Aug 2010 10:54:13 +0000 (11:54 +0100)]
Fix line endings on a couple of Android-specific expected results
These files were checked in with DOS line endings
See https://android-git.corp.google.com/g/#change,62547
Change-Id: I849afbab74df789b6c1df83a28a65ec92ad10d24
Shimeng (Simon) Wang [Thu, 26 Aug 2010 00:27:07 +0000 (17:27 -0700)]
Add a NULL guard.
issue:
2884022
Change-Id: I471fca7296ca233bc4d9e1c75d173094265c9a9f
Shimeng (Simon) Wang [Wed, 25 Aug 2010 21:52:03 +0000 (14:52 -0700)]
Merge "Preserve the zoomFactor when a new frameview is created."