| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=104538
Accelerated compositing was in some cases causing pixmaps to be
allocated that were larger than allowed. This patch changes the non GL
Texture Mapper to also using tiles, to ensure we don't try to allocate
invalid pixmaps.
Change-Id: I4e0681ec77a2868b2f61efecbf74aa1e1db8f652
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=106219
Correct the if condition when overwriting the layout direction option
with the values from the facade options to only overwrite if the facade
direction is not equal to LayoutDirectionAuto.
Reviewed by Allan Sandfeld Jensen.
* WidgetSupport/QStyleFacadeImp.cpp:
(WebKit::initGenericStyleOption):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@138946 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Change-Id: I95c3e73766ae9351ae24be0270054d318c1775f0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=105014
Reviewed by Allan Sandfeld Jensen.
Patch co-authored by Simon Hausmann.
Only copy the layout direction from the facade options if the
current option is Qt::LayoutDirectionAuto in order to prevent
misinterpretations as different layout direction when hit testing.
Tests added to tst_qwebview and tst_qgraphicswebview to verify
that the view actually is scrolled in the right direction.
* WidgetSupport/QStyleFacadeImp.cpp:
(WebKit::initGenericStyleOption):
* tests/qgraphicswebview/resources/scrolltest_page.html: Added.
* tests/qgraphicswebview/tst_qgraphicswebview.cpp:
(tst_QGraphicsWebView):
(tst_QGraphicsWebView::horizontalScrollbarTest):
* tests/qgraphicswebview/tst_qgraphicswebview.qrc:
* tests/qwebview/resources/scrolltest_page.html: Added.
* tests/qwebview/tst_qwebview.cpp:
(tst_QWebView):
(tst_QWebView::horizontalScrollbarTest):
* tests/qwebview/tst_qwebview.qrc:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@138933 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Change-Id: I3c8190858f4a0fcd0bf394056771f775677ba30e
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
sync and render.
https://bugs.webkit.org/show_bug.cgi?id=106018
Reviewed by Simon Hausmann.
The main and rendering threads are only guaranteed to be synchronised in
the updatePaintNode call. In every other cases, QQuickItems cannot be
safely accessed from the rendering thread.
Do as the first patch version in
https://bugs.webkit.org/show_bug.cgi?id=104574 was doing and copy the
ratio value directly to fix the issue.
Also add a note about the threading issue in QQuickWebPage::updatePaintNode.
* UIProcess/API/qt/qquickwebpage.cpp:
(QQuickWebPage::updatePaintNode):
* UIProcess/qt/QtWebPageSGNode.cpp:
(WebKit::QtWebPageSGNode::QtWebPageSGNode):
* UIProcess/qt/QtWebPageSGNode.h:
(QtWebPageSGNode):
(WebKit::QtWebPageSGNode::devicePixelRatio):
(WebKit::QtWebPageSGNode::setDevicePixelRatio):
Change-Id: Ie849f0f23ae9e017fcdce6326fb2126f3ad66248
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@138715 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
PageViewportController
https://bugs.webkit.org/show_bug.cgi?id=106355
Reviewed by Kenneth Rohde Christiansen.
This is a backport of http://trac.webkit.org/changeset/139189.
Since r137597 Qt uses the device pixel ratio of the underlying
platform window as the device pixel ratio in WebCore.
The tiles are rendered with the effective scale (scale adjusted with
the device scale factor) and the projection matrix is also adjusted
with the device pixel ratio when painting.
As a result we can follow the same approach as QtQuick and all the
coordinates in PageViewportController need to be in device independent
pixels (UI pixels) thus we do no longer need to adjust with the device
pixel ratio when calculating the viewport attributes.
This simplifies the logic significantly and increases robustness,
but does not allow to set a custom device pixel ratio different from
the factor of the underlying platform (eg. for testing purposes).
This patch is conceptually a follow-up of r137597 and fixes layout
and canvas size on retina display.
Change-Id: I2485ef0a4aa18726238bacddaa5176cf5869659e
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=104164
Reviewed by Simon Hausmann.
http://trac.webkit.org/changeset/136837
Source/WebCore:
Avoid using pkg-config on Mac, instead use direct
include paths and add needed libraries to the linker.
No new tests needed.
WebCore.pri:
Tools:
We should not use pkg-config on Mac instead use direct include
paths and add needed libraries to the linker options to detect
libxslt and libxml2 provided by the system.
Previously we would always fall back to qtxmlpatterns.
qmake/config.tests/libxml2/libxml2.pro:
qmake/config.tests/libxslt/libxslt.pro:
Change-Id: I2020c7cdce1f6c6217320b06b4571705eb8af769
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
or wrong position
https://bugs.webkit.org/show_bug.cgi?id=104414
Reviewed by Simon Hausmann.
When contents size changes, make sure to apply any pending position
change if possible.
This is a cherry-pick of http://trac.webkit.org/changeset/138149
that fixes a frequent positioning issue during navigation.
Change-Id: Ib535f8470b2b8994565d750af06ee535e4153c3c
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
property through JS after setting style font size.
https://bugs.webkit.org/show_bug.cgi?id=88866
Reviewed by Alexander Pavlov.
Source/WebCore:
StylePropertySet::fontValue always assumed that it was called using
style.font after a subsequent call which set the shorthand font. The
ASSERT_NOT_REACHED assumed that all longhands of the font shorthand not
set by the shorthand itself were set to initial. While it's true when
we set the font shorthand (i.e all longhands are set to implicit initial)
it is not true when you set the longhands individually. For example setting
font-size will not set other font properties to initial. It is the behavior of all
other shorthands in WebKit. When reconstructing the shorthand other
properties tests whether the value of each longhands is initial or not
(if not then we omit the value, as we should always construct the
shortest shorthand possible) or if the value is set or not (if set then
we include it in the shorthand if not then we omit it). The comment
removed was also talking about invalid font property potentially built
by fontValue(). So far appendFontLonghandValueIfExplicit will always
construct a valid value as it takes care of adding ' ' or '/' when
needed, so the return value is parsable and correct.
Test: fast/css/font-shorthand-from-longhands.html
* css/StylePropertySet.cpp:
(WebCore::StylePropertySet::appendFontLonghandValueIfExplicit):
(WebCore::StylePropertySet::fontValue):
* css/StylePropertySet.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@139313 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Change-Id: I46a4b1d023f3cb8f4e7b4c0b7f176b5b9f850870
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=106099
Patch by Jonathan Liu <net147@gmail.com> on 2013-01-05
Reviewed by Filip Pizlo.
The pow() workaround is no longer needed in the latest version
of MinGW-w64.
* wtf/MathExtras.h:
Change-Id: I0b52577a61734f130ab39d70d99e8cac9b58d9ba
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@138903 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=106105
Patch by Jonathan Liu <net147@gmail.com> on 2013-01-05
Reviewed by Simon Hausmann.
The isfinite and isinf functions are required by wtf_pow but
not defined until after wtf_pow. Move wtf_pow to after
"using std::isfinite" and "using std::isinf" to fix compilation.
* wtf/MathExtras.h:
(wtf_pow):
Change-Id: I40122dfe90460b5281da7a9fe628417805330e0d
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@138894 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=105925
Reviewed by Sam Weinig.
As suggested by Sam, move the MinGW-w64 workaround into MathExtras.h
away from the JSC usage.
Source/JavaScriptCore:
* runtime/MathObject.cpp:
(JSC::mathPow):
Source/WTF:
* wtf/MathExtras.h:
(wtf_pow):
Change-Id: I49b2365baae6fdd9700667d1ef53c78bd70f6de3
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@138705 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=104540
Patch by Simon Hausmann <simon.hausmann@digia.com>, Jedrzej Nowacki <jedrzej.nowacki@digia.com> on 2012-12-19
Reviewed by Kenneth Rohde Christiansen.
A data corruption exists in the QObject bridge when calling slots that
take a QVariant.
The calling convention for slots is that the void* parameter array must
contain pointers to the actually required destination argument type. If
a function takes an int for example, the corresponding entry in the
void* parameter array must be a pointer to an int that the moc
generated code then can "safely" cast to an int* and dereference.
Similarly if the function takes a QVariant it must be a pointer to a
QVariant.
We implement this calling convention by constructing QVariants of the
requested parameter types and passing the value of data() into the
void* parameter array. This works fine for all types except if the
requested type is a QVariant. In that case data() will _not_ return a
pointer that can later be safely casted to a QVariant pointer and
dereferenced. Instead we must use the address of our variant to ensure
a working cast.
Our auto tests cover this case, but they worked by accident because the
provided pointer when casted to a QVariant happens to have the correct
type id that doesn't produce the warning seen in the test case of the
provided example and the unit test just copies the QVariant and thus
pointer.
* bridge/qt/qt_runtime.cpp:
(JSC::Bindings::QtMethodMatchType::typeId): Replace string based meta
type id determination of QVariant with a quicker table lookup.
(JSC::Bindings::findMethodIndex): Remember the chosen (requested) types
and pass the pointer to the QVariant instead of its data() pointer if
requested.
(JSC::Bindings::QtRuntimeMethod::call): Fixed determination of whether
we need to convert a return value or not solely based on the return
type _specified_ in the meta method instead of the variant value
returned. The latter is not sufficient because a slot can return an
invalid variant, which is not the same as returning void. This was
triggered by an unit test that accidentally passed due to this memory
corruption in the first place.
Change-Id: Ie8ed983a7b7f530c038956c9f32eef3738a3cc9d
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@138247 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
|
|
|
|
|
|
|
| |
We had forgotten a few substitutions in the process it would seem.
Change-Id: I8f3cbe54ecdfb572614d9bbb0368189b7162d20c
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
JSC::JSCell::classInfo is defined inline in JSDestructibleObject.h but
not all the classes that that inherit directly from JSCell include
JSDestructibleObject.h.
Move JSC::JSCell::classInfo from JSDestructibleObject.h into JSObject.h
to resolve the undefined reference errors when compiling with MinGW-w64.
JSDestructibleObject.h is already removed upstream in SVN r128851 but
the commit has a lot of other changes which don't apply cleanly.
Task-number: QTBUG-27764
Change-Id: I75b13c93dd13a346e672ca76fd7b23a616653a79
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Alexey Pavlov <alexey.pawlow@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This issue is visible when loading the full-sized image in the
flickrview example by clicking on a thumbnail.
Because of css device adaptation the code already changed in
trunk somewhat but the issue is also visible there, both on
retina and non-retina displays.
The problem here is that the visible rect that is set in
WebPage::sendViewportAttributesChanged() is incorrect because
it includes a rounding error if dpr != 1.0 since the stored
viewport size has integer precision, additionally there is also
a dependency problem since the constructed visible rect does
not include the UI-side scale that might be applied later in
page viewport controller due to the changed attributes.
This is especially visible on Flickr since the full size images
are shown in an overlay and an invalid visible rect results in
wrong overlay size.
In trunk this codepath is also used by css device adaptation
thus we might need a more comprehensive fix there, but since
we currently do not support css device adaptation we can revert
http://trac.webkit.org/changeset/136231 in this branch.
The issue is tracked upstream on:
https://bugs.webkit.org/show_bug.cgi?id=104906
Change-Id: Ia451ee610795700b0d3d6455413b97b607e6fb32
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=105087
Patch by Jonathan Liu <net147@gmail.com> on 2012-12-17
Reviewed by Simon Hausmann.
The MinGW-w64 runtime has different behaviour for pow()
compared to other C runtimes. This results in the following
test262 tests failing with the latest MinGW-w64 runtime:
- S15.8.2.13_A14
- S15.8.2.13_A16
- S15.8.2.13_A20
- S15.8.2.13_A22
Handle the special cases that are different with MinGW-w64.
* runtime/MathObject.cpp:
(JSC::mathPow):
Change-Id: Ifad1aa24ac36f2d452e9166a4298525793597da3
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137895 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
| |
now being a proper qt module (by virtue of having load(qt_build_config)
in .qmake.conf), webkit gets the path setup goodies for free.
Change-Id: Ief00d234b0b21a136f5736e7f18440d63b1a8857
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
| |
qt is already added by spec_pre.prf, warn_on and depend_includepath by
default_pre.prf.
Change-Id: I4f02ef09f19cf0e4c7093f3fe30d5ca34daa194f
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=104574
Reviewed by Kenneth Rohde Christiansen.
Since HiDPI support has been added and enabled in Qt we ended up
painting incorrectly scaled content on high-resolution screens.
Because the intrinsic device pixel ratio is always taken into
account by Qt when painting to high-resolution screens we should
automatically obtain the scale ratio from the window in which the
item is rendered instead of setting it in QML.
Qt does not make it possible to override the device pixel ratio
of the native window, therefore our experimental QML API for setting
a custom value is of no use any more and should be removed.
This patch fixes the scaling issue on Mac retina display by querying
the underlying window for the device scale factor and applying it to
the backing store and the scene-graph rendering of the content node.
Additionally removes the experimental API and related API tests.
Change-Id: I04f23059147773ca279a89ae8976ccd3d9bef292
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137597 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Fixes:
-added \module for C++ classes and \qmlmodule for QML types
-added links to the Qt WebKit Examples pages
-fixed the qhp settings for Qt Creator
Task-number: QTBUG-28583
Task-number: QTBUG-28418
Task-number: QTBUG-27646
Change-Id: I883139f51f457bd6dc7bfe72bb53eb26771d2ccb
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Patch by Jerome Pasion <Jerome.Pasion@digia.com> on 2012-12-13
Reviewed by Simon Hausmann.
* Source/qtwebkit.qdocconf:
Change-Id: Ib441452feac169791857792b33d02a30240fa215
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137579 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
| |
* WebCore.pri:
Change-Id: I0671767aa4a167ef4c29b0cf80c49dd11b9ce714
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137452 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=104426
Patch by Jonathan Liu <net147@gmail.com> on 2012-12-10
Reviewed by Simon Hausmann.
The GC3Dintptr and GC3Dsizeiptr typedefs are incorrect for Win64 as
LLP64 is used there. This would result in compile error due to
narrowing conversion of 64-bit pointer to signed long int which is
32-bit.
* platform/graphics/GraphicsTypes3D.h:
Change-Id: I7da108634cebbfdb1c1b4aed485d10990c3ecaa9
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137129 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=104677
Reviewed by Simon Hausmann.
.:
Resources aren't transfered properly from a static WebCore to the final DLL
with MSVC since the linker only pick from the static lib symbols that
are referenced in the final binary.
Move the resource files directly to Qt5WebKit.dll to make sure that they are
available.
* Source/api.pri:
Source/WebCore:
* Target.pri:
Change-Id: I7cf1a830ee4482fc36a6e6c4115325c6c3b947b5
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137436 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Reviewed by Csaba Osztrogonác.
On Mac OS X we have sqlite as a system library available.
Source/WebCore:
* WebCore.pri:
Tools:
* qmake/mkspecs/features/features.prf:
Change-Id: I05cc38b0a80a3533b00b46ef5f830e6e5597cd49
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137446 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Reviewed by Csaba Osztrogonác.
Detect SQLite either through pkg-config, from the SQLITE3SRCDIR
environment variable or from qtbase via a qt5.git build. Bail out early
with an error message if neither option applies.
This removes the usage of $$QT.core.sources and the dependency on Qt's
system-sqlite configure setting. We should always favour a system
library over a copy in Qt.
Source/WebCore:
* Target.pri:
* WebCore.pri:
Tools:
* qmake/mkspecs/features/features.prf:
Change-Id: Ibd1149749ab3354d6cf8dd9ee22f264257f8f59c
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137444 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
| |
Change-Id: Icd9338cf5e0737e01eb283337443e368b378f289
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The patch made all checks for m_style->inherits("QMacStyle")
in the StyleFacadeImp fail.
This reverts commit 08d610737197b47bdfc7f78b0f712c337cc87286.
Change-Id: Ie3f4d1cadcf32a71935e87075fbaf48c66c82f5f
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
|
|
|
|
|
|
|
|
| |
getting rid of QT.<module>.sources references, as they don't go well
with real modularization.
Change-Id: Id13b53eaeb794287020985f12be58f2435ad2463
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
| |
Target.pri includes WebCore.pri the almost first thing, so that is
covered as well.
Change-Id: Ia150c1486f89094821498e87dfc18003c9424af5
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
| |
followup to https://bugs.webkit.org/show_bug.cgi?id=93446
Change-Id: Iff703e528d3bafc3fcc1c1df323d3fd5d98f342a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
don't load(moc) explicitly - turns out that this breaks
debug_and_release builds (the feature does not like being loaded before
default_post has been loaded).
so instead just do a minimal call to find the moc executable.
as it's in fact only two files which need it, so de-centralize this call
for the sake of saving some cpu cycles spent in qmake.
Change-Id: Ia0038f893c3931571e1494894bedcae85ebb4c8e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=104659
When drawing a texture to the TextureMapper the flag SupportsBlending
must be passed in order to allow for transparent webgl content.
We are doing this for GLX already, but the flag was still missing
in GraphicsSurfaceMac.
Reviewed by Kenneth Rohde Christiansen.
* platform/graphics/surfaces/mac/GraphicsSurfaceMac.cpp:
(WebCore::GraphicsSurface::platformPaintToTextureMapper):
Change-Id: I83ef9bc8e4525373e27c7bb43ff2d45c2b1944db
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137298 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=104560
Reviewed by Tor Arne Vestbø.
This creates issues with non-framework builds of Qt (necessary for debug-only
builds) since a Qt5 prefix is now added to the base target name.
* Source/api.pri:
Change-Id: Id2a7f867bafc2922579be46740857ff30f96acfa
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137162 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=103865
Based on patch by Pierre Rossi.
Extend the short static list to also include MIME types essential to WebKit,
and detect these first before checking the system mimedatabase.
Reviewed-by: jocelyn.turcotte@digia.com
Change-Id: Id61bd95ba0260855971c50c9dbdb435f221b21b1
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=104364
By removing all animations with the same name, it is not possible to
animate more than one property accelerated. Instead only remove any
animations with both same name and property.
Reviewed-by: Kenneth Christiansen
Change-Id: I831bad07519d19e441a5528ef575b639740c5eb2
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=104550
With Qt5 QPainter changed to using the raster engine.
Therefore we no longer have an NSGraphicsContext that we can
use for drawing video frames.
With this patch we are rendering the video frame into an image buffer
and then paint it manually using QPainter.
Reviewed by Simon Hausmann.
* platform/graphics/mac/MediaPlayerPrivateQTKit.mm:
(WebCore):
(WebCore::swapBgrToRgb):
Swap the color format from BGR to RGB,
since BGR is not supported by QImage.
(WebCore::MediaPlayerPrivateQTKit::paint):
Change-Id: I28462879baaa4c19b6fc642b38aadef5d9d3aa93
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137159 268f45cc-cd09-0410-ab3c-d52691b4dbf
Task-number: QTBUG-28361
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=104552
Reviewed by Jocelyn Turcotte.
Make sure to look for QtWebProcess.exe on Windows instead of QtWebProcess.
* Shared/qt/ProcessExecutablePathQt.cpp:
(WebKit::executablePath):
Change-Id: I5c4cfdca24fc7b54e36431f72f3b85cdae13c2f4
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137147 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=104541
Reviewed by Jocelyn Turcotte.
We now depend on a Qt 5 version that is guaranteed to have this API, so we
can remove the configure checks for it.
Source/WebKit2:
* PluginProcess.pro:
* Shared/qt/ProcessExecutablePathQt.cpp:
(WebKit::executablePath):
* WebProcess.pro:
Tools:
* qmake/config.tests/libexecdir/libexecdir.cpp: Removed.
* qmake/config.tests/libexecdir/libexecdir.pro: Removed.
* qmake/mkspecs/features/features.prf:
Change-Id: I58114d887072c1b08f2b3216f85d92a668bfe44b
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137145 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Unreviewed trivial build fix.
This function is defined in QtWebContext, which is only used when QtQuick2 is available.
* UIProcess/qt/WebContextQt.cpp:
(WebKit::WebContext::platformInvalidateContext):
Change-Id: I9a77012fb66fd2c11889e2b111f46ab11089df18
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137138 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=104425
Patch by Jonathan Liu <net147@gmail.com> on 2012-12-07
Reviewed by Kentaro Hara.
The header for the JSC::ArrayConstructor class is missing a forward
declaration for the JSC::ArrayAllocationProfile class which causes
compilation to fail when compiling with MinGW-w64.
* runtime/ArrayConstructor.h:
(JSC):
Change-Id: I33fc793e8af6be1445262fb2000157f8df1addf1
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137017 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=104424
Patch by Jonathan Liu <net147@gmail.com> on 2012-12-07
Reviewed by Laszlo Gombos.
JSC::CodeBlock::getJITType() has the const qualifier when JIT is
enabled but is missing the const qualifier when JIT is disabled.
* bytecode/CodeBlock.h:
(JSC::CodeBlock::getJITType):
Change-Id: I4ef9d10a536aa3094c9e814ee6bcbe1bf120829e
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137010 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=104134
Reviewed by Simon Hausmann.
Another issue introduced by r136235.
Fix the order of initialization of the styleFactory and creation of the
WebCore Page. Since the latter has a RenderTheme member and the creation
of the appropriate RenderTheme type (QStyle-backed) is dependant on having
first initialized the theme factory function, we need to postpone this just
a little bit.
* WebCoreSupport/QWebPageAdapter.cpp:
(QWebPageAdapter::QWebPageAdapter):
(QWebPageAdapter::initializeWebCorePage): Added.
* WebCoreSupport/QWebPageAdapter.h:
* WidgetApi/qwebpage.cpp:
(QWebPagePrivate::QWebPagePrivate): call initializeWebCorePage only after
having initialized WebKitWidgets related logic (QStyle hooks in this case).
Change-Id: I46bb066bbf4f5e4968bfdfb9def9ebcba6e02843
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@136842 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
|
|
|
|
| |
The current rendering would display the transient scrollbar on top of
an empty background area. To make it look decent, we force non
transient scrollbars through a style proxy.
Change-Id: I33cdf9b9bb91d635eb40242187f98dd84da1fb9a
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
https://bugs.webkit.org/show_bug.cgi?id=104116
This is a workaround for an issue in Qt that was
caused by Change-Id: I2000fa50d46b153e981ceafc12a53932a196382e
in qtbase.
Since we are drawing the scrollbars by ourselves, there is no
widget available that needs to be hidden by the style.
Therefore we have to disable transient scrollbar
animations on Mac.
Patch by: J-P Nurmi <jpnurmi@digia.com>
Reviewed by Simon Hausmann.
* WidgetSupport/QStyleFacadeImp.cpp:
(WebKit::QStyleFacadeImp::paintScrollBar):
Change-Id: Ia9ff6d6634aecfe574ba2842258fc003d4a5c665
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
securityOrigin().grantLoadLocalResources()
https://bugs.webkit.org/show_bug.cgi?id=68711
Reviewed by Adam Barth.
Source/WebCore:
It currently fails since Document::loader() will return 0 until
Frame::setDocument is called and we are doing this check before it happens.
Delay the check and let the FrameLoader take care of doing grantLoadLocalResources()
on the Document along with other header checks in FrameLoader::didBeginDocument.
* dom/Document.cpp:
(WebCore::Document::initSecurityContext):
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::didBeginDocument):
Source/WebKit/qt:
* tests/qwebpage/tst_qwebpage.cpp:
(tst_QWebPage::testStopScheduledPageRefresh): Unmark the expected failure.
Change-Id: Iec4f0106c42af572a1e4a8d352baa9d1a2fc8a1a
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@136404 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
| |
Change-Id: Ibe7ef6bc1ea6ef42fce09fe6c4b6d64ac9ae2e9a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
WebKit2 relies on the QWEBKIT_EXPORT macro from WebKit1 as well.
* Api/qwebkitglobal.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@136495 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Change-Id: Iadd377b766f7282688abaa6c51c94d486dbb8edd
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
We should test stable branches against stable branches only.
At some point we should automate the merges from dev->stable->release
and decide how to handle possible merge conflicts.
This is good enough for the time being.
Change-Id: Id73f76089a00a8066a5cd22d73febb26adb67671
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
enabling drag&drop
https://bugs.webkit.org/show_bug.cgi?id=103901
Setting the specific flag instead of resetting all the flags
when enabling QQuickItem::ItemAcceptsDrops.
This fixes clipping of the contents of QQuickWebView visible
in the flickrview example.
Change-Id: I64695c5954a3b04d70f9b6da6b1a57b14d3cdbc0
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@nokia.com>
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
|