summaryrefslogtreecommitdiffstats
path: root/Source/WebCore
Commit message (Collapse)AuthorAgeFilesLines
* Merge WebKit at r78450: Fix remaining conflictsSteve Block2011-05-2511-101/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Document.cpp Conflict due to AX object cache disabled on Android See http://trac.webkit.org/changeset/78314 - CachedResourceLoader.cpp/h Conflict due to ANDROID_BLOCK_NETWORK_IMAGE See http://trac.webkit.org/changeset/76701 - Source/WebCore/page/ChromeClient.h Conflict due to ANDROID_INSTALLABLE_WEB_APPS See http://trac.webkit.org/changeset/77509 - FrameView.cpp Conflict due to Android FrameView::updatePositionedObjects() See http://trac.webkit.org/changeset/77274 - ScrollView.h Conflict due to Android ScrollView::actualWidth/Height/ScrollX/ScrollY() See http://trac.webkit.org/changeset/76831 - TemporaryLinkStubs.cpp and MIMETypeRegistry.cpp conflict due to Android stubbed out MIMETypeRegistry::getMIMETypeForExtension() See http://trac.webkit.org/changeset/77368 and https://android-git.corp.google.com/g/#change,37272 - ImageDecoder.cpp Conflict due to Android excluding code See http://trac.webkit.org/changeset/77427 - ImageDecoder.h Conflict due to ANDROID guard upstreamed as SKIA guard See http://trac.webkit.org/changeset/77946 - InlineTextBox.cpp Conflict due to ANDROID_DISABLE_ROUNDING_HACKS See http://trac.webkit.org/changeset/76743 and http://trac.webkit.org/changeset/77286 - RenderBlockLineLayout.cpp Conflict due to ANDROID_LAYOUT See http://trac.webkit.org/changeset/77062 Change-Id: Ide4d58dc52418b8fc1a965a9524eb57cd46b4859
* Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guardSteve Block2011-05-257-105/+7
| | | | | | | | | | | | | 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
* Merge WebKit at r78450: Fix conflicts in media controlsSteve Block2011-05-255-421/+55
| | | | | | | Conflict due to Android modifications to handle touch events. See http://trac.webkit.org/changeset/76950 Change-Id: I499d66319614af4bc23f1c0f89f072b814503703
* Merge WebKit at r78450: Fix MakefilesSteve Block2011-05-243-5/+3
| | | | | | PCRE switched for YARR - http://trac.webkit.org/changeset/78042 Change-Id: Ie5090e0d7a174e3c2975b807d0b4769b15494156
* Merge WebKit at r78450: Initial merge by git.Steve Block2011-05-241413-22948/+50651
| | | | Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
* Check that the view is not null in GraphicsLayerAndroid::updateFixedPosition()Steve Block2011-05-241-1/+4
| | | | | Bug: 4461705 Change-Id: I0facda892e16e1b626964b032cf337c29f0d3364
* Merge WebKit at r76408: Fix Bridge.hBen Murdoch2011-05-2338-39/+39
| | | | | | | | Cherry pick of upstream http://trac.webkit.org/changeset/79988 Needed now due to FastAllocBase and Noncopyable changes in this merge. Change-Id: I26c91f7940b106db21e26c37507490acd1546cff
* Merge WebKit at r76408: Fix calls to RenderLayer::scrollToOffset()Ben Murdoch2011-05-231-2/+2
| | | | | | | | 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
* Merge WebKit at r76408: Fix EventHandlerAndroid.cppBen Murdoch2011-05-231-3/+0
| | | | | | | | | 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
* Merge WebKit at r76408: Fix FontAndroid.cppBen Murdoch2011-05-231-0/+1
| | | | | | | | | | 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
* Merge WebKit at r76408: Update Uses of Noncopyable/FastAllocBaseBen Murdoch2011-05-233-2/+5
| | | | | | | | | | | | | | | | 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
* Merge WebKit at r76408: Fix ImageBufferAndroid.Ben Murdoch2011-05-231-0/+5
| | | | | | | Implement missing dataSize function introduced in http://trac.webkit.org/changeset/76371 (JSC only) Change-Id: Ie9a714cdb41894ceb2d928b6e42ed6a41d8d04a7
* Merge WebKit at r76408: Fix conflicts.Ben Murdoch2011-05-2312-94/+159
| | | | | | | | | | | | | | | | | | | | | 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
* Merge WebKit at r76408: Fix Makefiles.Ben Murdoch2011-05-234-2/+4
| | | | Change-Id: I4d8928d488fb00050058569cf21e7d48e5d5c247
* Merge WebKit at r76408: Initial merge by git.Ben Murdoch2011-05-23831-6770/+18151
| | | | Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
* Fix position updateTeng-Hui Zhu2011-05-232-18/+15
| | | | | | | | | | | | 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
* Merge changes Ib103214e,Ibc8ca754,I6adc6f64,I4c5fde48,I81552b1bSteve Block2011-05-2010-60/+52
|\ | | | | | | | | | | | | | | | | * 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
| * Do not process Inspector.idl using the V8 or JSC code generatorSteve Block2011-05-202-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Remove some superfluous ARCHIVE enable guardsSteve Block2011-05-192-6/+0
| | | | | | | | | | | | | | | | | | | | | | 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
| * Fix WebArchiveAndroid loggingSteve Block2011-05-191-28/+28
| | | | | | | | Change-Id: I6adc6f64f3833d3bc5016da929ffd1e95930d5c5
| * Fix some compiler warningsSteve Block2011-05-193-12/+7
| | | | | | | | Change-Id: I4c5fde4898313b26c9a97bd9571b02eaeb35c684
| * Use adoptPtr() and adoptArrayPtr() when setting OwnPtr and OwnArrayPtrSteve Block2011-05-192-10/+13
| | | | | | | | | | | | | | | | | | | | | | 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
* | Merge "ImageDecoder::m_gifDecoder is a GIFImageDecoder, so there's no need ↵Steve Block2011-05-192-5/+2
|\ \ | |/ | | | | to check supportsAlpha()"
| * ImageDecoder::m_gifDecoder is a GIFImageDecoder, so there's no need to check ↵Steve Block2011-05-192-5/+2
| | | | | | | | | | | | | | | | | | | | 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
* | Merge "Partially revert change from 96777"Teng-Hui Zhu2011-05-181-12/+2
|\ \ | |/ |/|
| * Partially revert change from 96777Teng-Hui Zhu2011-05-181-12/+2
| | | | | | | | | | | | | | | | | | 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
* | Fix build when WEBARCHIVE is disabledSteve Block2011-05-182-2/+4
| | | | | | | | Change-Id: Ibbc124a51f2c58188eb8132a57adc5d87373f25c
* | Basic performance monitor for tilesJohn Reck2011-05-165-2/+200
| | | | | | | | Change-Id: Ic67a5093a7c09b870ec34160ae0c999162dddcfc
* | Merge WebKit at r75993: Fix ImageSourceAndroid.cppBen Murdoch2011-05-161-8/+8
| | | | | | | | | | | | | | | | RGBA32Buffer is now named ImageFrame. See http://trac.webkit.org/changeset/75748 Change-Id: Id469057d2caa05c49f59ec489b39285dc3bf7763
* | Merge WebKit at r75993: Fix TemporaryLinkStubs.cppBen Murdoch2011-05-161-6/+0
| | | | | | | | | | | | | | PasteBoard destructor has been removed. See http://trac.webkit.org/changeset/75523 Change-Id: I9beec1cca66e84c5459b0f0f29a25902f7a9fced
* | Merge WebKit at r75993: Fix DragControllerAndroid.cppBen Murdoch2011-05-161-1/+1
| | | | | | | | | | | | | | DragData::containsURL now takes a Frame* parameter. See http://trac.webkit.org/changeset/75523 Change-Id: Ic32fc5857389dd87eec055dbdd7a361ab6d4dba7
* | Merge WebKit at r75993: Fix RenderThemeAndroid.cppBen Murdoch2011-05-161-0/+1
| | | | | | | | | | | | | | PaintInfo.h include was removed from RenderObject.h in http://trac.webkit.org/changeset/75837 Change-Id: I4347c028ea55506096b658206b04e96d158c08d3
* | Merge WebKit at r75993: Fix conflicts.Ben Murdoch2011-05-168-138/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge WebKit at r75993: Fix MakefilesBen Murdoch2011-05-162-39/+3
| | | | | | | | Change-Id: I81db2c8ade83fcaf85db13629a12b7e0d2e6dccc
* | Merge WebKit at r75993: Initial merge by git.Ben Murdoch2011-05-16657-9435/+15642
|/ | | | Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
* Merge WebKit at r75315: Stub out AXObjectCache::remove()Steve Block2011-05-131-0/+5
| | | | | | See http://trac.webkit.org/changeset/75031 Change-Id: I1158a8086e2b184f5728eb1ea3d6344af4fee162
* Merge WebKit at r75315: Fix ImageBufferSteve Block2011-05-131-11/+9
| | | | | | See http://trac.webkit.org/changeset/74868 Change-Id: Iacb6ca5dd044a7bf08eb43012457b92f3a6beccd
* Merge WebKit at r75315: Fix PluginData::initPlugins()Steve Block2011-05-131-1/+1
| | | | | | See http://trac.webkit.org/changeset/75217 Change-Id: I2100dd3ab2d96de8ab18f0cb873dcdff082569c2
* Merge WebKit at r75315: Fix conflictsSteve Block2011-05-137-193/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* Merge WebKit at r75315: Fix MakefilesSteve Block2011-05-135-25/+5
| | | | | | See http://trac.webkit.org/changeset/74646 Change-Id: Ib0ef9902925ddb13ec97fad0753515b10b1d3c01
* Merge WebKit at r75315: Move Android-specific WebCore files to SourceSteve Block2011-05-12100-0/+20887
| | | | | | | | | | | | | 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
* Merge WebKit at r75315: Initial merge by git.Steve Block2011-05-126981-0/+1953229
Change-Id: I570314b346ce101c935ed22a626b48c2af266b84
generated by cgit v1.1 at 2024-08-30 02:34:34 +0000