OSDN Git Service
Henrik Baard [Tue, 17 Aug 2010 14:54:16 +0000 (07:54 -0700)]
am
3c54ece0: am
5dc34a85: activeDocumentLoader() causes crash in WebCoreFrameBridge.cpp
Merge commit '
3c54ece08a0ea9e5dc5d5788a4c49c8dc94b501f'
* commit '
3c54ece08a0ea9e5dc5d5788a4c49c8dc94b501f':
activeDocumentLoader() causes crash in WebCoreFrameBridge.cpp
Henrik Baard [Tue, 17 Aug 2010 14:51:05 +0000 (07:51 -0700)]
am
5dc34a85: activeDocumentLoader() causes crash in WebCoreFrameBridge.cpp
Merge commit '
5dc34a8555dde1ae4a2c174870c4296cc44f8a22' into gingerbread-plus-aosp
* commit '
5dc34a8555dde1ae4a2c174870c4296cc44f8a22':
activeDocumentLoader() causes crash in WebCoreFrameBridge.cpp
Cary Clark [Mon, 16 Aug 2010 18:15:03 +0000 (11:15 -0700)]
Merge "allow building webkit without svg"
Cary Clark [Mon, 16 Aug 2010 17:38:43 +0000 (13:38 -0400)]
allow building webkit without svg
In Apple's DerivedSources.make, XLinkNames are built all the time.
Change our Android.derived.mk to do the same, instead of only
building when SVG is enabled.
Change-Id: I69d903788e4416e2140068f2aa907d65b336ce68
Leon Scroggins III [Thu, 12 Aug 2010 16:15:11 +0000 (12:15 -0400)]
Move check to clear the text input to the webcore thread.
Originally written in response to bug
2835685, which was
fixed in
https://android-git.corp.google.com/g/#change,61059
WebViewCore.cpp:
Send a message to clear the text input/remove the soft
keyboard if the click results in no text input field
being in focus.
WebView.cpp:
Remove the old checks to clear the WebTextView, which
is now done in WebViewCore.cpp. This makes clearing it
consistent with the checks for opening the WebTextView.
Change-Id: I06ba7aadc95302c90af67da16edccd46896fcdbf
Patrick Scott [Mon, 16 Aug 2010 16:40:57 +0000 (09:40 -0700)]
Merge "Update navigation in scrollable layers."
Patrick Scott [Fri, 13 Aug 2010 20:17:40 +0000 (16:17 -0400)]
Update navigation in scrollable layers.
Set the foreground clip after drawing. Use the absolute bounds to
compute the local foreground clip in order to compensate for any
outline.
Consolidate the check for overflow scrolling into RenderLayer.
Request a compositing update after computing the scroll dimensions.
Only change the foregroundRect of the layer during paint so that the
outline rect (and background/layerBounds) are correct.
Draw the outline as part of the background phase. During painting of
a layer, scroll to (0,0), paint, then scroll back.
When clicking on an element in a layer, scroll to the position of the
element but do not scroll back. This makes text input fields visible
to the tree and will properly update when typing. Record the original
scroll position of layers in order to offset the bounds of nodes when
checking the nav cache. Make sure to reset all cached layers during
setRootLayer. Otherwise we were reaching into layers from the wrong
thread.
Change-Id: Id9827ec461989b0869a8252d4d2563ecd12c5fac
Ben Murdoch [Mon, 16 Aug 2010 15:26:49 +0000 (16:26 +0100)]
Build fix for JSC
The new net stack has dependencies on V8 and so we cannot use it
in conjunction with JSC.
Fix b/
2920038
Change-Id: If39db4732a66b6d3c25dba8816a3205d2bb55777
Henrik Baard [Fri, 13 Aug 2010 15:02:46 +0000 (17:02 +0200)]
activeDocumentLoader() causes crash in WebCoreFrameBridge.cpp
This is a fix for a crash found in real phones, there is cases when
activeDocumentLoader() can return null, probably related to closing of a
frame or canceling of a request.
Change-Id: Id340ab006b6e40e396645a4e668dcb58824a63e7
Iain Merrick [Thu, 12 Aug 2010 15:00:40 +0000 (16:00 +0100)]
Implement synchronous resource loading in Android.
Change-Id: I31c2c983f0b04db6fb5d2c4ccbe0ea837fc7db2b
Maksymilian Osowski [Fri, 13 Aug 2010 17:29:21 +0000 (10:29 -0700)]
Merge "Added php script in WebKitTools/DumpRenderTree/android/ that fetches all the files under given path."
Maksymilian Osowski [Fri, 13 Aug 2010 16:07:21 +0000 (17:07 +0100)]
Added copyright info to test_expectations.txt
Change-Id: Ib30b205797425debfb48318fa9de7a9fc5cc45e0
Ben Murdoch [Fri, 13 Aug 2010 17:23:53 +0000 (10:23 -0700)]
Merge "Guard usage of BLOB-only feature correctly."
Kristian Monsen [Fri, 13 Aug 2010 16:58:43 +0000 (09:58 -0700)]
Merge "Trigger a full rebuild of webcore to get the Chrome http stack as default"
Ben Murdoch [Fri, 13 Aug 2010 16:36:06 +0000 (17:36 +0100)]
Guard usage of BLOB-only feature correctly.
Change-Id: I950f48ae3edaf48c1f4da1ca926683ad075ad094
Maksymilian Osowski [Thu, 12 Aug 2010 16:43:54 +0000 (17:43 +0100)]
Added php script in WebKitTools/DumpRenderTree/android/ that fetches all the files under given path.
Change-Id: Iac6025007a549833bf8065dacd50f942b1b2f643
Kristian Monsen [Fri, 13 Aug 2010 16:38:33 +0000 (17:38 +0100)]
Trigger a full rebuild of webcore to get the Chrome http stack as default
Change-Id: I2e1c3431ae16292942a360e636725e39229481b5
Patrick Scott [Fri, 13 Aug 2010 16:35:00 +0000 (12:35 -0400)]
Fix build break. BLOB_SLICE changed to BLOB.
Change-Id: I20f36620033e6249fe5b749ae74392e2ac64c09c
Ben Murdoch [Fri, 13 Aug 2010 12:20:16 +0000 (05:20 -0700)]
Merge changes I60a96064,I6929172f,Idefd9bec,I8cf448f2,I8791737a,I992c56b0,Ibb4b089d,I779a8ec0,Ife412e30,I2da1ae98,Ibcf41849
* changes:
Merge WebKit at r65072 : Update WebKit revision number.
Merge WebKit at r65072 : Update test_expectations.
Merge WebKit at r65072 : Complete cherry-pick of WebKit change 43848 to add EmptyDeviceMotionClient
Merge WebKit at r65072 : Implement DeviceMotionClientAndroid
Merge WebKit at r65072: JSC build fix in InspectorController.h
Merge WebKit at r65072: Fix V8 code generator.
Merge WebKit at r65072 : Build fix for JSC, update ambiguous usage of JSLock.
Merge WebKit at r65072: String class has moved to the WTF namespace.
Merge Webkit at r65072 : Fix conflicts.
Merge Webkit at r65072 : Fix Makefiles.
Merge WebKit at r65072 : Initial merge by git.
Ben Murdoch [Wed, 11 Aug 2010 13:53:52 +0000 (14:53 +0100)]
Merge WebKit at r65072 : Update WebKit revision number.
Change-Id: I60a9606437bd1de3df767459641a02e594e18ffa
Ben Murdoch [Thu, 12 Aug 2010 15:10:15 +0000 (16:10 +0100)]
Merge WebKit at r65072 : Update test_expectations.
This merge introduces two new Geolocation tests that to pass we need
a new LayoutTestController function. We ignore those tests until this
function is added - see b/
2914450
Change-Id: I6929172fd6822b3c2c588693d743362f7edbca4f
Steve Block [Wed, 11 Aug 2010 13:24:41 +0000 (14:24 +0100)]
Merge WebKit at r65072 : Complete cherry-pick of WebKit change 43848 to add EmptyDeviceMotionClient
See https://android-git.corp.google.com/g/#change,61020 which picked
part of this change for EmptyDeviceOrientationClient.
See also https://bugs.webkit.org/show_bug.cgi?id=43848
Change-Id: Idefd9becf89199ae9afe475074fc56a66252db8a
Steve Block [Mon, 9 Aug 2010 17:30:40 +0000 (18:30 +0100)]
Merge WebKit at r65072 : Implement DeviceMotionClientAndroid
This class acts simply as a proxy to the real or mock client, which is owned by
the WebView. DEVICE_ORIENTATION is enabled on Android, so we must implement this
client before we pull in http://trac.webkit.org/changeset/64845, which calls
DeviceMotionClient::setController() from the Page constructor.
Change-Id: I8cf448f26103df3e55098e70eec80d845725761f
Ben Murdoch [Thu, 12 Aug 2010 10:54:23 +0000 (11:54 +0100)]
Merge WebKit at r65072: JSC build fix in InspectorController.h
Cherry pick of http://trac.webkit.org/changeset/65258
http://trac.webkit.org/changeset/64722 introduced a build break when
INSPECTOR is not enabled.
Change-Id: I8791737a6c399245b84a8adc9830364ac4df907d
Ben Murdoch [Thu, 12 Aug 2010 10:32:32 +0000 (11:32 +0100)]
Merge WebKit at r65072: Fix V8 code generator.
Cherry pick of WebKit r65240.
http://trac.webkit.org/changeset/65005 introduced a bug in the
V8 Code Generator.
See http://trac.webkit.org/changeset/65240
Change-Id: I992c56b073611a4d9caf4c2c0ae0d231e774213a
Ben Murdoch [Thu, 12 Aug 2010 11:47:25 +0000 (12:47 +0100)]
Merge WebKit at r65072 : Build fix for JSC, update ambiguous usage of JSLock.
Need to update the parameter passed to JSLock ctor as new
ctor added in r64585 creates an ambiguity.
See http://trac.webkit.org/changeset/64585
Change-Id: Ibb4b089d66aa984038b66eef03d4d788575bfaaf
Ben Murdoch [Wed, 11 Aug 2010 17:17:05 +0000 (18:17 +0100)]
Merge WebKit at r65072: String class has moved to the WTF namespace.
See http://trac.webkit.org/changeset/65021
Change-Id: I779a8ec0c3e1e0aed8f8d1894cfc1e5ca33ee549
Ben Murdoch [Wed, 11 Aug 2010 14:21:07 +0000 (15:21 +0100)]
Merge Webkit at r65072 : Fix conflicts.
HTMLInputElement.cpp: New include. See http://trac.webkit.org/changeset/64616
TemporaryLinkStubs.cpp, Navigator.h: Relocation of string forwarders. See http://trac.webkit.org/changeset/65021
GraphicsContext.h, ImageSource.h: addition of WebCore namespace on Chromium's NativeImagePtr type. See http://trac.webkit.org/changeset/64584
Platform.h: Renaming of iPhone PLATFORM macros. See http://trac.webkit.org/changeset/64798
Change-Id: Ife412e30f733fe6bb66321a3600814d6499ddf70
Ben Murdoch [Wed, 11 Aug 2010 14:15:13 +0000 (15:15 +0100)]
Merge Webkit at r65072 : Fix Makefiles.
Change-Id: I2da1ae98ee39f7f817d4b4363140872b931ac8bf
Ben Murdoch [Wed, 11 Aug 2010 13:44:44 +0000 (14:44 +0100)]
Merge WebKit at r65072 : Initial merge by git.
Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585
Kristian Monsen [Thu, 12 Aug 2010 18:11:27 +0000 (19:11 +0100)]
Flip the switch, chrome http stack by default
Change-Id: I60bc20a7a17f76087be3ebec1e2261dc271aff97
Kristian Monsen [Thu, 12 Aug 2010 16:59:23 +0000 (17:59 +0100)]
Build fix. Guard chromium headers, and never use chrome stack in simulator.
Change-Id: Iaf9a9de73870c497b9c925af3b1637a07b399640
Kristian Monsen [Thu, 12 Aug 2010 16:02:47 +0000 (09:02 -0700)]
Merge "Connecting cookies set from WebCore to the chromium cookies"
Kristian Monsen [Thu, 22 Jul 2010 10:59:32 +0000 (11:59 +0100)]
Connecting cookies set from WebCore to the chromium cookies
Change-Id: Id6c9cfc92ba2aeaae15724e789e9531a451e04fa
Kristian Monsen [Wed, 11 Aug 2010 19:33:58 +0000 (20:33 +0100)]
Sending the headers to the url_request
Only using a local variable that went out of scope before. Now setting them to the correct member variable.
Change-Id: I562c4b05b35b0bf996ce2490fdae54f25af05c74
Steve Block [Thu, 12 Aug 2010 13:31:08 +0000 (06:31 -0700)]
Merge "Provide EmptyDeviceOrientationClient for use with SVGImage"
Kristian Monsen [Thu, 12 Aug 2010 11:52:22 +0000 (04:52 -0700)]
Merge "Send didFail to webcore for failed requests. Also removed the member variable m_resourceRequest as it is not needed outside the function."
Steve Block [Wed, 11 Aug 2010 13:24:41 +0000 (14:24 +0100)]
Provide EmptyDeviceOrientationClient for use with SVGImage
This is a partial cherry-pick of WebKit change 64106
See https://bugs.webkit.org/show_bug.cgi?id=43848
We can't take the complete change because we don't yet have
DeviceMotion in our version of WebKit.
Bug:
2907653
Change-Id: Ie038a21f9e989af46fb6b77decd7ea10da734b3c
Kristian Monsen [Wed, 11 Aug 2010 15:59:04 +0000 (08:59 -0700)]
Merge "Use libchromium_net as a static library. This saves a lot of space."
Steve Block [Tue, 10 Aug 2010 15:20:22 +0000 (16:20 +0100)]
Add missing DeviceOrientationClient for benchmarking
This was missed when DeviceOrientationClientAndroid was added
Change-Id: I7d67f2d64680e79fc14bf5927be79986b333b9f9
Kristian Monsen [Wed, 11 Aug 2010 09:22:40 +0000 (10:22 +0100)]
Send didFail to webcore for failed requests.
Also removed the member variable m_resourceRequest as it is not needed outside the function.
Change-Id: I5a627306de8a8d8c59044046003e8515fd10f5c8
Kristian Monsen [Mon, 9 Aug 2010 15:46:55 +0000 (16:46 +0100)]
Use libchromium_net as a static library. This saves a lot of space.
Change-Id: Ieb538733c55e685e89df00e79233ac15d13d2825
Steve Block [Wed, 4 Aug 2010 09:16:26 +0000 (10:16 +0100)]
Hook up DeviceOrientationClientMock
Change-Id: Ie21024238a88252cd668cbddb98643b142728cf1
Kristian Monsen [Fri, 6 Aug 2010 10:56:06 +0000 (11:56 +0100)]
Moving all Webcore code out of classes that are run on other threads.
This is part two, the first part was done here:
https://android-git.corp.google.com/g/#change,58927
After this WebCore is not touched from other threads. This fixes some random crashes that were happening. Network handling looks quite stable now.
Change-Id: I47aece04207f4627964de83ef371ff789afd7668
Steve Block [Thu, 5 Aug 2010 10:50:35 +0000 (11:50 +0100)]
Merge WebKit at r64523 : Update WEBKIT_MERGE_REVISION
Change-Id: I5c0d4a3aa95ddb99589d6979e7ac5731f476db6f
Steve Block [Mon, 9 Aug 2010 14:46:16 +0000 (15:46 +0100)]
Merge WebKit at r64523 : Cherry-pick WebKit change 64527 to add VisitedLinkStrategy.h
This is required to build on Mac.
See http://trac.webkit.org/changeset/64527
Change-Id: Id60a76a57cf354e0bb84d41eeef4c14257bfaedc
Steve Block [Thu, 5 Aug 2010 11:39:42 +0000 (12:39 +0100)]
Merge WebKit at r64523 : Add new LayoutTest fast/dom/DeviceOrientation/basic-operation.html to skipped list
Also updates this list to reflect the hard-coded skipped list for the existing DumpRenderTree
Change-Id: I377db6c1826ff745a3943bd8ea129a14e506f18e
Steve Block [Thu, 5 Aug 2010 10:08:51 +0000 (11:08 +0100)]
Merge WebKit at r64523 : Cherry-pick WebKit change 64732 for FILTERS guard
See http://trac.webkit.org/changeset/64732
Change-Id: I5fe2041764991c6c621bb634df1ed4bcb896f7eb
Steve Block [Wed, 4 Aug 2010 17:53:30 +0000 (18:53 +0100)]
Merge WebKit at r64523 : Stub out ChromeClient::reachedApplicationCacheOriginQuota() for Android
See http://trac.webkit.org/changeset/64400
Change-Id: Ia72d447c94bcfd918876e4549a296dc88ab3abfa
Steve Block [Wed, 4 Aug 2010 17:47:17 +0000 (18:47 +0100)]
Merge WebKit at r64523 : Provide PopupMenuAndroid and related ChromeClient methods
See http://trac.webkit.org/changeset/64513
Change-Id: I9f55ae27989f7a246c0c1e5f771677c66a9b1556
Steve Block [Thu, 5 Aug 2010 10:14:20 +0000 (11:14 +0100)]
Merge WebKit at r64523 : Implement FontCustomPlatformData::supportsFormat() for Android
See http://trac.webkit.org/changeset/64434
Change-Id: Icbf0fed42fbef71340c697537fb0ff4815b574fd
Steve Block [Wed, 4 Aug 2010 17:16:18 +0000 (18:16 +0100)]
Merge WebKit at r64523 : Fix other conflicts
- WebCore/Android.mk
Conflict due to error introduced upstream.
See http://trac.webkit.org/changeset/64344/trunk/WebCore/Android.mk
and http://trac.webkit.org/changeset/60228/trunk/WebCore/Android.mk
- WebCore/html/HTMLFrameSetElement.cpp
Conflict due to ANDROID_FLATTEN_FRAMESET
See http://trac.webkit.org/changeset/64383
- WebCore/page/Navigator.h
Conflict due to APPLICATION_INSTALLED
See http://trac.webkit.org/changeset/64371
- WebCore/rendering/SVGResourcesCycleSolver.cpp
Conflict due to local ENABLE(FILTERS) guard
See http://trac.webkit.org/changeset/64440
Change-Id: Ibafe3b92117c3a7b3eaaa44c6cf3d04c8c6027c2
Steve Block [Thu, 5 Aug 2010 10:07:27 +0000 (11:07 +0100)]
Merge WebKit at r64523 : Fix conflicts due to ANDROID_HITTEST_WITHSIZE
A modified version of this Android-specific code was upstreamed in
http://trac.webkit.org/changeset/64272
For the most part, the differences between the Android and upstreamed
versions are syntactic only. In these cases, we take the upstream
version.
In a small number of cases, logical changes exist. In these cases, the
Android logic has been retained, guarded with ANDROID_HITTEST_WITHSIZE,
but using the new syntax.
In particular ...
- Android's HitTestResult::intersects(x, y, rect) is logically equivalent
to the uspstream IntRect::intersects(HitTestPoint::rectFromPoint(x, y))).
- Android's HitTestResult::addRawNode() is logically equivalent to the
upstream HitTestResult::m_rectBasedTestResult.add().
- Android's HitTestResult::isRegionTest() is slightly different from the
upstream HitTestResult::isRectBasedTest(). The latter is modified with
a new ANDROID_HITTEST_WITHSIZE guard in HitTestResult::HitTestResult()
to maintain the same behaviour.
- The upstreamed code uses
HitTestResult::addNodeToRectBasedTestResult() as a helper method in
place of inline logic in the Android version. The slight difference
in behaviour between this helper and the Android logic is reflected in
the new ANDROID_HITTEST_WITHSIZE guard in the helper.
This change should introduce no change in behaviour.
Change-Id: I974d68e3ac963f18334418e32b08c3fd9ab1182e
Steve Block [Wed, 4 Aug 2010 10:41:34 +0000 (11:41 +0100)]
Merge WebKit at r64523 : Initial merge by git.
Change-Id: Ibb796c6802e757b1d9b40f58205cfbe4da95fcd4
Steve Block [Sat, 7 Aug 2010 02:07:31 +0000 (19:07 -0700)]
am
7c8c1ab3: am
e9ee2d86: am
a4279478: Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
Merge commit '
7c8c1ab35fc21fce4eaa3455d70b040a845b7eb6'
* commit '
7c8c1ab35fc21fce4eaa3455d70b040a845b7eb6':
Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
Steve Block [Sat, 7 Aug 2010 02:07:28 +0000 (19:07 -0700)]
am
373399bd: am
7162fe0e: am
2b6ea029: Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
Merge commit '
373399bd97b28edc9ee0b6fafdce24cd3becc42c'
* commit '
373399bd97b28edc9ee0b6fafdce24cd3becc42c':
Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
Steve Block [Sat, 7 Aug 2010 01:59:56 +0000 (18:59 -0700)]
am
e9ee2d86: am
a4279478: Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
Merge commit '
e9ee2d864ded6c57c02ebc2ff6e41a0711d099d3' into gingerbread-plus-aosp
* commit '
e9ee2d864ded6c57c02ebc2ff6e41a0711d099d3':
Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
Steve Block [Sat, 7 Aug 2010 01:59:53 +0000 (18:59 -0700)]
am
7162fe0e: am
2b6ea029: Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
Merge commit '
7162fe0e3c5886b6c35f42c5cd9d9e83aa3785cf' into gingerbread-plus-aosp
* commit '
7162fe0e3c5886b6c35f42c5cd9d9e83aa3785cf':
Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
Steve Block [Sat, 7 Aug 2010 01:55:12 +0000 (18:55 -0700)]
am
a4279478: Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
Merge commit '
a42794783dfec7f142845611dc0f20bfe2657c49' into gingerbread
* commit '
a42794783dfec7f142845611dc0f20bfe2657c49':
Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
Steve Block [Sat, 7 Aug 2010 01:55:10 +0000 (18:55 -0700)]
am
2b6ea029: Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
Merge commit '
2b6ea0299b0340ff815b7beab6e7491ff5e4d6c0' into gingerbread
* commit '
2b6ea0299b0340ff815b7beab6e7491ff5e4d6c0':
Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
Kristian Monsen [Fri, 6 Aug 2010 11:53:09 +0000 (04:53 -0700)]
Merge "Moving all webcore handling to the webcore thread."
Elliott Slaughter [Thu, 5 Aug 2010 23:20:15 +0000 (16:20 -0700)]
Merge "Initial work on browser incognito mode history feature."
Brian Carlstrom [Thu, 5 Aug 2010 21:19:58 +0000 (14:19 -0700)]
resolved conflicts for merge of
da53ac10 to master
Change-Id: I39ea3d77358e89ee6e5202d08ad18329a17c6989
Brian Carlstrom [Thu, 5 Aug 2010 17:41:06 +0000 (10:41 -0700)]
am
71b088a0: Tracking merge of dalvik-dev to gingerbread
Merge commit '
71b088a040027130a502f60e6f953c08a194b11e' into gingerbread-plus-aosp
* commit '
71b088a040027130a502f60e6f953c08a194b11e':
Tracking merge of dalvik-dev to gingerbread
Kristian Monsen [Tue, 27 Jul 2010 14:10:41 +0000 (15:10 +0100)]
Moving all webcore handling to the webcore thread.
This is part 1 of 2. This CL moves all response actions to the correct thread. A later CL will move all request actions.
Parts of CL https://android-git.corp.google.com/g/#change,58486 are here since I don't want to loose that functionality.
This will be rewritten as the next part of this CL, and is in WebRequest.cpp function WebRequest::start().
Change-Id: I476dc40ae722ecd83d56c482dbe7df726b3844b0
Kristian Monsen [Thu, 5 Aug 2010 12:54:31 +0000 (05:54 -0700)]
Merge "More fixes after the merge, setting a proxy service."
Steve Block [Thu, 5 Aug 2010 11:41:49 +0000 (04:41 -0700)]
Merge "Fix incorrect cherry-pick of WebKit change 64465 in merge to WebKit r64264"
Steve Block [Thu, 5 Aug 2010 11:34:24 +0000 (04:34 -0700)]
Merge "Implement DeviceOrientationClientAndroid"
Steve Block [Wed, 4 Aug 2010 23:04:49 +0000 (00:04 +0100)]
Fix incorrect cherry-pick of WebKit change 64465 in merge to WebKit r64264
See https://android-git.corp.google.com/g/#change,59749
Change-Id: I0ea44ef95fcd8035adc27a32fb75e7c19f23c975
Steve Block [Mon, 2 Aug 2010 09:30:48 +0000 (10:30 +0100)]
Implement DeviceOrientationClientAndroid
This class acts simply as a proxy to the real or mock client, which is owned by
the WebView. DEVICE_ORIENTATION is eabled on Android, so we must implement the
client before we pull in http://trac.webkit.org/changeset/64356, which calls
DeviceOrientationClient::setController() from the Page constructor.
Change-Id: Ie21957249e5bef7a58c51205732f4fb1b82fbbd3
Kristian Monsen [Thu, 5 Aug 2010 11:25:36 +0000 (12:25 +0100)]
More fixes after the merge, setting a proxy service.
Setting the proxy to 0 was not too smart as it crashes when used. The ProxyService::CreateNull is for a usercase like ours where we basicly don't want a proxy.
Also changed the includes in this file to be correct for files from other libraries.
Change-Id: I7b8ccadf01cdeb10cc141e07bea7dbb57bb80073
Steve Block [Thu, 5 Aug 2010 11:12:56 +0000 (12:12 +0100)]
Cherry-pick WebKit change 61921 to fix exploitable memory corruption in RenderBoxModelObject
Bug:
2895569
Change-Id: Iea09dc4fdc35e68ccad36deed2132f02e3778e34
Steve Block [Thu, 5 Aug 2010 11:10:12 +0000 (12:10 +0100)]
Cherry-pick WebKit change 60984 to fix an exploitable crash when focus is changed
Bug:
2895569
Change-Id: I76f48ca7d6ddee996127254c5f1f00e355318527
Brian Carlstrom [Thu, 5 Aug 2010 06:24:52 +0000 (23:24 -0700)]
Tracking merge of dalvik-dev to gingerbread
git cherry-pick --no-commit
a2350cae81d07b024de06d0508f8cbd317dad3b7
Change-Id: I52ae486a58ed5bdc79390525179092a5a930c0e7
Elliott Slaughter [Thu, 15 Jul 2010 18:41:04 +0000 (11:41 -0700)]
Initial work on browser incognito mode history feature.
Change-Id: I08ccbef18a53660fd9c22e1e2160be7de1733db1
Kristian Monsen [Wed, 4 Aug 2010 15:39:03 +0000 (08:39 -0700)]
Merge "Compile fix after chromium merge"
Kristian Monsen [Wed, 4 Aug 2010 13:36:38 +0000 (14:36 +0100)]
Compile fix after chromium merge
Change-Id: Ie984365f5bc35305ec1c2899be25a791ad354ef1
Ben Murdoch [Wed, 4 Aug 2010 09:24:38 +0000 (10:24 +0100)]
Fix for issue
2857086 - page cycler hanging.
Cherry pick of webkit.org r64638.
Change-Id: I50ea47544af219cc04717a060d4b70f478a40877
Kristian Monsen [Wed, 4 Aug 2010 12:28:09 +0000 (05:28 -0700)]
Merge "Removing the list of active loaders"
Kristian Monsen [Tue, 3 Aug 2010 12:27:10 +0000 (13:27 +0100)]
Merge WebKit at r64264 : Update WEBKIT_MERGE_REVISION to the new webkit version
Change-Id: I03f3535b7764f420c4bd89981d9cdbe9ac0d0a8b
Kristian Monsen [Wed, 4 Aug 2010 11:47:50 +0000 (12:47 +0100)]
Merge WebKit at r64264 : LayoutTest expected result
The expected result for fast/dom/DeviceOrientation/window-property-expected is now the jsc output. Removing the old file from the android expected output.
Webkit CL that changed the expected from v8 to jsc:
http://trac.webkit.org/changeset/64125/trunk/LayoutTests/fast/dom/DeviceOrientation/window-property-expected.txt
Change-Id: Idc040906b80dd90c26b115f8c97d6d2e3b35a1b7
Kristian Monsen [Tue, 3 Aug 2010 10:56:57 +0000 (11:56 +0100)]
Merge WebKit at r64264 : Compile fix: A method got an extra parameter in GraphicsContext.h
Change introduced here: http://trac.webkit.org/changeset/63864/trunk/WebCore/platform/graphics/GraphicsContext.h
Change-Id: I471797fff394396ec375db10c3bcb4e9c00feb3e
Kristian Monsen [Tue, 3 Aug 2010 10:43:11 +0000 (11:43 +0100)]
Merge WebKit at r64264 : Compile fix: Filter guards in SVG
Introduced here: http://trac.webkit.org/changeset/64196/trunk/WebCore/rendering/SVGResourcesCycleSolver.cpp
Partially upstreamed as the file has changed upstream after the merge, and the newer version doesn't have both places where guards were needed.
Upstream bug: https://bugs.webkit.org/show_bug.cgi?id=43338
Upstream CL: http://trac.webkit.org/changeset/64465/trunk/WebCore/rendering/SVGResourcesCycleSolver.cpp
Upstream change after merge where we have guards: http://trac.webkit.org/changeset/64440/trunk/WebCore/rendering/SVGResourcesCycleSolver.cpp
Change-Id: Iaab4595ded78485c81d6f61a726a5bd0f48c5621
Kristian Monsen [Tue, 3 Aug 2010 10:40:17 +0000 (11:40 +0100)]
Merge WebKit at r64264 : Compile fix: Inspector guards in V8
Introduced here: http://trac.webkit.org/changeset/63891/trunk/WebCore/bindings/v8/ScriptValue.cpp
The JSC version is guarded.
This change has been upstreamed, and this is the bug:
https://bugs.webkit.org/show_bug.cgi?id=43345
And the webkit CL:
http://trac.webkit.org/changeset/64464/trunk/WebCore/bindings/v8/ScriptValue.cpp
Change-Id: Ic1e5b7a7352a9f290210776f2f1ce220952c6725
Kristian Monsen [Mon, 2 Aug 2010 10:42:56 +0000 (11:42 +0100)]
Merge WebKit at r64264 : Compile fix: CellStruct changed.
http://trac.webkit.org/changeset/63994/trunk/WebCore/rendering/RenderTableSection.h
Change-Id: I52787b9723791822d9c95ef52d7a81c23c2aeca7
Kristian Monsen [Mon, 2 Aug 2010 10:10:24 +0000 (11:10 +0100)]
Merge WebKit at r64264 : Compile fix, how to create WebCore::Page changed
http://trac.webkit.org/changeset/64208
Change-Id: If0c6a616bd9eb1f1c90041f9c83d1770d8acd9bd
Kristian Monsen [Mon, 2 Aug 2010 10:07:38 +0000 (11:07 +0100)]
Merge WebKit at r64264 : Compile fix: registerURLSchemeAsLocal moved
SecurityOrigin::registerURLSchemeAsLocal got moved to a new class.
http://trac.webkit.org/changeset/63863
Change-Id: If1baa94d90506a9de321ad3303545e133ee446e9
Kristian Monsen [Fri, 30 Jul 2010 14:23:17 +0000 (15:23 +0100)]
Merge Webkit at r64264 : Fix Makefiles.
Change-Id: Ie4783363cff9eb7f70d6bbfec1a6237b5f5a72b5
Kristian Monsen [Fri, 30 Jul 2010 14:20:36 +0000 (15:20 +0100)]
Merge Webkit at r64264 : Fix conflicts.
Tracs of the changes:
WebCore/html/HTMLDocumentParser.cpp
http://trac.webkit.org/changeset/63998/trunk/WebCore/html/HTMLDocumentParser.cpp
WebCore/page/EventHandler.cpp
WebCore/page/EventHandler.h
http://trac.webkit.org/changeset/63888
WebCore/page/Page.cpp
http://trac.webkit.org/changeset/64208
WebCore/page/Settings.cpp
WebCore/page/Settings.h
http://trac.webkit.org/changeset/64110
WebCore/rendering/RenderLayerCompositor.h
http://trac.webkit.org/changeset/64054/trunk/WebCore/rendering/RenderLayerCompositor.h
WebCore/rendering/RenderTableSection.cpp
http://trac.webkit.org/changeset/63994/trunk/WebCore/rendering/RenderTableSection.cpp
WebCore/rendering/break_lines.cpp
http://trac.webkit.org/changeset/64207
Change-Id: I34167b43899ee5066e33b40867cd569ce53f9207
Kristian Monsen [Fri, 30 Jul 2010 09:46:49 +0000 (10:46 +0100)]
Merge WebKit at r64264 : Initial merge by git.
Change-Id: Ic42bef02efef8217a0f84c47176a9c617c28d1f1
Kristian Monsen [Tue, 27 Jul 2010 15:54:46 +0000 (16:54 +0100)]
Removing the list of active loaders
A loader will not be deleted before the WebRequest has called didFinishLoading() now, so there is no longer a need for this.
There was also a problem with that list. If a loader got deleted and a new one created with the same pointer value the deleted one could be mistaken for the new one.
Change-Id: I856519e751f6f1d15cfbd426a2cd2ba71315850b
Patrick Scott [Mon, 2 Aug 2010 12:09:31 +0000 (08:09 -0400)]
Enable navigation in scrollable layers.
EventHandler:
* Added IgnoreClipping in order to touch nodes that are clipped
out.
android_graphics:
* Remember the absolute bounds of the node for invals.
RenderBox:
* Fix a compiler warning.
RenderLayer:
* Do not record the entire layer contents unless the scroll
dimensions are larger than the client dimensions.
* Change isSelfPaintingLayer to check for an overflow clip
instead of the scrollable dimensions since it can be too
early to check at this point.
RenderLayerCompositor:
* Same as RenderLayer for checking the overflow clip.
WebViewCore:
* Scroll the containing layer to the node bounds and offset the
mouse position if scrolled. Once the mouse event is processed,
restore the layer to 0,0.
CacheBuilder:
* The body position is no longer used.
* Do not clip out nodes if the layer is scrollable.
CachedFrame:
* Add unadjustBounds to restore adjusted bounds to their original
position (fixed position elements).
* Call unadjustBounds when a node has been found. This new set of
bounds is passed over to WebViewCore to handle clicks.
* Reject empty node bounds.
CachedLayer:
* Document adjustBounds and add unadjustBounds. Add in the scroll
position to the node bounds.
CachedRoot:
* Unadjust the mouse bounds.
WebView:
* Unadjust the mouse bounds and use the absolute bounds of the ring
during inval.
Bug:
1566791
Change-Id: Ia55f2cbb61869087176d3ff61882e40324614c6a
Maksymilian Osowski [Mon, 2 Aug 2010 15:23:24 +0000 (08:23 -0700)]
Merge "Added test_expectations.txt file to platform/android/"
Maksymilian Osowski [Mon, 2 Aug 2010 10:28:02 +0000 (11:28 +0100)]
Added test_expectations.txt file to platform/android/
The original data in this file comes from FileFilter class in the old Dump Render Tree and was extracted from there on 30/07/2010
Change-Id: Ibc1101d08123ffaff51b765e5333d1b96c5ab02f
Cary Clark [Fri, 30 Jul 2010 20:01:44 +0000 (16:01 -0400)]
Revert "Add CSS cursor ring definitions"
This reverts commit
0ed6485271097ecf1b4cf4e790f9cfdbb57d921c.
Cary Clark [Wed, 28 Jul 2010 21:11:14 +0000 (17:11 -0400)]
Add CSS cursor ring definitions
This allows web pages to have fine-grain control over the appearance
of the rings drawn around nodes.
Generated links (email, addresses, phone numbers) are no longer
given unique colors. To preserve this feature, a separate change
could add an HTML extension similar to vlink to provide the cursor
ring defintions for theses links. The mechanism implemented below
isn't appropriate since these links don't necessarily correspond to
single DOM nodes or other DOM elements.
------------
CSS examples
------------
The CSS to specify the ring looks like:
-webkit-ring-fill-color:rgba(0,0,255,0.4);
-webkit-ring-inner-width:2 px;
-webkit-ring-outer-width:3.5 px;
-webkit-ring-outset: 8 px;
-webkit-ring-pressed-inner-color:rgba(0,0,255,0.8);
-webkit-ring-pressed-outer-color:rgba(0,0,127,0.3);
-webkit-ring-radius: 10 px;
-webkit-ring-selected-inner-color:rgba(63,63,255,0.8);
-webkit-ring-selected-outer-color:rgba(63,63,127,0.3);
and may be alternately defined with a property shortcut:
-webkit-ring:rgba(255,0,0,0.4) 5px 7px
rgba(255,0,0,0.8) rgba(127,0,0,0.3) 20px
rgba(255,63,63,0.8) rgba(127,63,63,0.3);
--------------------
Property definitions
--------------------
A vertical cross-section of the ring corresponds to these
parameters as shown:
______
R / ___O_ R = corner radius
/ / __I_ o I = inner ring
/ / / _O_ ^ O = outer ring
| | | / F | F = fill
|O|I|O| L o = outset
| | | \_F_ | L = original link
\ \ \__O_ V
\ \___I_ o
R \____O_
The fill color specifies what to draw inside the ring
when the link is followed. The fill area consists of the
original link area the outset.
The inner and outer widths specify the stoke width of the inner
and outer rings, respectively. The widths may be specified in
fractional pixels. The implementation captures 4 bits of the
fraction.
The outset specifies the distance from the edge of the original
link to the rings' center. Both rings are drawn at the same center
location.
The radius specifies the curvature of the corners at the center
of the rings.
-------------
Data lifetime
-------------
The selected colors specify the colors of the inner and outer
rings when the trackball or D-pad hovers over the link. The
pressed colors specify the colors of the rings when the
trackball center is pressed or the link is tapped.
The CSS data is recorded in the RenderStyle when the DOM
is parsed. The widths are scaled up by 16 to preserve the fraction.
When the nav cache is built, the CSS style information is
recorded in the CachedColor class. Only unique style sets
are recorded; many CachedNode instances can share the same
CachedColor instance.
When the cursor ring is drawn, the CachedColor is
retrieved by getting the index from the CachedNode, and
looking up the entry in the CachedFrame. The widths are
scaled down by 16 since Lengths are stored by the webkit as
integers.
----------
File Edits
----------
WebCore/Android.derived.mk
- Build the CSS data property tables by concatentating
Android specific data and optionally SVG data.
WebCore/config.h
- Add switch for these rings. This switch is meant
as a convenience for finding the code in WebKit
that was added to enable this feature. Since the
old code in DrawCursor has been removed, it does
not revert to the old behavior if the switch is
turned off.
WebCore/css/AndroidCSSPropertyNames.in
- The new ring properties, plus an old one we
added before.
WebCore/css/CSSComputedStyleDeclaration.cpp
WebCore/css/CSSMutableStyleDeclaration.cpp
WebCore/css/CSSParser.cpp
WebCore/css/CSSStyleSelector.cpp
- I can guess what these functions are for as
well as anyone, but I really don't know. Do
I need all of them? Do I need to modify
Mutable at all?
WebCore/css/CSSPropertyNames.in
- Moved Android addition to AndroidCSSPropertyNames.in
WebCore/platform/graphics/Color.h
- Added initial color values here.
WebCore/platform/graphics/android/android_graphics.*
- This draws the cursor ring. The code that draws
'synthetic' links has been discarded.
WebCore/rendering/style/RenderStyle.h
- Functions to get, set, and initialize the style
data.
WebCore/rendering/style/StyleRareInheritedData.*
- The storage for the style data and an equivalence
function.
WebKit/Android.mk
- Added CachedColor to the build.
WebKit/android/nav/CacheBuilder.cpp
- Record the color from the DOM into the cache.
WebKit/android/nav/CachedColor.*
- Store the cached color info.
WebKit/android/nav/CachedFrame.*
- Where the array of colors is stored.
WebKit/android/nav/CachedNode.*
- Where the index to the colors is stored.
Change-Id: Ia3a931f41d6545e47678e245aafe7c84d4658f94
http://b/
2603197
Shimeng (Simon) Wang [Fri, 30 Jul 2010 00:21:31 +0000 (17:21 -0700)]
Merge "Add back nativeClearContent since it's used in Java side."
Shimeng (Simon) Wang [Thu, 29 Jul 2010 23:32:54 +0000 (16:32 -0700)]
Add back nativeClearContent since it's used in Java side.
issue:
2841402
Change-Id: Ia147b39f84be91a92dd4f491e8d3de263df4244b
Shimeng (Simon) Wang [Wed, 28 Jul 2010 17:41:47 +0000 (10:41 -0700)]
Merge "Put the webkit version into android code base."
claireho [Tue, 27 Jul 2010 22:30:29 +0000 (15:30 -0700)]
Merge "Bug
2811402:Fixed parenthesis are not mirrored correctly in bidi layout."