| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
See http://trac.webkit.org/changeset/80557
Change-Id: I89dae78bbc5aa95920db4d604fcbecabd90cc84e
|
|
|
|
|
|
|
|
| |
Each platform's version of this file is being merged upstream.
See http://trac.webkit.org/changeset/81977 (and its follow-up build
fixes r81982, r81988, r81990, r82018).
Change-Id: I1a4c17b5784de436ecd57e7e429837dd6c3dabb6
|
|
|
|
|
|
|
|
| |
FontCustomPlatformData::fontPlatformData()
See http://trac.webkit.org/changeset/80582
Change-Id: I2c4ecc1abd1b639aa10affc04b5549a8a2fb2ab7
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- FileSystemAndroid.cpp, FileSystemPOSIX.cpp
Use new common version of listDirectory(), which is identical to the
existing Android version.
- StorageNamespace.h, StorageNamespaceImpl.h
Conflict due to Android's clearPage()
- PageGroup.cpp
Conflict due to Android's clearDomStorage()
See http://trac.webkit.org/changeset/80892
Change-Id: Ifac131155f5019959de8761438cd0372547b0e6c
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- RenderLayerBacking.cpp
Due to ANDROID_OVERFLOW_SCROLL
http://trac.webkit.org/changeset/81715
- Document.cpp
Due to domTreeVersion and ANDROID_STYLE_VERSION
http://trac.webkit.org/changeset/80797
- CachedResourceLoader.cpp
Due to temporary debugging and ANDROID_BLOCK_NETWORK_IMAGE
http://trac.webkit.org/changeset/80695
- Settings.cpp/h
http://trac.webkit.org/changeset/81289
http://trac.webkit.org/changeset/81635
- MediaPlayer.cpp
Whitespace only
http://trac.webkit.org/changeset/80874
- RenderBox.cpp
Due to isHorizontalWritingMode
http://trac.webkit.org/changeset/81716
- RenderLayer.cpp/h
Due to ANDROID_OVERFLOW_SCROLL
http://trac.webkit.org/changeset/81981
- CSSStyleSelector.cpp
Due to ANDROID_CSS_RING
http://trac.webkit.org/changeset/80582
http://trac.webkit.org/changeset/80993
http://trac.webkit.org/changeset/80998
http://trac.webkit.org/changeset/81684
http://trac.webkit.org/changeset/82378
- CSSParser.cpp
Due to ANDROID_CSS_RING
http://trac.webkit.org/changeset/80582
http://trac.webkit.org/changeset/81684
- StyleElement.cpp
Due to cherry pick of http://trac.webkit.org/changeset/80787
http://trac.webkit.org/changeset/82054
- EventHandler.cpp
Due to ANDROID_PLUGINS
http://trac.webkit.org/changeset/81618
http://trac.webkit.org/changeset/81835
- SliderThumbElement.cpp
Due to touch events
http://trac.webkit.org/changeset/81216
- MediaControls.cpp
Due to touch events
http://trac.webkit.org/changeset/80857
Note that the WebKit history for this file is confusing as it was
renamed in http://trac.webkit.org/changeset/83545 and then re-added in
http://trac.webkit.org/changeset/84222 but trac is not smart enough to
track history backwards from http://trac.webkit.org/changeset/84222.
Change-Id: Ie1f80e09ae7c3befa7a18773cf846ff130e4354e
|
|
|
|
| |
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
|
|
|
|
|
|
|
|
|
| |
This will become relevant after we merge beyond
http://trac.webkit.org/changeset/81977 (and its follow-up build fixes
r81982, r81988, r81990, r82018) which relies on all platforms'
instances of FontPlatformData.h using the correct include guard.
Change-Id: I58ec4c8ee23698c41d86794333d603b95f303764
|
|
|
|
|
|
| |
See http://trac.webkit.org/changeset/81685
Change-Id: Ibc6c1336b696e39f27fd88d9b4e90fe6918ceba8
|
|\ |
|
| |
| |
| |
| |
| |
| | |
bug:4313230
Change-Id: I364f418c8e04219d985c4ff7a27328d4e0dbfbd2
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | | |
Serializes only the base layer currently
Change-Id: I5cff216a4fc1b08efe3a7955c616b91114f6bf0b
|
|\ \ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
This breaks master-gpl. We can resubmit this after updating the version of skia in master-gpl.
This reverts commit a3d968a2da0ae3463991e973e38af6795ad36c2e
|
|\ \ \ \
| |/ / /
|/| | | |
|
| | |/
| |/|
| | |
| | |
| | |
| | |
| | | |
This will let a webp image url be displayed directly inside browser.
issue: 3291572
Change-Id: I6870c5461c5d746d11457b7afba26cb277b25bbb
|
|/ /
| |
| |
| |
| | |
bug: 4502715
Change-Id: I5301526da2ff4962e7d1fda2b0ad39c407013e05
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We hold weak references to Java objects from native code in several
places to avoid circular reference problems. These objects may become
weakly reachable at any time, after which the GC could null our weak
reference, so we have to null-check at every use.
Note that weak references are nulled before the referent is finalized,
so we can't rely on doing work in the finalizer to wait for the
currently executing message to complete and to remove other messages
from the queue.
This effectively reverts
https://android-git.corp.google.com/g/#change,30955
Bug: 4336862
Change-Id: I431fcac11220cb406c26e31aacb9bda7ea22776e
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Need to provide an Android implementation of new setCTM()
function.
See http://trac.webkit.org/changeset/78704
Change-Id: Iefd0225495bec6f4945f02660a450018e4270593
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Change-Id: Ia7a83357124c9e1cdb1debf55d9661ec0bd09a61
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| |
| |
| |
| |
| |
| | |
See http://trac.webkit.org/changeset/76743
Change-Id: Ic85c640534b133883a03e0c0b71ac8987e6913e7
|
| |
| |
| |
| |
| |
| | |
See http://trac.webkit.org/changeset/76743
Change-Id: Ia9f39b83ea6e9a97e271f5545c3cc36ed5c65800
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| |
| | |
See http://trac.webkit.org/changeset/76688
Change-Id: I1de96683ffe1805f710ac8161579d3a399065f4d
|
| |
| |
| |
| |
| |
| |
| |
| | |
meaning changed
See http://trac.webkit.org/changeset/76537
Change-Id: I543c68101d4ee83d190f643e54e4f3fec1fdf238
|
| |
| |
| |
| |
| |
| |
| |
| | |
changed
See http://trac.webkit.org/changeset/77153
Change-Id: I8a5b0878803b88ff0ebac3539a6d62f94cc10f89
|
| |
| |
| |
| |
| |
| |
| | |
See http://trac.webkit.org/changeset/77286 and
http://trac.webkit.org/changeset/77398
Change-Id: I0ae670bff327fb981e037f5394c55bfb4aeb81eb
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- 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
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
|
|\ \
| |/
| |
| | |
GraphicsLayerAndroid::updateFixedPosition()"
|
| |
| |
| |
| |
| | |
Bug: 4461705
Change-Id: I0facda892e16e1b626964b032cf337c29f0d3364
|
| |
| |
| |
| | |
Change-Id: I4719283468ee78b7b57093147aec964ad8d90b99
|
|/
|
|
|
| |
bug:4473188
Change-Id: Idc34c3132d1f9eba23c6e4944c843c9c19c4dbb8
|
|
|
|
|
|
|
|
| |
Cherry pick of upstream http://trac.webkit.org/changeset/79988
Needed now due to FastAllocBase and Noncopyable changes in this
merge.
Change-Id: I26c91f7940b106db21e26c37507490acd1546cff
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
|
|
|
| |
Implement missing dataSize function introduced in
http://trac.webkit.org/changeset/76371 (JSC only)
Change-Id: Ie9a714cdb41894ceb2d928b6e42ed6a41d8d04a7
|
|
|
|
| |
Change-Id: I5b91decbd693ccbf5c1b8354b37cd68cc9a1ea53
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
|