summaryrefslogtreecommitdiffstats
path: root/Source/WebCore
Commit message (Collapse)AuthorAgeFilesLines
* Merge "JavaScriptCore/config.h should not include WebCore/config.h"Steve Block2011-06-021-6/+3
|\
| * JavaScriptCore/config.h should not include WebCore/config.hSteve Block2011-06-021-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All WebKit ports other than Chromium use a separate set of include paths for building JSC vs WebCore, so source files pick up the appropriate version of config.h. Android uses a single set of include paths, so gets aroud this problem by adding WebCore/ to the include path first and including JavaScriptCore/config.h from WebCore/config.h. This is ugly and will cause problems in an upcoming merge due to new macros being defined in both files. The two files are very similar. JavaScriptCore/config.h adds only the following two defines ... - HAVE_STDINT_H - This is not used on Android - WTF_CHANGES This patch removes the include of JavaScriptCore/config.h from WebCore/config.h and adds WTF_CHANGES for Android. Note that Chromium uses only WebCore/config.h and adds WTF_CHANGES in a similar way. Change-Id: Ib9c93eda0023096aa40dde947b5a476c207542e0
* | Merge WebKit at r80534: Fix CSSComputedStyleDeclaration.cppBen Murdoch2011-06-022-48/+18
| | | | | | | | | | | | | | Update our uses of CSSPrimitiveValue following http://trac.webkit.org/changeset/80463 Change-Id: I216382423f496b90af61b044b2a4bda9a6c322de
* | Merge WebKit at r80534: Fix JSNavigatorCustom.cppBen Murdoch2011-06-021-1/+1
| | | | | | | | | | | | | | | | | | InternalFunction::info has been renamed InternalFunction::s_info so update our code to reflect this. See http://trac.webkit.org/changeset/79132 Change-Id: I8118b513fcee8b1e8e9e53241e1b0507cf3df68b
* | Merge WebKit at r80534: Fix GraphicsContextAndroid.cppBen Murdoch2011-06-021-0/+8
| | | | | | | | | | | | | | | | | | Need to provide an Android implementation of new setCTM() function. See http://trac.webkit.org/changeset/78704 Change-Id: Iefd0225495bec6f4945f02660a450018e4270593
* | Merge WebKit at r80534: Fix JavaMethod.cppBen Murdoch2011-06-021-0/+4
| | | | | | | | | | | | | | | | | | Partial cherry pick of http://trac.webkit.org/changeset/81040 Need to add the JSC guard (it was added unguraded in http://trac.webkit.org/changeset/79904) Change-Id: I880e241e2369ee4ffc616286d195989655e18cc2
* | Merge WebKit at r80534: Fix Java Bridge.Ben Murdoch2011-06-023-20/+9
| | | | | | | | | | | | | | | | | | | | Fix conflicts and reflect the upstream changes made in http://trac.webkit.org/changeset/80467. Note that our JNIUtilityPrivate.cpp is significantly forked from upstream. Change-Id: I390f1089d861fa29b6c15118638d029dea4356d8
* | Merge WebKit at r80534: Fix ImageSourceAndroid.cppBen Murdoch2011-06-021-3/+7
| | | | | | | | | | | | | | | | | | | | | | SharedBuffer::buffer now private, we should use SharedBuffer::data() instead. See http://trac.webkit.org/changeset/78548 Add implementation of bytesDecodedToDetermineProperties. See http://trac.webkit.org/changeset/78652 Change-Id: Ic113f711f3b8d553e35ba98246fd6bd9093fdb06
* | Merge WebKit at r80534: Update uses of PLATFORM(SKIA).Ben Murdoch2011-06-026-41/+9
| | | | | | | | | | | | | | | | | | PLATFORM(SKIA) is replaced with USE(SKIA), see http://trac.webkit.org/changeset/79578 Fix conflicts and update our code to reflect this. Change-Id: Ia23956874418552eb8f107d389557a4cdcb225b6
* | Merge WebKit at r80534: Fix uses of rounding hacks.Ben Murdoch2011-06-026-104/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Font rounding hacks have been removed upstream, so there is no need for our local code anymore. Remove all uses of the ANDROID_DISABLE_ROUNDING_HACKS macro. Note that this brings our behavior in line with upstream - Android will see a change in behavior to before the merge as we did not disable rounding hacks in all cases. - SVGInlineTextBox::SVGInlineTextBox() - we don't pass a value for disableRoundingHacks, so we don't disable hacks, so this behaviour will change as rounding hacks are disabled now. - RenderText::createTextBox() - We pass a value for disableRoundingHacks, true if any parent is a text control. So we will change behavior in any case where the parent is not a text control. Note that although we may see a change in behavior, that change is consistent with the upstream codebase. See http://trac.webkit.org/changeset/78846 Change-Id: I5d4d7298083acc519199c4c38ab5acdef5bdc537
* | Merge WebKit at r80534: Fix makefiles.Ben Murdoch2011-06-026-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | Add new and remove deleted files to fix makefiles. See http://trac.webkit.org/changeset/79861 for new XSLTreeViewer generation. Also remove a stub from TemporaryLInkStubs that we now get by compiling the correct files in JSC (see http://trac.webkit.org/changeset/78634). Change-Id: I550b035b7c9c915b42738366da7817dca020c9a8
* | Merge WebKit at r80534: Fix conflicts.Ben Murdoch2011-06-0214-104/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android.jscbindings.mk 79223 Conflict due to http://trac.webkit.org/changeset/79223 Android.mk Conflicts due to http://trac.webkit.org/changeset/79825 and http://trac.webkit.org/changeset/79978 Android.v8bindings.mk 80367 Conflicts due to http://trac.webkit.org/changeset/80103 and http://trac.webkit.org/changeset/80367 HTMLMediaElement.cpp Conflicts due to http://trac.webkit.org/changeset/80030 and local TOUCH_EVENTS modifications. HTMLDocumentParser.cpp Conflict due to http://trac.webkit.org/changeset/79772 and local ANDROID_INSTRUMENT modifications. CachedResourceLoader.cpp|h Conflicts due to http://trac.webkit.org/changeset/78602 and ANDROID_BLOCK_NETWORK_IMAGE. MemoryCache.h Conflicts due to http://trac.webkit.org/changeset/78848 and ANDROID_INSTRUMENT. FrameView.cpp Conflict due to http://trac.webkit.org/changeset/78928 and locally added updatePositionedObjects function. NetworkStateNotifier JobjectWrapper.cpp Git seems to have got confused with a rename here in JobjectWrapper.cpp, keep ours. Conflicts due to http://trac.webkit.org/changeset/79563 and local Android additions. PluginViewNone.cpp 79904 Conflicts due to http://trac.webkit.org/changeset/79904 and local cherry pick of http://trac.webkit.org/changeset/79988 RenderBox.cpp Conflicts due to http://trac.webkit.org/changeset/79467 and local android modifications. Change-Id: I98bd80de86b5169212da137ad3df42c1c35e8931
* | Merge WebKit at r80534: Intial merge by GitBen Murdoch2011-06-021264-62875/+98655
| | | | | | | | Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
* | Support the screen shot while the video is paused.Teng-Hui Zhu2011-06-017-16/+371
|/ | | | | | | | | | | | | | | | | | | | Basically, the GL textures generated for the surface texture will be used for showing the screenshot. Surface texture will be recycled every time a new video starts. But GL textures will be recycled either when running out of memory bound, or when the mediaplayer is deleted. 1. Add the VideoLayerManager as a static instance to manage the info of textures allocated for the screenshot. The basic info will be added into the manager while the video is played and prepared. During the draw time, the matirx info will be updated, too. 2. When there are too many screenshots are created, then we will discard the oldest one and just show the grey static rectangle to replace the screenshot. The corresponding framework change is 112501. Change-Id: Ifea60c96532500f9c93062cc97f7c4ef978046b0
* merge from honeycomb mr2Russell Brenner2011-05-261-1/+15
| | | | | | | | | | | Update isFallbackFamily() with missing fonts Skia maps numerous fonts to the standard system fonts. Only a few of these were matched by isFallbackFamily(). This brings them to parity, adding standards like arial, times, courier, and more. Bug: 4499169 Change-Id: I8fdcb804f8ad4c9b34a8a4ea88ce39c49b364ccc
* Merge changes ↵Steve Block2011-05-251428-23549/+50645
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I78ff6a85,Ic85c6405,Ibf903baa,I3a0459db,I35140385,I54790419,I6bfe5d24,Ia9f39b83,I5bcecd5a,I1de96683,I543c6810,I8a5b0878,I0ae670bf,Ide4d58dc,I28ebaf3d,I499d6631,Ie5090e0d,I6d3e5f1f * changes: Merge WebKit at r78450: Update ThirdPartyProject.prop Merge WebKit at r78450: Add new Font::canExpandAroundIdeographsInComplexText() Merge WebKit at r78450: Add new ChromeClient::selectItemAlignmentFollowsMenuWritingDirection() Merge WebKit at r78450: FrameLoaderClient::didRunInsecureContent() signature changed Merge WebKit at r78450: HTMLAreaElement::getRect() renamed Merge WebKit at r78450: FrameLoader::url() removed Merge WebKit at r78450: HTMLParserQuirks removed Merge WebKit at r78450: TextRun::padding() renamed Merge WebKit at r78450: Use new FontMetrics Merge WebKit at r78450: GraphicsContext current path removed Merge WebKit at r78450: TransformationMatrix multiply methods renamed and meaning changed Merge WebKit at r78450: FontCustomPlatformData::fontPlatformData() signature changed Merge WebKit at r78450: IntRect::bottom()/right() renamed Merge WebKit at r78450: Fix remaining conflicts Merge WebKit at r78450: Fix conflicts due to new ENABLE_WEB_ARCHIVE guard Merge WebKit at r78450: Fix conflicts in media controls Merge WebKit at r78450: Fix Makefiles Merge WebKit at r78450: Initial merge by git.
| * Merge WebKit at r78450: Add new Font::canExpandAroundIdeographsInComplexText()Steve Block2011-05-251-0/+5
| | | | | | | | | | | | See http://trac.webkit.org/changeset/76743 Change-Id: Ic85c640534b133883a03e0c0b71ac8987e6913e7
| * Merge WebKit at r78450: TextRun::padding() renamedSteve Block2011-05-251-1/+1
| | | | | | | | | | | | See http://trac.webkit.org/changeset/76743 Change-Id: Ia9f39b83ea6e9a97e271f5545c3cc36ed5c65800
| * Merge WebKit at r78450: Use new FontMetricsSteve Block2011-05-251-14/+12
| | | | | | | | | | | | | | | | | | 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
| * Merge WebKit at r78450: GraphicsContext current path removedSteve Block2011-05-252-79/+12
| | | | | | | | | | | | See http://trac.webkit.org/changeset/76688 Change-Id: I1de96683ffe1805f710ac8161579d3a399065f4d
| * Merge WebKit at r78450: TransformationMatrix multiply methods renamed and ↵Steve Block2011-05-252-26/+18
| | | | | | | | | | | | | | | | meaning changed See http://trac.webkit.org/changeset/76537 Change-Id: I543c68101d4ee83d190f643e54e4f3fec1fdf238
| * Merge WebKit at r78450: FontCustomPlatformData::fontPlatformData() signature ↵Steve Block2011-05-252-2/+3
| | | | | | | | | | | | | | | | changed See http://trac.webkit.org/changeset/77153 Change-Id: I8a5b0878803b88ff0ebac3539a6d62f94cc10f89
| * Merge WebKit at r78450: IntRect::bottom()/right() renamedSteve Block2011-05-255-9/+9
| | | | | | | | | | | | | | See http://trac.webkit.org/changeset/77286 and http://trac.webkit.org/changeset/77398 Change-Id: I0ae670bff327fb981e037f5394c55bfb4aeb81eb
| * 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
* | Don't change website's content width.Shimeng (Simon) Wang2011-05-241-4/+0
| | | | | | | | | | | | | | | | This code is not needed since now fixed viewport is used for all devices including phone. issue: 4343683 Change-Id: I885eae15d30fc5f3f8f3855febc1d98cf6554c93
* | Merge "Check that the view is not null in ↵Steve Block2011-05-241-1/+4
|\ \ | |/ | | | | GraphicsLayerAndroid::updateFixedPosition()"
| * Check that the view is not null in GraphicsLayerAndroid::updateFixedPosition()Steve Block2011-05-241-1/+4
| | | | | | | | | | Bug: 4461705 Change-Id: I0facda892e16e1b626964b032cf337c29f0d3364
* | Improve the layer dump to include clipRectTeng-Hui Zhu2011-05-231-0/+1
| | | | | | | | Change-Id: I4719283468ee78b7b57093147aec964ad8d90b99
* | The clip should be effective even if it is empty.Teng-Hui Zhu2011-05-231-3/+0
|/ | | | | bug:4473188 Change-Id: Idc34c3132d1f9eba23c6e4944c843c9c19c4dbb8
* 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()"
generated by cgit v1.1 at 2025-06-01 19:36:14 +0000