| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|\ |
|
| |
| |
| | |
This reverts commit 8d0d3a015e5f96c7eb2101fba5abcdf76958ff41
|
|\ \
| |/ |
|
| |
| |
| |
| | |
Change-Id: I451b5a7560ca21d07a5b71e9a4c0eb4c15aab7a9
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Change-Id: I34534273f70c1fe32b83f994808de03616c85922
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
bypass proxy
Passing the extra string argument, blacklist, to the proxy in
chromium.
Need CL in frameworks/base:
https://android-git.corp.google.com/g/#change,112400
And external/chromium:
https://android-git.corp.google.com/g/#change,111832
Change-Id: Ie8ca84b5ebf9701391dbd8a5097638e24ac2cb85
|
|\ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| | |
Change-Id: I0e28ab1afcd98f01723730e84b51d43811baacc4
|
|/
|
|
| |
Change-Id: I554f12a3d1ee2baa04288467e6fd46b1cdce9f9c
|
|\
| |
| |
| | |
improves drawing performances on the base surface by a decent amount."
|
| |
| |
| |
| |
| |
| |
| | |
This improves drawing performances on the base surface by
a decent amount.
Change-Id: I59b63c0e5748eed2c729024c11a5da390faefda7
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
base/thread.h moved to base/threading/thread.h:
http://codereview.chromium.org/6028009
base/condition_variable.h base/lock.h moved to base/synchronization
and classes added to base namespace:
http://codereview.chromium.org/6018013
Change-Id: I74d14224d6b17df33bc1cc9a5521fd267f4e830c
|
|\ \ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Move check for pending style recalc
The previous implementation had no way to notify the caller as to
whether or not the recording was successful. Now, recordContent
detects the pending recalc and returns null to indicate that no
recording was done.
bug: 4474358
Change-Id: I511d6f1118c0a122ee893167311f3cc82f2cbf7e
|
|\ \ \ \
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
ChromeClient::selectItemAlignmentFollowsMenuWritingDirection()
See http://trac.webkit.org/changeset/76983
Change-Id: Ibf903baa41bc599ef99edb6ea26e3f62e9133c35
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
changed
See http://trac.webkit.org/changeset/77602
Change-Id: I3a0459dba328a57688a9a2a0ae6a8d7a9121e240
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
See http://trac.webkit.org/changeset/78261
Change-Id: I3514038557683146ace616982a0706b6c0fb1f95
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
See http://trac.webkit.org/changeset/76872
Change-Id: I54790419f4e3b7dcd1e6123d6ff4bda8d7997066
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
See http://trac.webkit.org/changeset/77963
Change-Id: I6bfe5d2412d99d2a187cc83f565a8eba6fe01267
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflict due to Android modifications to handle touch events.
See http://trac.webkit.org/changeset/76950
Change-Id: I499d66319614af4bc23f1c0f89f072b814503703
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
PCRE switched for YARR - http://trac.webkit.org/changeset/78042
Change-Id: Ie5090e0d7a174e3c2975b807d0b4769b15494156
|
| | | |
| | | |
| | | |
| | | | |
Change-Id: I6d3e5f1f868ec266a0aafdef66182ddc3f265dc1
|
|\ \ \ \
| |_|_|/
|/| | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This code is not needed since now fixed viewport is used for
all devices including phone.
issue: 4343683
Change-Id: I885eae15d30fc5f3f8f3855febc1d98cf6554c93
|
|\ \ \ \
| |/ / /
|/| | | |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The WebCore DatabaseTracker uses 'unsigned long long' for quotas. We
receive the new quota from Java as a jlong, which is 64bit signed.
This change ...
- Fixes the JNI methods to use 'long long'
- Updates m_newQuota to use 'unsigned long long' to avoid ugly casts
- Uses a boolean to track whether the new quota has been set yet,
which is neater than a magic value and avoids deadlock if a value of
-1 is set
Change-Id: Ieab200164baf8c1647a2d47da759d3c31f0369f8
|
|\ \ \ \
| | |/ /
| |/| |
| | | | |
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
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|