qt:qtwebkit.git
4 years agoFix undefined reference to JSC::JSCell::classInfo with MinGW-w64
Jonathan Liu [Sat, 15 Dec 2012 12:42:32 +0000 (23:42 +1100)]
Fix undefined reference to JSC::JSCell::classInfo with MinGW-w64

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>
4 years agoRevert r136231 to fix overlay size due to incorrect visible rect
Andras Becsi [Fri, 14 Dec 2012 13:44:51 +0000 (14:44 +0100)]
Revert r136231 to fix overlay size due to incorrect visible rect

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>
4 years agoFix Math.pow implementation with MinGW-w64
Jonathan Liu [Mon, 17 Dec 2012 12:15:57 +0000 (23:15 +1100)]
Fix Math.pow implementation with MinGW-w64
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>
4 years agorely on automatic output directory setup v5.0.0
Oswald Buddenhagen [Thu, 6 Dec 2012 14:43:39 +0000 (15:43 +0100)]
rely on automatic output directory setup

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>
4 years agoremove some unnecessary CONFIG additions
Oswald Buddenhagen [Fri, 14 Dec 2012 18:41:04 +0000 (19:41 +0100)]
remove some unnecessary CONFIG additions

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>
4 years agoFix linking of libraries with -Wl,-whole-archive
Jonathan Liu [Mon, 17 Dec 2012 10:31:25 +0000 (21:31 +1100)]
Fix linking of libraries with -Wl,-whole-archive
https://bugs.webkit.org/show_bug.cgi?id=104436

Patch by Jonathan Liu <net147@gmail.com> on 2012-12-17
Reviewed by Simon Hausmann.

If there is more than one library in LIBS linked with
-Wl,-whole-archive -l... -Wl,-no-whole-archive, qmake tries to
merge the duplicate flags in LIBS which causes linking to fail.

Add no_smart_library_merge to CONFIG to prevent the duplicate
flags from being removed when using -Wl,-whole-archive.

* qmake/mkspecs/features/functions.prf:

Change-Id: I9f5f8b0b59e143177ba2de6e37cfb760836c554b
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@137886 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years ago[Qt][WK2] Fix painting on Mac with retina display
Andras Becsi [Thu, 13 Dec 2012 19:15:30 +0000 (20:15 +0100)]
[Qt][WK2] Fix painting on Mac with retina display
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>
4 years agoDoc: Fixing Qt WebKit reference documentation.
Jerome Pasion [Thu, 13 Dec 2012 13:57:54 +0000 (14:57 +0100)]
Doc: Fixing Qt WebKit reference documentation.

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>
4 years agoFix missing doc dependency to examples
hausmann@webkit.org [Thu, 13 Dec 2012 10:56:09 +0000 (10:56 +0000)]
Fix missing doc dependency to examples

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>
4 years agoUnreviewed typo fix after r137446. v5.0.0-rc2
Csaba Osztrogonác [Wed, 12 Dec 2012 12:56:57 +0000 (12:56 +0000)]
Unreviewed typo fix after r137446.

* 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>
4 years agoFix GC3Dintptr and GC3Dsizeiptr typedefs for Win64
Jonathan Liu [Wed, 12 Dec 2012 12:55:01 +0000 (23:55 +1100)]
Fix GC3Dintptr and GC3Dsizeiptr typedefs for Win64
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>
4 years ago[Qt] Fix the inspector not showing up on Windows
jocelyn.turcotte [Wed, 12 Dec 2012 10:12:57 +0000 (10:12 +0000)]
[Qt] Fix the inspector not showing up on Windows
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>
4 years agoFix build on Mac
hausmann@webkit.org [Wed, 12 Dec 2012 11:21:53 +0000 (11:21 +0000)]
Fix build on Mac

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>
4 years agoFix linkage against SQLite https://bugs.webkit.org/show_bug.cgi?id=104781
hausmann@webkit.org [Wed, 12 Dec 2012 10:46:55 +0000 (10:46 +0000)]
Fix linkage against SQLite https://bugs.webkit.org/show_bug.cgi?id=104781

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>
4 years agoAdd unit tests for the CMake config files.
Stephen Kelly [Tue, 4 Dec 2012 16:02:39 +0000 (17:02 +0100)]
Add unit tests for the CMake config files.

Change-Id: Icd9338cf5e0737e01eb283337443e368b378f289
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoRevert "Use non transient scrollbars on Mac"
Eike Ziller [Tue, 11 Dec 2012 13:38:24 +0000 (14:38 +0100)]
Revert "Use non transient scrollbars on Mac"

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>
4 years agomake qtbase source requirement explicit
Oswald Buddenhagen [Fri, 7 Dec 2012 17:31:19 +0000 (18:31 +0100)]
make qtbase source requirement explicit

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>
4 years agomove SQLITE3SRCDIR assignment to only use site
Oswald Buddenhagen [Fri, 7 Dec 2012 17:25:03 +0000 (18:25 +0100)]
move SQLITE3SRCDIR assignment to only use site

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>
4 years agodelete dead include paths
Oswald Buddenhagen [Fri, 7 Dec 2012 16:15:37 +0000 (17:15 +0100)]
delete dead include paths

followup to https://bugs.webkit.org/show_bug.cgi?id=93446

Change-Id: Iff703e528d3bafc3fcc1c1df323d3fd5d98f342a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agochange setup of QMAKE_MOC
Oswald Buddenhagen [Thu, 6 Dec 2012 13:31:07 +0000 (14:31 +0100)]
change setup of QMAKE_MOC

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>
4 years ago[Qt][Mac] Fix transparency for WebGL content.
Zeno Albisser [Tue, 11 Dec 2012 13:47:37 +0000 (14:47 +0100)]
[Qt][Mac] Fix transparency for WebGL content.
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>
4 years ago[Qt] Remove the support for building a debug WebKit with a release Qt
jocelyn.turcotte [Mon, 10 Dec 2012 16:56:21 +0000 (16:56 +0000)]
[Qt] Remove the support for building a debug WebKit with a release Qt
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>
4 years ago[Qt] Don't rely on QMimeDatabase for essential MIME types
Allan Sandfeld Jensen [Mon, 10 Dec 2012 15:02:47 +0000 (16:02 +0100)]
[Qt] Don't rely on QMimeDatabase for essential MIME types

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>
4 years ago[TexMap] Can not do multiple accelerated animations
Allan Sandfeld Jensen [Mon, 10 Dec 2012 14:50:02 +0000 (15:50 +0100)]
[TexMap] Can not do multiple accelerated animations

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>
4 years ago[Qt] MediaPlayerQTKit broken after switching QPainter to raster engine.
Zeno Albisser [Mon, 10 Dec 2012 16:17:26 +0000 (17:17 +0100)]
[Qt] MediaPlayerQTKit broken after switching QPainter to raster engine.
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>
4 years agoFix QtWebProcess discovery on Windows https://bugs.webkit.org/show_bug.cgi?id=104552
Simon Hausmann [Mon, 10 Dec 2012 14:54:01 +0000 (14:54 +0000)]
Fix QtWebProcess discovery on Windows 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>
4 years agoUse QLibraryInfo::LibraryExecutablesPath unconditionally https://bugs.webkit.org...
Simon Hausmann [Mon, 10 Dec 2012 14:40:58 +0000 (14:40 +0000)]
Use QLibraryInfo::LibraryExecutablesPath unconditionally 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>
4 years agoFix build without QtQuick 2
Simon Hausmann [Mon, 10 Dec 2012 12:58:53 +0000 (12:58 +0000)]
Fix build without QtQuick 2

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>
4 years agoAdd missing forward declaration for JSC::ArrayAllocationProfile
commit-queue [Sat, 8 Dec 2012 05:35:51 +0000 (05:35 +0000)]
Add missing forward declaration for JSC::ArrayAllocationProfile
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>
4 years agoAdd missing const qualifier to JSC::CodeBlock::getJITType()
commit-queue [Sat, 8 Dec 2012 03:54:54 +0000 (03:54 +0000)]
Add missing const qualifier to JSC::CodeBlock::getJITType()
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>
4 years agoQWebView uses the mobile style and doesn't follow Qt's style
Pierre Rossi [Thu, 6 Dec 2012 15:01:28 +0000 (15:01 +0000)]
QWebView uses the mobile style and doesn't follow Qt's style
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>
4 years agoUse non transient scrollbars on Mac
Gabriel de Dietrich [Thu, 6 Dec 2012 15:58:30 +0000 (16:58 +0100)]
Use non transient scrollbars on Mac

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>
4 years ago[Qt][Mac] QWebView disappears when the system tries to hide the scrollbars. v5.0.0-rc1
Zeno Albisser [Wed, 5 Dec 2012 15:48:30 +0000 (16:48 +0100)]
[Qt][Mac] QWebView disappears when the system tries to hide the scrollbars.
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>
4 years agoDocument::initSecurityContext() fails to call securityOrigin().grantLoadLocalResources()
Jocelyn Turcotte [Tue, 4 Dec 2012 15:44:48 +0000 (16:44 +0100)]
Document::initSecurityContext() fails to call 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>
4 years agoFix links in Qt WebKit and Qt WebKit Widget documentation
Paul Olav Tvete [Tue, 4 Dec 2012 14:54:19 +0000 (15:54 +0100)]
Fix links in Qt WebKit and Qt WebKit Widget documentation

Change-Id: Ibe7ef6bc1ea6ef42fce09fe6c4b6d64ac9ae2e9a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years ago[Qt] Yet another unreviewed speculative windows build fix.
Pierre Rossi [Tue, 4 Dec 2012 13:27:24 +0000 (14:27 +0100)]
[Qt] Yet another unreviewed speculative windows build fix.

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>
4 years agosync.profile: Point dependencies to 'refs/heads/stable'
Sergio Ahumada [Tue, 4 Dec 2012 10:37:40 +0000 (11:37 +0100)]
sync.profile: Point dependencies to 'refs/heads/stable'

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>
4 years ago[Qt][WK2] Do not override previously set flags of QQuickWebView when enabling drag...
Andras Becsi [Tue, 4 Dec 2012 12:36:54 +0000 (13:36 +0100)]
[Qt][WK2] Do not override previously set flags of QQuickWebView when 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>
4 years agoUnreviewed, rolling out r136119.
Simon Hausmann [Tue, 4 Dec 2012 04:19:54 +0000 (05:19 +0100)]
Unreviewed, rolling out r136119.
http://trac.webkit.org/changeset/136119
https://bugs.webkit.org/show_bug.cgi?id=100964

We decided to restore previous default behaviour

* UIProcess/API/qt/qquickwebview.cpp:
(QQuickWebViewFlickablePrivate::handleMouseEvent):
* UIProcess/API/qt/qquickwebview_p_p.h:
(QQuickWebViewFlickablePrivate):

Change-Id: I8b8696e6de8f771a0985b487eb383115a5db6867
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
4 years agoFix an obvious blunder in the export macros.
Pierre Rossi [Tue, 4 Dec 2012 00:53:39 +0000 (01:53 +0100)]
Fix an obvious blunder in the export macros.

For good measure, let's clean that up.

Change-Id: Ia45bea7701b5dc77979463ea97bdbbb5de8c15df
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
4 years agoDoc fixes
Pierre Rossi [Mon, 3 Dec 2012 16:20:38 +0000 (17:20 +0100)]
Doc fixes

Let's try to be compliant with the Qt5 approach.

Change-Id: Ib5bc5500a6d8c916f4cc165b637eb493b7409bd0
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
4 years ago[Qt] Use a separate QWEBKITWIDGETS_EXPORT macro for WebKitWidgets
Pierre Rossi [Mon, 3 Dec 2012 14:16:56 +0000 (15:16 +0100)]
[Qt] Use a separate QWEBKITWIDGETS_EXPORT macro for WebKitWidgets

https://bugs.webkit.org/show_bug.cgi?id=103844

Patch by Pierre Rossi <pierre.rossi@digia.com> on 2012-12-03
Reviewed by Simon Hausmann.

Let's follow the common practice and have one export macro per library.
We can't rely on BUILDING_WEBKIT anymore in that case, so we use the
qmake defines instead.

* Api/qwebkitglobal.h: Updated the import/export logic.
* WidgetApi/qgraphicswebview.h: s/QWEBKIT/QWEBKITWIDGETS/
* WidgetApi/qwebframe.h: Ditto.
* WidgetApi/qwebinspector.h: Ditto.
* WidgetApi/qwebpage.h: Ditto.
* WidgetApi/qwebview.h: Ditto.
* WidgetSupport/InitWebKitQt.cpp:
(WebKit::initializeWebKitWidgets): use QWEBKITWIDGETS_EXPORT.
* WidgetSupport/InitWebKitQt.h:
(WebKit): Ditto.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@136394 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Change-Id: I0030f2f17cddd66aedf24f29323579174e838303
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
4 years agoRe-enable LLInt on mac with the proper fix
Pierre Rossi [Sat, 1 Dec 2012 01:11:16 +0000 (02:11 +0100)]
Re-enable LLInt on mac with the proper fix

Also update the Changelog for the PluginProcess change to try and
be in line with what happened in trunk.

Change-Id: I50445af940080abcab523b158d90af4f012f812f
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
4 years agoCan't think of a reason why PluginProcess depends on webkitwidgets
Pierre Rossi [Fri, 30 Nov 2012 22:18:49 +0000 (23:18 +0100)]
Can't think of a reason why PluginProcess depends on webkitwidgets

s/webkitwidgets/webkit/

Change-Id: Ifc33203d9d31d214f8b061ca8c86bfe480fdaf55
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
4 years agoMy nemesis: counting matching brackets...
Pierre Rossi [Fri, 30 Nov 2012 21:27:39 +0000 (22:27 +0100)]
My nemesis: counting matching brackets...

Change-Id: Ia36062f80d3df8cf2d00108d244f8ee800f2d39d
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
4 years agoDisable LLInt on Mac as a temporary measure.
Pierre Rossi [Fri, 30 Nov 2012 20:42:45 +0000 (21:42 +0100)]
Disable LLInt on Mac as a temporary measure.

We can always enable it again a later point: it's just an implementation detail.

Change-Id: If6035369a193f35efde77826acb658dc6409d157
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
4 years agoIntroduce setTextSizeMultiplier in the page adapter as well.
Pierre Rossi [Fri, 30 Nov 2012 17:57:39 +0000 (17:57 +0000)]
Introduce setTextSizeMultiplier in the page adapter as well.

As it turns out it the bots didn't like the previous attempt.

* WebCoreSupport/QWebFrameAdapter.cpp:
(QWebFrameAdapter::setTextSizeMultiplier):
* WebCoreSupport/QWebFrameAdapter.h:
* WidgetApi/qwebframe.cpp:
(QWebFrame::setTextSizeMultiplier):

Change-Id: If8c977b8134e88f3e5c3707ce7d19df8eb279304
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@136252 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
4 years agoUnreviewed build fix.
Pierre Rossi [Fri, 30 Nov 2012 17:57:18 +0000 (17:57 +0000)]
Unreviewed build fix.

Include PlatformExportMacros proper.
Now it builds on the MIPS Bot ;)

* WebCoreSupport/QtPrintContext.h:

Change-Id: I0f2d5ccba28c1f40437a792c8a05b6532b9b768d
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@136251 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com>
4 years agoUnreviewed trivial Qt build fix:
Simon Hausmann [Fri, 30 Nov 2012 17:06:40 +0000 (17:06 +0000)]
Unreviewed trivial Qt build fix:

Always link against WebProcess against QT += webkit and use webkitwidgets only if available.

* WebProcess.pro:

Change-Id: I6cae343601a7ac34265d4eeb31aeb4d6dba42373
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@136247 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoUnreviewed prospective MIPS build fix:
Simon Hausmann [Fri, 30 Nov 2012 16:25:13 +0000 (17:25 +0100)]
Unreviewed prospective MIPS build fix:

Explicitly include PlatformExportMacros for the correct export macro to be find.
Not really MIPS specific but rather to a minimal build configuration with less implicit
includes.

* WebCoreSupport/UndoStepQt.h:

Change-Id: I8121b0b4c9396269149404539e03f68f74392263
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoCrash in conversion of empty OpaqueJSString to Identifier
Simon Hausmann [Fri, 30 Nov 2012 16:01:47 +0000 (17:01 +0100)]
Crash in conversion of empty OpaqueJSString to Identifier
https://bugs.webkit.org/show_bug.cgi?id=101867

Patch by Allan Sandfeld Jensen <allan.jensen@digia.com> on 2012-11-30
Reviewed by NOBODY (OOPS!).

The constructor call used for both null and empty OpaqueJSStrings results
in an assertion voilation and crash. This patch instead uses the Identifier
constructors which are specifically for null and empty Identifier.

* API/OpaqueJSString.cpp:
(OpaqueJSString::identifier):

Change-Id: Ia685336d1310be99425d1f80ec29ed0020084061
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoFixed compilation of MiniBrowser.
Samuel Rødal [Fri, 30 Nov 2012 13:10:34 +0000 (14:10 +0100)]
Fixed compilation of MiniBrowser.

Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Change-Id: I68399dd39c6dc0caa2df7bbee2d95e8d6d281b6e
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoFixed use of to-be-removed compatibility functions in QWindow.
Samuel Rødal [Fri, 30 Nov 2012 12:41:28 +0000 (13:41 +0100)]
Fixed use of to-be-removed compatibility functions in QWindow.

Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Change-Id: I4a2da2a0e9b207c3dfcada0c4e56e7404f838857
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoFix qhp generation for webkit
Lars Knoll [Fri, 30 Nov 2012 09:44:19 +0000 (10:44 +0100)]
Fix qhp generation for webkit

Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Change-Id: I8b9af00838eaf22c2cbd0c9c5c1c634f0ad6414a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoFix compilation
Lars Knoll [Fri, 30 Nov 2012 09:09:34 +0000 (10:09 +0100)]
Fix compilation

QWindow::pos() is not called position()

Change-Id: Id55c0411dc9c46560440c6682040cf76353747ed
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoImported WebKit commit 6a4a1d32e1d779548c726c4826cba9d69eb87601 (http://svn.webkit...
Simon Hausmann [Fri, 30 Nov 2012 15:58:06 +0000 (16:58 +0100)]
Imported WebKit commit 6a4a1d32e1d779548c726c4826cba9d69eb87601 (svn.webkit.org/repository/webkit/trunk@136242)

Final import for the Qt 5.x series that implements the QtWebKit / QtWebKitWidgets split

Extra fixes will be cherry-picked.

Change-Id: I844f1ebb99c6d6b75db31d6538c2acd628e79681
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoFixed compilation of MiniBrowser.
Samuel Rødal [Fri, 30 Nov 2012 13:10:34 +0000 (14:10 +0100)]
Fixed compilation of MiniBrowser.

Change-Id: Iee9d3ae45a218c7cd846f3789d70605b63a383d2
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoFixed use of to-be-removed compatibility functions in QWindow.
Samuel Rødal [Fri, 30 Nov 2012 12:41:28 +0000 (13:41 +0100)]
Fixed use of to-be-removed compatibility functions in QWindow.

Change-Id: Ie040e30ef778aa3e8eb6e73e003ddf413c1a6f76
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoFix qhp generation for webkit
Lars Knoll [Fri, 30 Nov 2012 09:44:19 +0000 (10:44 +0100)]
Fix qhp generation for webkit

Change-Id: Ifbcb38bfb394c820e71da309dd84959bc399fcc4
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoFix compilation
Lars Knoll [Fri, 30 Nov 2012 09:09:34 +0000 (10:09 +0100)]
Fix compilation

QWindow::pos() is not called position()

Change-Id: I0c3703b39bdf22918aba0a309ca8805e4036dfd8
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
4 years agoImported WebKit commit c60cfe0fc09efd257aa0111d7b133b02deb8a63e (http://svn.webkit...
Simon Hausmann [Thu, 29 Nov 2012 11:18:48 +0000 (12:18 +0100)]
Imported WebKit commit c60cfe0fc09efd257aa0111d7b133b02deb8a63e (svn.webkit.org/repository/webkit/trunk@136119)

New snapshot that includes the fix for installing the QtWebProcess into libexec

Change-Id: I01344e079cbdac5678c4cba6ffcc05f4597cf0d7
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoImported WebKit commit 3fb8681126c4ed0f58d5d3656a4d72ae548a0815 (http://svn.webkit...
Simon Hausmann [Mon, 26 Nov 2012 11:10:56 +0000 (12:10 +0100)]
Imported WebKit commit 3fb8681126c4ed0f58d5d3656a4d72ae548a0815 (svn.webkit.org/repository/webkit/trunk@135701)

New snapshot with prospective no-widgets build fix

Change-Id: I4820c887d991c973cfed023518f41809edeefa83
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoImported WebKit commit 76dac539db7ece7079963adfcfe878d8e2f7d861 (http://svn.webkit...
Simon Hausmann [Mon, 26 Nov 2012 10:37:00 +0000 (11:37 +0100)]
Imported WebKit commit 76dac539db7ece7079963adfcfe878d8e2f7d861 (svn.webkit.org/repository/webkit/trunk@135696)

New snapshot that fixes build after QMacStyle removal

Change-Id: Idea95c96c73b49158d52861db2a4b8d2c51766b0
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoImported WebKit commit 8eb048315f36fa33731f28694630fe4a3c2cbc99 (http://svn.webkit...
Simon Hausmann [Fri, 23 Nov 2012 14:08:59 +0000 (15:08 +0100)]
Imported WebKit commit 8eb048315f36fa33731f28694630fe4a3c2cbc99 (svn.webkit.org/repository/webkit/trunk@135602)

New snapshot that fixes various bugs

Change-Id: Icb6ce541a26a9f500d087821ce4b83a8d8a5474a
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
4 years agoImported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (http://svn.webkit...
Simon Hausmann [Thu, 22 Nov 2012 08:09:45 +0000 (09:09 +0100)]
Imported WebKit commit e89504fa9195b2063b2530961d4b73dd08de3242 (svn.webkit.org/repository/webkit/trunk@135485)

Change-Id: I03774e5ac79721c13ffa30d152537a74d0b12e66
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
5 years ago2012-11-09 Simon Hausmann <simon.hausmann@digia.com>
Simon Hausmann [Fri, 9 Nov 2012 12:42:18 +0000 (13:42 +0100)]
2012-11-09  Simon Hausmann  <simon.hausmann@digia.com>

        Prospective fix for arm cross-compilation on Linux: Don't check for libudev if
        Qt is configured _not_ to use pkg-config, similar to what we do for gstreamer
        a few lines above.

        * qmake/mkspecs/features/features.prf:

5 years ago[Qt] Fix the LLINT build from ARMv7 platform
Csaba Osztrogonác [Fri, 9 Nov 2012 08:40:10 +0000 (08:40 +0000)]
[Qt] Fix the LLINT build from ARMv7 platform
https://bugs.webkit.org/show_bug.cgi?id=101712

Reviewed by Simon Hausmann.

Enable generating of LLIntAssembly.h on ARM platforms.

* DerivedSources.pri:
* JavaScriptCore.pro:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@134025 268f45cc-cd09-0410-ab3c-d52691b4dbfc

5 years agoImported WebKit commit e2c32e2f53e02d388e70b9db88b91d8d9d28fc84 (http://svn.webkit...
Simon Hausmann [Fri, 9 Nov 2012 11:15:52 +0000 (12:15 +0100)]
Imported WebKit commit e2c32e2f53e02d388e70b9db88b91d8d9d28fc84 (svn.webkit.org/repository/webkit/trunk@133952)

Revert back to an older snapshot that should build on ARM

5 years agoWorkaround: Disable JIT on ARM/MIPS due to compile issues
Simon Hausmann [Fri, 9 Nov 2012 09:59:16 +0000 (10:59 +0100)]
Workaround: Disable JIT on ARM/MIPS due to compile issues

5 years agoAdd version file
Simon Hausmann [Fri, 9 Nov 2012 09:02:25 +0000 (10:02 +0100)]
Add version file

5 years agoImported WebKit commit 7bcdfab9a40db7d16b4b95bb77d78b8a59c9e701 (http://svn.webkit...
Simon Hausmann [Fri, 9 Nov 2012 08:42:44 +0000 (09:42 +0100)]
Imported WebKit commit 7bcdfab9a40db7d16b4b95bb77d78b8a59c9e701 (svn.webkit.org/repository/webkit/trunk@134025)

New snapshot with numerious build fixes, including MSVC 2012 and ARM Thumb-2.

5 years agoImported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (http://svn.webkit...
Simon Hausmann [Wed, 7 Nov 2012 10:22:47 +0000 (11:22 +0100)]
Imported WebKit commit 20271caf2e2c016d5cef40184cddeefeac4f1876 (svn.webkit.org/repository/webkit/trunk@133733)

New snapshot that contains all previous fixes as well as build fix for latest QtMultimedia API changes.

5 years agoFix build of modules depending on QtWebKit when using prefix https://bugs.webkit...
hausmann@webkit.org [Wed, 7 Nov 2012 09:32:33 +0000 (09:32 +0000)]
Fix build of modules depending on QtWebKit when using prefix https://bugs.webkit.org/show_bug.cgi?id=101437

Patch by Oswald Buddenhagen <oswald.buddenhagen@nokia.com> on 2012-11-07
Reviewed by Simon Hausmann.

.:

.qmake.conf loads qt_build_config.prf, which nowadays is responsible for
adding the path to .qmake.super (before it was done by default_pre.prf,
so having setting the path in our default_pre wrapper was sufficient).

* .qmake.conf:

Tools:

Remove setting of MODULE_QMAKE_OUTDIR from here, it's been moved to .qmake.conf.

* qmake/mkspecs/features/default_pre.prf:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@133730 268f45cc-cd09-0410-ab3c-d52691b4dbfc

5 years ago2012-11-05 Simon Hausmann <simon.hausmann@digia.com>
Simon Hausmann [Mon, 5 Nov 2012 09:50:10 +0000 (10:50 +0100)]
2012-11-05  Simon Hausmann  <simon.hausmann@digia.com>

        Unreviewed: Add module dependencies required for Qt CI builds

5 years ago2012-11-05 Simon Hausmann <simon.hausmann@digia.com>
Simon Hausmann [Mon, 5 Nov 2012 08:27:14 +0000 (09:27 +0100)]
2012-11-05  Simon Hausmann  <simon.hausmann@digia.com>

        Unreviewed prospective build fix on Windows with namespaced Qt builds

        * platform/graphics/qt/GraphicsContextQt.cpp:
        * platform/graphics/qt/ImageQt.cpp:

5 years ago[Qt] Fix build on Windows when Qt is configured with -release
Simon Hausmann [Fri, 2 Nov 2012 11:25:24 +0000 (12:25 +0100)]
[Qt] Fix build on Windows when Qt is configured with -release
https://bugs.webkit.org/show_bug.cgi?id=101041

Reviewed by Jocelyn Turcotte.

When Qt is configured with -debug or -release, the release/debug build of for example
QtCore is not available by default. For LLIntExtractor we always need to build debug
_and_ release versions, but we do not actually need any Qt libraries nor qtmain(d).lib.
Therefore we can disable all these features but need to keep $$QT.core.includes in the
INCLUDEPATH for some defines from qglobal.h.

* LLIntOffsetsExtractor.pro:

5 years ago[Qt] Fix the LLInt build on Windows
Simon Hausmann [Thu, 25 Oct 2012 13:26:28 +0000 (15:26 +0200)]
[Qt] Fix the LLInt build on Windows
https://bugs.webkit.org/show_bug.cgi?id=97648

Reviewed by NOBODY (OOPS!).

Source/JavaScriptCore:

The main change for the port on Windows is changing the way offsets are extracted
and the LLIntAssembly.h is generated to accomodate release and debug configurations.

Firstly the LLIntOffsetsExtractor binary is now built as-is (no DESTDIR set) and
placed into debug\LLIntOffsetsExtractor.exe and release\LLIntOffsetsExtractor.exe
on Windows debug_and_release builds. On other patforms it remainds in the regular
out directory.

Secondly the LLIntAssembly.h files must be different for different build types,
so the LLIntAssembly.h generator in DerivedSources.pri operates no on the extractor
binary files as input. Using a simple exists() check we verify the presence of either
a regular, a debug\LLIntOffsetsExtractor and a release\LLIntOffsetsExtractor binary
and process all of them. The resulting assembly files consequently end up in
generated\debug\LLIntAssembly.h and generated\release\LLIntAssembly.h.

In Target.pri we have to also make sure that those directories are in the include
path according to the release or debug configuration.

Lastly a small tweak in the LLIntOffsetsExtractor build was needed to make sure that
we include JavaScriptCore/config.h instead of WTF/config.h, required to fix the build
issues originally pasted in bug #97648.

* DerivedSources.pri:
* JavaScriptCore.pro:
* LLIntOffsetsExtractor.pro:
* Target.pri:

Tools:

Added EXEEXT variable - similar to automake - that expands to .exe as suffix for
executable programs on Windows. Empty otherwise.

* qmake/mkspecs/features/default_pre.prf:

5 years ago[WIN] Make LLInt offsets extractor work on Windows
Simon Hausmann [Thu, 25 Oct 2012 11:42:44 +0000 (13:42 +0200)]
[WIN] Make LLInt offsets extractor work on Windows
https://bugs.webkit.org/show_bug.cgi?id=100369

Reviewed by NOBODY (OOPS!).

Open the input file explicitly in binary mode to prevent ruby/Windows from thinking that
it's a text mode file that needs even new line conversions. The binary mode parameter is
ignored on other platforms.

* offlineasm/offsets.rb:

5 years ago2012-10-25 Simon Hausmann <simon.hausmann@digia.com>
Simon Hausmann [Thu, 25 Oct 2012 11:41:05 +0000 (13:41 +0200)]
2012-10-25  Simon Hausmann  <simon.hausmann@digia.com>

        LLInt C_Loop build is broken
        https://bugs.webkit.org/show_bug.cgi?id=100364

        Reviewed by NOBODY (OOPS!).

        Workaround for gotos that don't compile in the c-loop back-end
        as well as without computed gotos.

        * llint/LowLevelInterpreter.asm:

5 years agoImported WebKit commit 7136c2962f51f9ea361d9796b069374d0f41c922 (http://svn.webkit...
Simon Hausmann [Tue, 23 Oct 2012 13:19:45 +0000 (15:19 +0200)]
Imported WebKit commit 7136c2962f51f9ea361d9796b069374d0f41c922 (svn.webkit.org/repository/webkit/trunk@132195)

Build fix for Windows when building against Qt that was built without Angle support

5 years agoImported WebKit commit 20434eb8eb95065803473139d8794e98a7672f75 (http://svn.webkit...
Simon Hausmann [Tue, 23 Oct 2012 08:25:11 +0000 (10:25 +0200)]
Imported WebKit commit 20434eb8eb95065803473139d8794e98a7672f75 (svn.webkit.org/repository/webkit/trunk@132191)

New snapshot that should fix build with latest qtbase and the QPlastiqueStyle removal

5 years agoImported WebKit commit 302e7806bff028bd1167a1ec7c86a1ee00ecfb49 (http://svn.webkit...
Simon Hausmann [Mon, 22 Oct 2012 13:40:17 +0000 (15:40 +0200)]
Imported WebKit commit 302e7806bff028bd1167a1ec7c86a1ee00ecfb49 (svn.webkit.org/repository/webkit/trunk@132067)

New snapshot that fixes build without QtWidgets

5 years agoImported WebKit commit a1c73566da3265b6c5dc815a24b0e5ab02d2c885 (http://svn.webkit...
Simon Hausmann [Thu, 18 Oct 2012 12:10:51 +0000 (14:10 +0200)]
Imported WebKit commit a1c73566da3265b6c5dc815a24b0e5ab02d2c885 (svn.webkit.org/repository/webkit/trunk@131728)

New snapshot with a better fix for the out-of-memory at link time situation.

5 years agoImported WebKit commit 795dcd25a9649fccaf1c9b685f6e2ffedaf7e620 (http://svn.webkit...
Simon Hausmann [Thu, 18 Oct 2012 08:55:06 +0000 (10:55 +0200)]
Imported WebKit commit 795dcd25a9649fccaf1c9b685f6e2ffedaf7e620 (svn.webkit.org/repository/webkit/trunk@131718)

New snapshot that includes the return of -fkeep-memory at link time
to reduce memory pressure as well as modularized documentation

5 years agoImported WebKit commit 1c7599f73436ecb2698a11da04cc711c614ef374 (http://svn.webkit...
Simon Hausmann [Wed, 17 Oct 2012 15:01:43 +0000 (17:01 +0200)]
Imported WebKit commit 1c7599f73436ecb2698a11da04cc711c614ef374 (svn.webkit.org/repository/webkit/trunk@131596)

New snapshot with incremental build fix (that might also have broken make install)

5 years agoImported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit...
Simon Hausmann [Wed, 17 Oct 2012 14:21:14 +0000 (16:21 +0200)]
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (svn.webkit.org/repository/webkit/trunk@131592)

New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes

5 years agoEnable use of more AllInOne files https://bugs.webkit.org/show_bug.cgi?id=99579
commit-queue@webkit.org [Wed, 17 Oct 2012 10:46:48 +0000 (10:46 +0000)]
Enable use of more AllInOne files https://bugs.webkit.org/show_bug.cgi?id=99579

Patch by Simon Hausmann <simon.hausmann@digia.com> on 2012-10-17
Reviewed by Tor Arne Vestbø.

The AllInOne files reduce pressure during final link time because the object files contain less duplicated
symbols.

* Target.pri: Add HTMLElementsAllInOne, EditingAllInOne and RenderingAllInOne to the build
* editing/EditingAllInOne.cpp: Place a #if USE(CF) around the inclusion of SmartReplaceCF.cpp
* html/HTMLElementsAllInOne.cpp: Move HTMLPlugInElement.cpp to the top to fix builds on X11 based platforms
where the X headers get confused by the "Region" type that's also declared in WebCore.
* rendering/RenderingAllInOne.cpp: Fix build on case-sensitive file systems (Plugin -> PlugIn) and added a
#if PLATFORM(WIN) around the inclusion of RenderThemeWin.cpp.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@131582 268f45cc-cd09-0410-ab3c-d52691b4dbfc

5 years agoSource/WebKit2: [Qt] Use qInstallMessageHandler() https://bugs.webkit.org/show_bug...
commit-queue [Fri, 28 Sep 2012 10:35:11 +0000 (10:35 +0000)]
Source/WebKit2: [Qt] Use qInstallMessageHandler() https://bugs.webkit.org/show_bug.cgi?id=96648

Patch by Kai Koehne <kai.koehne@digia.com> on 2012-09-28
Reviewed by Jocelyn Turcotte.

qInstallMsgHandler() got deprecated in Qt 5.

* PluginProcess/qt/PluginProcessMainQt.cpp:
(WebKit::messageHandler):
(WebKit::PluginProcessMain):
* UIProcess/API/qt/tests/util.cpp:
(messageHandler):
(suppressDebugOutput):
* qt/MainQt.cpp:
(messageHandler):
(main):

Tools: [Qt] Use qInstallMessageHandler()
https://bugs.webkit.org/show_bug.cgi?id=96648

Patch by Kai Koehne <kai.koehne@digia.com> on 2012-09-28
Reviewed by Jocelyn Turcotte.

qInstallMsgHandler() got deprecated in Qt 5.

* DumpRenderTree/qt/DumpRenderTreeMain.cpp:
(messageHandler):
(main):
* WebKitTestRunner/qt/main.cpp:
(messageHandler):
(main):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@129870 268f45cc-cd09-0410-ab3c-d52691b4dbfc

5 years agoRevert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn...
Simon Hausmann [Tue, 16 Oct 2012 12:56:46 +0000 (14:56 +0200)]
Revert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (svn.webkit.org/repository/webkit/trunk@131300)"

This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78.

Caused OOM issues on some CI machines :(

5 years agoCherry-pick hot-fix from upstream: Load qt_build_config in top-level .qmake.cache
Simon Hausmann [Tue, 16 Oct 2012 10:15:20 +0000 (12:15 +0200)]
Cherry-pick hot-fix from upstream: Load qt_build_config in top-level .qmake.cache
to fix silent builds

5 years agoUnreviewed prospective fix to silence the clang used in the Qt CI
Simon Hausmann [Tue, 16 Oct 2012 09:13:59 +0000 (11:13 +0200)]
Unreviewed prospective fix to silence the clang used in the Qt CI

5 years agoImported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit...
Simon Hausmann [Mon, 15 Oct 2012 14:08:57 +0000 (16:08 +0200)]
Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (svn.webkit.org/repository/webkit/trunk@131300)

WebKit update which introduces the QtWebKitWidgets module that contains the WK1
widgets based API. (In fact it renames QtWebKit to QtWebKitWidgets while we're
working on completing the entire split as part of
https://bugs.webkit.org/show_bug.cgi?id=99314

5 years agoImported WebKit commit c596dd7f03007fa7ed896b928106497e8784b3b5 (http://svn.webkit...
Simon Hausmann [Wed, 26 Sep 2012 08:42:44 +0000 (10:42 +0200)]
Imported WebKit commit c596dd7f03007fa7ed896b928106497e8784b3b5 (svn.webkit.org/repository/webkit/trunk@129610)

New snapshot that removes QtQuick1 support (to be moved into QtQuick1 module)

5 years agoImported WebKit commit ce614b0924ba46f78d4435e28ff93c8525fbb7cc (http://svn.webkit...
Simon Hausmann [Tue, 25 Sep 2012 11:02:02 +0000 (13:02 +0200)]
Imported WebKit commit ce614b0924ba46f78d4435e28ff93c8525fbb7cc (svn.webkit.org/repository/webkit/trunk@129485)

New snapshot that includes MingW build fixes

5 years agoImported WebKit commit 6339232fec7f5d9984a33388aecfd2cbc7832053 (http://svn.webkit...
Simon Hausmann [Mon, 24 Sep 2012 11:09:44 +0000 (13:09 +0200)]
Imported WebKit commit 6339232fec7f5d9984a33388aecfd2cbc7832053 (svn.webkit.org/repository/webkit/trunk@129343)

New snapshot with build fixes for latest qtbase

5 years ago[Qt] Re-fix clean builds
Simon Hausmann [Fri, 21 Sep 2012 09:51:57 +0000 (11:51 +0200)]
[Qt] Re-fix clean builds

Reviewed by NOBODY (OOPS!).

Re-introduce the sanitization for LIBS when creating a module to use
LIBS_PRIVATE and otherwise do _not_ use LIBS_PRIVATE. We decided to
continue to use QT, LIBS and PKGCONFIG instead of their _PRIVATE variants
throughout the code base, so just using LIBS_PRIVATE in linkAgainstLibrary()
causes build issues when depending system libraries end up in LIBS before
LIBS_PRIVATE.

* qmake/mkspecs/features/default_post.prf:
* qmake/mkspecs/features/functions.prf:

5 years agoImported WebKit commit f35955d976484e57fd83612794aefd58fdaa6337 (http://svn.webkit...
Simon Hausmann [Thu, 20 Sep 2012 19:53:03 +0000 (21:53 +0200)]
Imported WebKit commit f35955d976484e57fd83612794aefd58fdaa6337 (svn.webkit.org/repository/webkit/trunk@129155)

New snapshot with prospective build fix

5 years agoImported WebKit commit 6dbad7b03986b50773637200cddddeeeb92745cc (http://svn.webkit...
Simon Hausmann [Thu, 20 Sep 2012 14:13:48 +0000 (16:13 +0200)]
Imported WebKit commit 6dbad7b03986b50773637200cddddeeeb92745cc (svn.webkit.org/repository/webkit/trunk@129129)

Another update that should fix the initial build in the CI system

5 years agoImported WebKit commit 080af0beaa6f0ba8ff8f44cb8bd8b5dcf75ac0af (http://svn.webkit...
Simon Hausmann [Thu, 20 Sep 2012 12:01:09 +0000 (14:01 +0200)]
Imported WebKit commit 080af0beaa6f0ba8ff8f44cb8bd8b5dcf75ac0af (svn.webkit.org/repository/webkit/trunk@129119)

New snapshot with prospective build fix for incorrect QtWebKit master module header file creation

5 years agoImported WebKit commit c7503cef7ecb236730d1309676ab9fc723fd061d (http://svn.webkit...
Simon Hausmann [Tue, 18 Sep 2012 13:53:33 +0000 (15:53 +0200)]
Imported WebKit commit c7503cef7ecb236730d1309676ab9fc723fd061d (svn.webkit.org/repository/webkit/trunk@128886)

New snapshot with various build fixes