OSDN Git Service
Steve Block [Thu, 19 May 2011 14:53:15 +0000 (15:53 +0100)]
Merge WebKit at r78450: FrameLoader::url() removed
See http://trac.webkit.org/changeset/76872
Change-Id: I54790419f4e3b7dcd1e6123d6ff4bda8d7997066
Steve Block [Thu, 19 May 2011 14:42:53 +0000 (15:42 +0100)]
Merge WebKit at r78450: HTMLParserQuirks removed
See http://trac.webkit.org/changeset/77963
Change-Id: I6bfe5d2412d99d2a187cc83f565a8eba6fe01267
Steve Block [Thu, 19 May 2011 13:17:46 +0000 (14:17 +0100)]
Merge WebKit at r78450: TextRun::padding() renamed
See http://trac.webkit.org/changeset/76743
Change-Id: Ia9f39b83ea6e9a97e271f5545c3cc36ed5c65800
Steve Block [Thu, 19 May 2011 12:21:16 +0000 (13:21 +0100)]
Merge WebKit at r78450: Use new FontMetrics
See http://trac.webkit.org/changeset/76442
Note that this change also switches from integer to floating point precision for font metrics.
This is a TODO on other platforms.
Change-Id: I5bcecd5abbe1be8e138aaf25102487b73c936b77
Steve Block [Thu, 19 May 2011 11:30:26 +0000 (12:30 +0100)]
Merge WebKit at r78450: GraphicsContext current path removed
See http://trac.webkit.org/changeset/76688
Change-Id: I1de96683ffe1805f710ac8161579d3a399065f4d
Steve Block [Thu, 19 May 2011 10:11:13 +0000 (11:11 +0100)]
Merge WebKit at r78450: TransformationMatrix multiply methods renamed and meaning changed
See http://trac.webkit.org/changeset/76537
Change-Id: I543c68101d4ee83d190f643e54e4f3fec1fdf238
Steve Block [Wed, 18 May 2011 18:06:54 +0000 (19:06 +0100)]
Merge WebKit at r78450: FontCustomPlatformData::fontPlatformData() signature changed
See http://trac.webkit.org/changeset/77153
Change-Id: I8a5b0878803b88ff0ebac3539a6d62f94cc10f89
Steve Block [Wed, 18 May 2011 17:46:52 +0000 (18:46 +0100)]
Merge WebKit at r78450: IntRect::bottom()/right() renamed
See http://trac.webkit.org/changeset/77286 and
http://trac.webkit.org/changeset/77398
Change-Id: I0ae670bff327fb981e037f5394c55bfb4aeb81eb
Steve Block [Wed, 18 May 2011 13:41:47 +0000 (14:41 +0100)]
Merge WebKit at r78450: Fix remaining conflicts
- Document.cpp
Conflict due to AX object cache disabled on Android
See http://trac.webkit.org/changeset/78314
- CachedResourceLoader.cpp/h
Conflict due to ANDROID_BLOCK_NETWORK_IMAGE
See http://trac.webkit.org/changeset/76701
- Source/WebCore/page/ChromeClient.h
Conflict due to ANDROID_INSTALLABLE_WEB_APPS
See http://trac.webkit.org/changeset/77509
- FrameView.cpp
Conflict due to Android FrameView::updatePositionedObjects()
See http://trac.webkit.org/changeset/77274
- ScrollView.h
Conflict due to Android
ScrollView::actualWidth/Height/ScrollX/ScrollY()
See http://trac.webkit.org/changeset/76831
- TemporaryLinkStubs.cpp and MIMETypeRegistry.cpp
conflict due to Android stubbed out
MIMETypeRegistry::getMIMETypeForExtension()
See http://trac.webkit.org/changeset/77368 and
https://android-git.corp.google.com/g/#change,37272
- ImageDecoder.cpp
Conflict due to Android excluding code
See http://trac.webkit.org/changeset/77427
- ImageDecoder.h
Conflict due to ANDROID guard upstreamed as SKIA guard
See http://trac.webkit.org/changeset/77946
- InlineTextBox.cpp
Conflict due to ANDROID_DISABLE_ROUNDING_HACKS
See http://trac.webkit.org/changeset/76743 and
http://trac.webkit.org/changeset/77286
- RenderBlockLineLayout.cpp
Conflict due to ANDROID_LAYOUT
See http://trac.webkit.org/changeset/77062
Change-Id: Ide4d58dc52418b8fc1a965a9524eb57cd46b4859
Steve Block [Wed, 18 May 2011 13:44:04 +0000 (14:44 +0100)]
Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guard
This replaces, and therefore conflicts with, Android's existing
ENABLE_ARCHIVE guard. This change resolves the conflicts by taking the
upstream guard in WebCore, updates WebKit to use the new guard, and
enables this guard on Android.
See http://trac.webkit.org/changeset/78439
See also http://trac.webkit.org/changeset/78342 for FrameLoader.cpp
Change-Id: I28ebaf3d69ea4c352ab4cfbf91c33a8ba25f89b5
Steve Block [Wed, 18 May 2011 15:43:59 +0000 (16:43 +0100)]
Merge WebKit at r78450: Fix conflicts in media controls
Conflict due to Android modifications to handle touch events.
See http://trac.webkit.org/changeset/76950
Change-Id: I499d66319614af4bc23f1c0f89f072b814503703
Steve Block [Wed, 18 May 2011 13:31:09 +0000 (14:31 +0100)]
Merge WebKit at r78450: Fix Makefiles
PCRE switched for YARR - http://trac.webkit.org/changeset/78042
Change-Id: Ie5090e0d7a174e3c2975b807d0b4769b15494156
Steve Block [Wed, 18 May 2011 12:36:51 +0000 (13:36 +0100)]
Merge WebKit at r78450: Initial merge by git.
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
Steve Block [Tue, 24 May 2011 14:30:29 +0000 (15:30 +0100)]
Check that the view is not null in GraphicsLayerAndroid::updateFixedPosition()
Bug:
4461705
Change-Id: I0facda892e16e1b626964b032cf337c29f0d3364
Ben Murdoch [Tue, 17 May 2011 16:51:44 +0000 (17:51 +0100)]
Merge WebKit at r76408: Update ThirdPartyProject.prop
Update merge revisions.
Change-Id: I1ffb3ef0f49409fd2a815c1eb06de57889a83820
Ben Murdoch [Fri, 20 May 2011 15:48:45 +0000 (16:48 +0100)]
Merge WebKit at r76408: Fix Bridge.h
Cherry pick of upstream http://trac.webkit.org/changeset/79988
Needed now due to FastAllocBase and Noncopyable changes in this
merge.
Change-Id: I26c91f7940b106db21e26c37507490acd1546cff
Ben Murdoch [Tue, 17 May 2011 13:14:01 +0000 (14:14 +0100)]
Merge WebKit at r76408: Fix calls to RenderLayer::scrollToOffset()
As of http://trac.webkit.org/changeset/76291 RenderLayer::scrollToOffset
only takes two parameters (the x and y offset). Update our callsites to
reflect this. It seems safe to disregard the booleans.
Change-Id: I63bc103e4fc961968055770792aead82be82435a
Ben Murdoch [Tue, 17 May 2011 13:04:11 +0000 (14:04 +0100)]
Merge WebKit at r76408: Fix EventHandlerAndroid.cpp
See http://trac.webkit.org/changeset/76248 which introduced
an include of Clipboard.h, causing the real definition of
WebCore::Clipboard to be included in EventHandlerAndroid.cpp. Remove
the stub that was there.
Change-Id: I5bc04bf573aa1da19cbdd282d3611f571e46c6fa
Ben Murdoch [Tue, 17 May 2011 13:09:28 +0000 (14:09 +0100)]
Merge WebKit at r76408: Fix FontAndroid.cpp
TextRun.h was removed as an include from Font.h. This
is where FontAndroid was picking it up from. Add it into
FontAndroid.cpp.
See http://trac.webkit.org/changeset/76170
Change-Id: I2d1306fde1742a2e75cb7b47c2a0ad132939258c
Ben Murdoch [Tue, 17 May 2011 13:49:09 +0000 (14:49 +0100)]
Merge WebKit at r76408: Rename syncCompositingStateRecursive()
FrameView::syncCompositingStateRecursive() was rename
to FrameVuew::syncCompositingStateIncludingSubframes()
See http://trac.webkit.org/changeset/76196
Change-Id: I615cc9cccee03ac5259079aea47494746b586b25
Ben Murdoch [Mon, 16 May 2011 17:01:30 +0000 (18:01 +0100)]
Merge WebKit at r76408: Update Uses of Noncopyable/FastAllocBase
Upstream now uses macros rather than inheritance for classes
declard Noncopyable or Fast Allocated.
Note that in the case of PluginTimer and ClipboardAndroid we
now need to explicitly declare them fast allocated. This is
because previously they got the fast allocated methods through
a common superclass (FastAllocBase) but now both parents provide
implementations, so there is an ambiguity the compiler cannot
resolve.
See http://trac.webkit.org/changeset/76248
Change-Id: I186e3fd36bde2074d34f453983d48e8fc223f420
Ben Murdoch [Fri, 20 May 2011 15:53:45 +0000 (16:53 +0100)]
Merge WebKit at r76408: Fix ImageBufferAndroid.
Implement missing dataSize function introduced in
http://trac.webkit.org/changeset/76371 (JSC only)
Change-Id: Ie9a714cdb41894ceb2d928b6e42ed6a41d8d04a7
Ben Murdoch [Mon, 16 May 2011 15:35:58 +0000 (16:35 +0100)]
Merge WebKit at r76408: Fix conflicts.
Android.jscbindings.mk
Conflict due to local addition of EntrySyncCustom.cpp and http://trac.webkit.org/changeset/76216
V8NPUtils.cpp
Conflict due to local cherry pick of http://trac.webkit.org/changeset/78994 and
merge of http://trac.webkit.org/changeset/76264
FrameView.h
Conflict due to local addition of updatePositionedObjects() and http://trac.webkit.org/changeset/76278
RangeInputType.cpp
SliderThumbElement.cpp
Conflicts due to Android addition of touch handling code in slider code.
See http://trac.webkit.org/changeset/76147
.gitignore - keep ours
Change-Id: I38aeb361a37e7939f805c6689d7cc8fc720b3e52
Ben Murdoch [Tue, 17 May 2011 13:00:19 +0000 (14:00 +0100)]
Merge WebKit at r76408: Fix Makefiles.
Change-Id: I4d8928d488fb00050058569cf21e7d48e5d5c247
Ben Murdoch [Mon, 16 May 2011 15:25:10 +0000 (16:25 +0100)]
Merge WebKit at r76408: Initial merge by git.
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
Teng-Hui Zhu [Fri, 20 May 2011 22:03:54 +0000 (15:03 -0700)]
Fix position update
We fixed two issues here.
First, when fixed left/right both undefined, the renderlayer position already
took the fix margin into consideration, so we don't need to compute that again.
Second, for compute the fix element's ViewRect, we just need the normal width,
not the overflow one.
bug:
4440999
Change-Id: I664c64688a89579f0023288185772c61b01c7cc8
The Android Open Source Project [Fri, 20 May 2011 20:24:40 +0000 (13:24 -0700)]
Reconcile with honeycomb-release honeycomb-mr1-release
Change-Id: Ib6fbd07827ffba629ed5a560c58e5d005f4d4c75
Steve Block [Fri, 20 May 2011 16:10:52 +0000 (09:10 -0700)]
Merge changes Ib103214e,Ibc8ca754,I6adc6f64,I4c5fde48,I81552b1b
* changes:
Do not process Inspector.idl using the V8 or JSC code generator
Remove some superfluous ARCHIVE enable guards
Fix WebArchiveAndroid logging
Fix some compiler warnings
Use adoptPtr() and adoptArrayPtr() when setting OwnPtr and OwnArrayPtr
Kristian Monsen [Fri, 13 May 2011 15:51:49 +0000 (16:51 +0100)]
Merge Chromium at 10.0.621.0: Compile fixes
URLRequest moved to the net namespace:
http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request.h?view=diff&r1=67496&r2=67497
Later a typedef was removed here:
http://src.chromium.org/viewvc/chrome/trunk/src/net/url_request/url_request.h?r1=67674&r2=67762
Created a scoped ref ptr of net::X509Certificate before using
it in a RunnableMethod as that is now required.
http://src.chromium.org/viewvc/chrome/trunk/src/base/task.h?r1=67342&r2=69237
This was updated several times later.
Change-Id: I162c95f7fcbff7d374f8e9d8d6d253ddfd11ddc1
Kristian Monsen [Fri, 13 May 2011 15:50:35 +0000 (16:50 +0100)]
Merge Chromium at 10.0.621.0: New argument in the Cache CTOR
Create a default one as it will crash if set to NULL.
Introduced here:
http://src.chromium.org/viewvc/chrome/trunk/src/net/http/http_cache.h?view=diff&r1=69413&r2=69414
Change-Id: Ic22277a95f3cbdb1fa0b6ac65b01f835fb4a407e
Kristian Monsen [Fri, 13 May 2011 15:49:46 +0000 (16:49 +0100)]
Merge Chromium at 10.0.621.0: profile.h moved to profiles/profile.h
Upstream:
http://codereview.chromium.org/
5606002
Change-Id: Ia714f1a1abaca9bef00442f98476d0e8f43eb3e7
Kristian Monsen [Fri, 13 May 2011 15:48:45 +0000 (16:48 +0100)]
Merge Chromium at 10.0.621.0: CookieList moved out of CookieMonster
Upstream CL:
http://src.chromium.org/viewvc/chrome/trunk/src/net/http/http_cache.h?view=diff&r1=69413&r2=69414
Change-Id: I618b42f163c0a4cf329fe6fb95be4b86bca8f202
Steve Block [Fri, 20 May 2011 10:51:35 +0000 (11:51 +0100)]
Do not process Inspector.idl using the V8 or JSC code generator
Unlike the other Inspector IDL files, Inspector.idl should not be
processed using the V8 or JSC code generator. Instead, it should use
the Inspector code generator.
See http://trac.webkit.org/changeset/62549, which introduced
CodeGeneratorInspector.pm. This change added InspectorFrontend2.idl,
which was later renamed to Inspector.idl.
In fact, we do not require V8/JSCInspector.cpp/h, so we can simply
remove Inspector.idl from our build.
Using the V8 or JSC code generator with Inspector.idl causes incorrect
output. Currently, this does not break our build as the generated
header is not required. However, from
http://trac.webkit.org/changeset/78212 onwards, a side-effect of this
incorrect output is that other, valid, generated files are overridden
with empty files, thus breaking the build.
Change-Id: Ib103214e65cfe43fba8dbf7befb6dcd5e7c81434
Steve Block [Thu, 19 May 2011 17:45:53 +0000 (18:45 +0100)]
Remove some superfluous ARCHIVE enable guards
A new WEB_ARCHIVE enable guard will be added upstream in
http://trac.webkit.org/changeset/78439, replacing our downstream
ARCHIVE guard.
This patch removes a couple of instances of the downstream guard that
are not required and hence will not be replaced by the upstream guard.
Change-Id: Ibc8ca754617e8b34fd8563f6f3b9fa671e871f23
Steve Block [Thu, 19 May 2011 15:11:11 +0000 (16:11 +0100)]
Fix WebArchiveAndroid logging
Change-Id: I6adc6f64f3833d3bc5016da929ffd1e95930d5c5
Steve Block [Thu, 19 May 2011 17:44:56 +0000 (10:44 -0700)]
Merge "ImageDecoder::m_gifDecoder is a GIFImageDecoder, so there's no need to check supportsAlpha()"
Steve Block [Thu, 19 May 2011 13:44:02 +0000 (14:44 +0100)]
Fix some compiler warnings
Change-Id: I4c5fde4898313b26c9a97bd9571b02eaeb35c684
Steve Block [Thu, 19 May 2011 12:52:16 +0000 (13:52 +0100)]
Use adoptPtr() and adoptArrayPtr() when setting OwnPtr and OwnArrayPtr
We should not be using OwnPtr/OwnArrayPtr::set() - see LOOSE_OWN_PTR
and LOOSE_OWN_ARRAY_PTR in OwnPtr.h and OwnArrayPtr.h.
LOOSE_OWN_ARRAY_PTR will be removed in
http://trac.webkit.org/changeset/77785 so fixing now to avoid later
problems.
Change-Id: I81552b1bc5e1555a3d46e0db1f9916c68878c751
Steve Block [Thu, 19 May 2011 11:40:55 +0000 (12:40 +0100)]
ImageDecoder::m_gifDecoder is a GIFImageDecoder, so there's no need to check supportsAlpha()
GIFImageDecoder::supportsAlpha() always returns true and this method
will be removed in http://trac.webkit.org/changeset/77427, so updating
our code now to avoid problems later.
Change-Id: I2a6500608eb661ee50a7ed315e7ece49508d0f82
Teng-Hui Zhu [Thu, 19 May 2011 10:46:15 +0000 (03:46 -0700)]
am
b245689d: (-s ours) am
b39b82ea: am
e61ae1cb: DO NOT MERGE: Partially revert change from 96777
* commit '
b245689d67e467ee565d2594b3df73417ad1eb08':
DO NOT MERGE: Partially revert change from 96777
Teng-Hui Zhu [Wed, 18 May 2011 22:27:19 +0000 (15:27 -0700)]
Merge "Partially revert change from 96777"
Teng-Hui Zhu [Wed, 18 May 2011 21:48:26 +0000 (14:48 -0700)]
Partially revert change from 96777
By reverting this part, the preview is scrolling fine now.
The old bug
3416512 is kept fixed.
This is manually integrated from MR2 change 110435
bug:
4440227
Change-Id: I98d4286cb2dfa2649b172751270e1ae7c43d0887
Teng-Hui Zhu [Wed, 18 May 2011 21:45:12 +0000 (14:45 -0700)]
am
b39b82ea: am
e61ae1cb: DO NOT MERGE: Partially revert change from 96777
* commit '
b39b82eaeadd4d876ce301279d919bc2fa7fe7dd':
DO NOT MERGE: Partially revert change from 96777
Teng-Hui Zhu [Wed, 18 May 2011 21:42:44 +0000 (14:42 -0700)]
am
e61ae1cb: DO NOT MERGE: Partially revert change from 96777
* commit '
e61ae1cb52fb14cf18cef0044ed125e162c8c2dd':
DO NOT MERGE: Partially revert change from 96777
Teng-Hui Zhu [Tue, 17 May 2011 23:02:02 +0000 (16:02 -0700)]
DO NOT MERGE: Partially revert change from 96777
By reverting this part, the preview is scrolling fine now.
The old bug
3416512 is kept fixed.
bug:
4440227
Change-Id: I3e7639b29ec818ccc9553fd459ac53f13752a1e2
Steve Block [Wed, 18 May 2011 17:28:23 +0000 (18:28 +0100)]
Fix build when WEBARCHIVE is disabled
Change-Id: Ibbc124a51f2c58188eb8132a57adc5d87373f25c
John Reck [Mon, 16 May 2011 17:03:17 +0000 (10:03 -0700)]
Basic performance monitor for tiles
Change-Id: Ic67a5093a7c09b870ec34160ae0c999162dddcfc
Ben Murdoch [Mon, 16 May 2011 10:27:22 +0000 (11:27 +0100)]
Merge WebKit at r75993: Update ThirdPartyProject.prop
Change-Id: Ia4c88dc9bddaca3fb0a694b7e9b662c8193e7298
Ben Murdoch [Mon, 16 May 2011 14:08:05 +0000 (15:08 +0100)]
Merge WebKit at r75993: Fix uses of cache() function
WebCore::cache() is renamed to WebCore::memoryCache()
See http://trac.webkit.org/changeset/75857
Change-Id: Id102b534c784191461a4d077058e5c25d5741d57
Ben Murdoch [Mon, 16 May 2011 09:40:15 +0000 (10:40 +0100)]
Merge WebKit at r75993: Fix ImageSourceAndroid.cpp
RGBA32Buffer is now named ImageFrame.
See http://trac.webkit.org/changeset/75748
Change-Id: Id469057d2caa05c49f59ec489b39285dc3bf7763
Ben Murdoch [Mon, 16 May 2011 09:37:04 +0000 (10:37 +0100)]
Merge WebKit at r75993: Fix TemporaryLinkStubs.cpp
PasteBoard destructor has been removed.
See http://trac.webkit.org/changeset/75523
Change-Id: I9beec1cca66e84c5459b0f0f29a25902f7a9fced
Ben Murdoch [Mon, 16 May 2011 09:30:23 +0000 (10:30 +0100)]
Merge WebKit at r75993: Fix DragControllerAndroid.cpp
DragData::containsURL now takes a Frame* parameter.
See http://trac.webkit.org/changeset/75523
Change-Id: Ic32fc5857389dd87eec055dbdd7a361ab6d4dba7
Ben Murdoch [Mon, 16 May 2011 14:20:35 +0000 (15:20 +0100)]
Merge WebKit at r75993: Fix RenderThemeAndroid.cpp
PaintInfo.h include was removed from RenderObject.h in
http://trac.webkit.org/changeset/75837
Change-Id: I4347c028ea55506096b658206b04e96d158c08d3
Ben Murdoch [Mon, 16 May 2011 14:19:42 +0000 (15:19 +0100)]
Merge WebKit at r75993: Fix conflicts.
StyleElement.cpp
Do not undo cherry pick of http://trac.webkit.org/changeset/80787
Conflict due to intermediate change
http://trac.webkit.org/changeset/75338
SliderThumbElement.cpp
Conflict due to Android TOUCH_EVENTS addition and
http://trac.webkit.org/changeset/75749
DOMWindow.cpp
Conflict due to clearDomStorage and
http://trac.webkit.org/changeset/75739
Page.cpp
Conflict due to Android APPLICATION_INSTALLED addition and
http://trac.webkit.org/changeset/75604
DragData.h
See http://trac.webkit.org/changeset/75523
RenderBox.cpp
Conflict due to PLATFORM_ANDROID addition and
http://trac.webkit.org/changeset/75837
.gitignore - keep ours
RenderSVGSolidColor.cpp
This file moved, so copy over our edits.
Change-Id: Ieeb1f0056987d718e3522cc7cd8097a90fc642fb
Ben Murdoch [Fri, 13 May 2011 15:55:45 +0000 (16:55 +0100)]
Merge WebKit at r75993: Fix Makefiles
Change-Id: I81db2c8ade83fcaf85db13629a12b7e0d2e6dccc
Ben Murdoch [Fri, 13 May 2011 15:40:46 +0000 (16:40 +0100)]
Merge WebKit at r75993: Move WebKit/android files to Source
Change-Id: Ifa871f8320bdb3a09fe189fffecc23f702c394b9
Ben Murdoch [Fri, 13 May 2011 15:23:25 +0000 (16:23 +0100)]
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
John Reck [Fri, 13 May 2011 19:20:40 +0000 (12:20 -0700)]
am
68b5dbab: (-s ours) am
7d1dae3f: am
58348114: Merge "DO NOT MERGE cursor ring drawing in GL" into honeycomb-mr2
* commit '
68b5dbab241bbfcaf8dbed500a2402c268081634':
DO NOT MERGE cursor ring drawing in GL
Steve Block [Fri, 13 May 2011 13:44:40 +0000 (06:44 -0700)]
Merge changes Ide388898,Ic49f367c,I1158a808,Iacb6ca5d,I2100dd3a,I5c1abe54,Ib0ef9902,I31dbc523,I570314b3
* changes:
Merge WebKit at r75315: Update WebKit version
Merge WebKit at r75315: Add FrameLoaderClient PageCache stubs
Merge WebKit at r75315: Stub out AXObjectCache::remove()
Merge WebKit at r75315: Fix ImageBuffer
Merge WebKit at r75315: Fix PluginData::initPlugins()
Merge WebKit at r75315: Fix conflicts
Merge WebKit at r75315: Fix Makefiles
Merge WebKit at r75315: Move Android-specific WebCore files to Source
Merge WebKit at r75315: Initial merge by git.
Steve Block [Thu, 12 May 2011 14:11:16 +0000 (15:11 +0100)]
Merge WebKit at r75315: Update WebKit version
Change-Id: Ide38889853d77176e4e8733a823bb607644ae9bf
Steve Block [Thu, 12 May 2011 14:10:20 +0000 (15:10 +0100)]
Merge WebKit at r75315: Add FrameLoaderClient PageCache stubs
See http://trac.webkit.org/changeset/74571
Change-Id: Ic49f367c0f35c2aa04d255193ff6ebd4d7e41d54
Steve Block [Mon, 9 May 2011 18:51:44 +0000 (19:51 +0100)]
Merge WebKit at r75315: Stub out AXObjectCache::remove()
See http://trac.webkit.org/changeset/75031
Change-Id: I1158a8086e2b184f5728eb1ea3d6344af4fee162
Steve Block [Mon, 9 May 2011 18:00:11 +0000 (19:00 +0100)]
Merge WebKit at r75315: Fix ImageBuffer
See http://trac.webkit.org/changeset/74868
Change-Id: Iacb6ca5dd044a7bf08eb43012457b92f3a6beccd
Steve Block [Mon, 9 May 2011 17:48:31 +0000 (18:48 +0100)]
Merge WebKit at r75315: Fix PluginData::initPlugins()
See http://trac.webkit.org/changeset/75217
Change-Id: I2100dd3ab2d96de8ab18f0cb873dcdff082569c2
Steve Block [Mon, 9 May 2011 16:47:02 +0000 (17:47 +0100)]
Merge WebKit at r75315: Fix conflicts
- HTMLInputElement.cpp
Conflict due to ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS
See http://trac.webkit.org/changeset/74895
- HTMLInputElement.cpp and RangeInputType.cpp
Conflict due to refactoring of event handling on input elements
See http://trac.webkit.org/changeset/74549
- DOMWindow.cpp
Conflict due to DOMWindow::clearDOMStorage()
See http://trac.webkit.org/changeset/74800
- EventHandler.cpp
Conflict due to longpress and doubletap vs touch event refactoring
See http://trac.webkit.org/changeset/74553
- History.cpp
Trivial conflict due to cherry-pick
See http://trac.webkit.org/changeset/74853
- GraphicsContext.cpp
Conflict due to PLATFORM(ANDROID) guard
See http://trac.webkit.org/changeset/74662
- InlineTextBox.cpp
Conflict due to ANDROID_DISABLE_ROUNDING_HACKS
See http://trac.webkit.org/changeset/74971
Change-Id: I5c1abe54b9d78f667a41e83a871e9a21be0a89d5
Steve Block [Mon, 9 May 2011 18:57:19 +0000 (19:57 +0100)]
Merge WebKit at r75315: Fix Makefiles
See http://trac.webkit.org/changeset/74646
Change-Id: Ib0ef9902925ddb13ec97fad0753515b10b1d3c01
John Reck [Fri, 13 May 2011 00:39:37 +0000 (17:39 -0700)]
am
7d1dae3f: am
58348114: Merge "DO NOT MERGE cursor ring drawing in GL" into honeycomb-mr2
* commit '
7d1dae3f7a9a698d4564b3529278fa703aed7d89':
DO NOT MERGE cursor ring drawing in GL
John Reck [Fri, 13 May 2011 00:35:33 +0000 (17:35 -0700)]
am
58348114: Merge "DO NOT MERGE cursor ring drawing in GL" into honeycomb-mr2
* commit '
58348114645f3987aaabae40612a876cfd2bc678':
DO NOT MERGE cursor ring drawing in GL
John Reck [Thu, 12 May 2011 23:29:48 +0000 (16:29 -0700)]
Merge "DO NOT MERGE cursor ring drawing in GL" into honeycomb-mr2
Dima Zavin [Thu, 12 May 2011 23:05:58 +0000 (16:05 -0700)]
Merge "update for new audio.h header location"
Dima Zavin [Wed, 11 May 2011 21:14:50 +0000 (14:14 -0700)]
update for new audio.h header location
Change-Id: I62351e590d89ef68b26248936a4d63df4557182c
Signed-off-by: Dima Zavin <dima@android.com>
Jean-Baptiste Queru [Thu, 12 May 2011 21:02:09 +0000 (14:02 -0700)]
am
3ba807b9: am
169f8bc5: (-s ours) Merge "Remove unused function that relies on an obsolete API"
* commit '
3ba807b9f832658bf3f9b7638103308acf22506a':
Remove unused function that relies on an obsolete API
Jean-Baptiste Queru [Thu, 12 May 2011 20:58:21 +0000 (13:58 -0700)]
am
169f8bc5: (-s ours) Merge "Remove unused function that relies on an obsolete API"
* commit '
169f8bc5df73bcd9cd286f188d1c741ce5035c37':
Remove unused function that relies on an obsolete API
Jean-Baptiste Queru [Thu, 12 May 2011 20:40:05 +0000 (13:40 -0700)]
Merge "Remove unused function that relies on an obsolete API"
Jean-Baptiste Queru [Thu, 12 May 2011 20:29:42 +0000 (13:29 -0700)]
Remove unused function that relies on an obsolete API
Change-Id: I9bf5b4abb570f84a472740ec3076200398767ecb
Jean-Baptiste Queru [Thu, 12 May 2011 20:28:53 +0000 (13:28 -0700)]
am
5fa3323c: (-s ours) am
61719739: Merge "Port toward newer versions of skia."
* commit '
5fa3323c37a1e7731e88e9042f79f9686b151bf5':
Port toward newer versions of skia.
Jean-Baptiste Queru [Thu, 12 May 2011 20:20:04 +0000 (13:20 -0700)]
am
61719739: Merge "Port toward newer versions of skia."
* commit '
61719739938e34b0a33995d4ab72eaa4604bcf67':
Port toward newer versions of skia.
Jean-Baptiste Queru [Thu, 12 May 2011 19:57:04 +0000 (12:57 -0700)]
am
7c3ea1eb: am
d45deba0: (-s ours) Merge "Switch to SkSafeRef"
* commit '
7c3ea1eb3b026b8c46748911c4a539d4df56942c':
Switch to SkSafeRef
Jean-Baptiste Queru [Thu, 12 May 2011 19:56:57 +0000 (12:56 -0700)]
Merge "Port toward newer versions of skia."
Jean-Baptiste Queru [Thu, 12 May 2011 19:55:38 +0000 (12:55 -0700)]
Port toward newer versions of skia.
Change-Id: Id3f330a151227ff95cc15d2a65be6004dbac05a7
Jean-Baptiste Queru [Thu, 12 May 2011 19:53:59 +0000 (12:53 -0700)]
am
d45deba0: (-s ours) Merge "Switch to SkSafeRef"
* commit '
d45deba0c666cf706366b04ae4e529c91ff23e79':
Switch to SkSafeRef
Jean-Baptiste Queru [Thu, 12 May 2011 19:23:22 +0000 (12:23 -0700)]
Merge "Switch to SkSafeRef"
Jean-Baptiste Queru [Thu, 12 May 2011 19:22:37 +0000 (12:22 -0700)]
Switch to SkSafeRef
Change-Id: Ia4fa9adb7d5096e71357d3428244cbe35f24bd50
Jean-Baptiste Queru [Thu, 12 May 2011 16:04:24 +0000 (09:04 -0700)]
am
c9818b52: am
555569c5: (-s ours) Merge "Switch to SkSafeUnref for better portability"
* commit '
c9818b52072bfb7663b37f272d5e926296428780':
Switch to SkSafeUnref for better portability
Jean-Baptiste Queru [Thu, 12 May 2011 16:02:34 +0000 (09:02 -0700)]
am
555569c5: (-s ours) Merge "Switch to SkSafeUnref for better portability"
* commit '
555569c59ced09743507966f73d2d500c6deccec':
Switch to SkSafeUnref for better portability
Jean-Baptiste Queru [Thu, 12 May 2011 15:05:27 +0000 (08:05 -0700)]
Merge "Switch to SkSafeUnref for better portability"
Steve Block [Mon, 9 May 2011 15:25:46 +0000 (16:25 +0100)]
Merge WebKit at r75315: Move Android-specific WebCore files to Source
This moves files in the following WebCore subdirectories ...
- bindings/js
- bindings/v8/custom
- plugins/android
- platform/android
- platform/graphics/android
- page/
- css/
- dom/
- loader/archive/android
Steve Block [Fri, 6 May 2011 10:45:16 +0000 (11:45 +0100)]
Merge WebKit at r75315: Initial merge by git.
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
Steve Block [Thu, 12 May 2011 11:45:56 +0000 (12:45 +0100)]
Clean up JavaBridge
This is in preparation for the fix for null weak global references.
No functional change.
Bug:
4336862
Change-Id: I4ef7d999cf6b915b3f2af7a76c2414d5537891e5
Steve Block [Thu, 12 May 2011 11:45:16 +0000 (12:45 +0100)]
Clean up DeviceMotionClientImpl and DeviceOrientationClientImpl
This is in preparation for the fix for null weak global references.
No functional change.
Bug:
4336862
Change-Id: I1718df5e4b443471e3c166e5ad8ae984b395ec38
Steve Block [Thu, 12 May 2011 11:43:55 +0000 (12:43 +0100)]
Clean up WebViewCore
This is in preparation for the fix for null weak global references.
No functional change.
Bug:
4336862
Change-Id: Icaf11948b0488d10ef112372275a254114a7efb3
Jean-Baptiste Queru [Wed, 11 May 2011 22:41:55 +0000 (15:41 -0700)]
Switch to SkSafeUnref for better portability
Change-Id: Idffdf11f857e28190cbe7ebf3fa08c5b3a8eb192
Derek Sollenberger [Wed, 11 May 2011 13:01:45 +0000 (09:01 -0400)]
Add null pointer check when searching for a plugin widget.
bug:
4395730
Change-Id: I4fb5c129084a8f1d1e3f3951c9cac77a0df4d296
Russell Brenner [Tue, 10 May 2011 18:15:57 +0000 (11:15 -0700)]
am
5581ea83: am
86ca6e2e: am
c74d30ac: Merge "Fix calculation in WebView::scrollRectOnScreen" into honeycomb-mr2
* commit '
5581ea8383a0348a04997c772f8a032c146459af':
Fix calculation in WebView::scrollRectOnScreen
Nicolas Roard [Tue, 10 May 2011 18:14:42 +0000 (11:14 -0700)]
Russell Brenner [Tue, 10 May 2011 16:41:18 +0000 (09:41 -0700)]
am
86ca6e2e: am
c74d30ac: Merge "Fix calculation in WebView::scrollRectOnScreen" into honeycomb-mr2
* commit '
86ca6e2e4d40c69c268633e600ef5b045d102180':
Fix calculation in WebView::scrollRectOnScreen
Russell Brenner [Tue, 10 May 2011 16:33:46 +0000 (09:33 -0700)]
am
c74d30ac: Merge "Fix calculation in WebView::scrollRectOnScreen" into honeycomb-mr2
* commit '
c74d30ac1079750a0d7f87704a9962f8045cce94':
Fix calculation in WebView::scrollRectOnScreen
Russell Brenner [Tue, 10 May 2011 16:30:16 +0000 (09:30 -0700)]
Merge "Fix calculation in WebView::scrollRectOnScreen" into honeycomb-mr2
Steve Block [Mon, 9 May 2011 19:27:07 +0000 (20:27 +0100)]
Clean up makefiles in preparation for new Source/ directory
Change-Id: Iebb4d96933c59028f024ac29b348b98d13a29610
Steve Block [Mon, 9 May 2011 18:07:42 +0000 (19:07 +0100)]
Clean up includes in WebStorage.cpp
Change-Id: I66d260c506b0a3bd0379866bd5e794497b20c9c5