summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Use custom static scopes to improve QML/JavaScript performanceKent Hansen2010-06-2512-37/+358
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit introduces a new internal JS object type, QScriptStaticScopeObject, that enables the JS compiler to make more aggressive optimizations of scoped property access. QScriptStaticScopeObject registers all its properties in a symbol table that the JS compiler has access to. If the compiler finds the property in the symbol table, it will generate the fast index-based op_{get,put}_scoped_var bytecodes, rather than the dynamic (slow) op_resolve and friends. If the compiler _doesn't_ find the property in the symbol table, it infers that it's safe to skip the scope object when later resolving the property, which will also improve performance (see op_resolve_skip bytecode). QScriptStaticScopeObject is only safe to use when all relevant properties are known at JS compile time; that is, when a function that has the static scope object in its scope chain is compiled. It's up to the user of the class (e.g. QtDeclarative) to ensure that this constraint is not violated. The API for constructing QScriptStaticScopeObject instances is not public; it lives in QScriptDeclarativeClass for now, an internal class exported for the purpose of QML. The instance is returned as a QScriptValue and can be manipulated like any other JS object (e.g. by QScriptValue::setProperty()). The other part of this commit utilizes QScriptStaticScopeObject in QtDeclarative in the two major places where it's currently possible: 1) QML disallows adding properties to the Global Object. Furthermore, it's not possible for QML IDs and properties to "shadow" global variables. Hence, a QScriptStaticScopeObject can be used to hold all the standard ECMA properties, and this scope object can come _before_ the QML component in the scope chain. This enables binding expressions and scripts to have optimized (direct) access to e.g. Math.sin. 2) Imported scripts can have their properties (resulting from variable declarations ("var" statements) and function declarations) added to a static scope object. This enables functions in the script to have optimized (direct) access to the script's own properties, as well as to global properties such as Math. With this change, it's no longer possible to delete properties of the Global Object, nor delete properties of an imported script. It's a compromise we make in order to make the optimization safe. Task-number: QTBUG-8576 Reviewed-by: Aaron Kennedy Reviewed-by: Olivier Goffart Reviewed-by: Jedrzej Nowacki
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2417-141/+280
|\ | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 2f598e9b7b376d851fe089bc1dc729bcf0393a06 Moved the QML WebKit integration into QtWebKit.sis
| * Updated WebKit to 2f598e9b7b376d851fe089bc1dc729bcf0393a06Simon Hausmann2010-06-2415-128/+274
| | | | | | | | | | | | | | | | * Fixed QML packaging || <https://webkit.org/b/39304> || Add an inlineCapacity template parameter to ListHashSet and use it to shrink the positioned object list hash set. || || <https://webkit.org/b/39309> || Allocate the m_preloads list hash set dynamically and free it when done. || || <https://webkit.org/b/33150> || Do not render the full frame when there is some elements with fixed positioning ||
| * Moved the QML WebKit integration into QtWebKit.sisSimon Hausmann2010-06-243-14/+7
| | | | | | | | | | Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com> Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-245-10/+41
|\ \ | |/ |/| | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Manipulate buffer position via 'pPos' in peek() No more enter & leave events after a popup menu is closed on Windows Child windows shown automatically when their parent is shown(Cocoa). QKeyEvent::text() inconsistency between Linux and Mac
| * Manipulate buffer position via 'pPos' in peek()Andreas Kling2010-06-241-2/+2
| | | | | | | | Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
| * No more enter & leave events after a popup menu is closed on WindowsPrasanth Ullattil2010-06-241-3/+20
| | | | | | | | | | | | | | | | | | | | We use the TrackMouseEvent() to keep track of enter and leave messages. Upon receiving a WM_MOUSELEAVE, the effect of that function call is over, we need to call it again if we need more messages. This was not done when we close a popup because of mouse click outside. Task-number: QTBUG-11582 Reviewed-by: Bradley T. Hughes
| * Child windows shown automatically when their parent is shown(Cocoa).Prasanth Ullattil2010-06-241-1/+1
| | | | | | | | | | | | | | | | While setting up the stacking order for child windows, their hidden state was never taken into consideration. Task-number: QTBUG-11239 Reviewed-by: Richard Moe Gustavsen
| * QKeyEvent::text() inconsistency between Linux and MacPrasanth Ullattil2010-06-242-4/+18
| | | | | | | | | | | | | | | | | | | | | | For a key event triggered by the cursor keys, QKeyEvent::text() returns char with value 0x14 or similar. This patch (Cocoa only)will remove text from all key events for the unicode range 0xF700-0xF747. This is part of the corporate unicode range used by apple for keyboard function keys. [http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/CORPCHAR.TXT] Task-number: QTBUG-11225 Reviewed-by: Bradley T. Hughes
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-248-5/+46
|\ \ | |/ |/| | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to b3589e88fb8d581fb523578763831109f914dc2e
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-248-5/+46
| |\ | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to b3589e88fb8d581fb523578763831109f914dc2e
| | * Updated WebKit to b3589e88fb8d581fb523578763831109f914dc2eSimon Hausmann2010-06-238-5/+47
| | | | | | | | | | | | | | | | | | * Build fixes for package builds * Fix build with QT_NO_COMBOBOX * Upstream David's doc fix
* | | Abort open early if network session is in the process of openning.Aaron McCarthy2010-06-242-5/+20
| | |
* | | Cherry pick fix for MOBILITY-800 from Qt Mobility.Aaron McCarthy2010-06-242-55/+37
| | | | | | | | | | | | 21abc07dc396f08c888bf3cac96b535cc296cb00
* | | Cherry pick fix for MOBILITY-1063 from Qt Mobility.Aaron McCarthy2010-06-241-6/+29
| | | | | | | | | | | | 4713262c16cb3eba1f4beccb6962a1ae210479c0
* | | Cherry pick fix for MOBILITY-1063 from Qt Mobility.Aaron McCarthy2010-06-241-51/+18
| | | | | | | | | | | | 37ad80914f7acb8d4f3364d78e75d48cd14e8e2a
* | | Cherry pick fix for MOBILITY-965 from Qt Mobility.Aaron McCarthy2010-06-243-10/+147
| | | | | | | | | | | | 50de830ded2dcc1c6b4d8be71428d9a2bfed6ae7
* | | Cherry pick fix for MOBILITY-800 from Qt Mobility.Aaron McCarthy2010-06-242-6/+29
| | | | | | | | | | | | a05504d2a0c643c6f253527f07bcc0dba8a799b4
* | | Cherry pick fix for MOBILITY-853 from Qt Mobility.Aaron McCarthy2010-06-242-0/+71
| | | | | | | | | | | | 256e67963c4cb0fc150e6c47193e7c9b17296611
* | | Cherry pick fix for MOBILITY-1031 from Qt Mobility.Aaron McCarthy2010-06-243-22/+29
| | | | | | | | | | | | 7e8b55524bd8a00e49e11103e8c8091e1e59e612
* | | Cherry pick fix for MOBILITY-938 from Qt Mobility.Aaron McCarthy2010-06-242-54/+49
| | | | | | | | | | | | 216f4016d1b447d51630086afca179df11fd6997
* | | Cherry pick fix for QTMOBILITY-240 from Qt Mobility.Aaron McCarthy2010-06-242-62/+88
| | | | | | | | | | | | c84a6d828bcb7f66d1ac06e1a7a84c5a8ba9cec4
* | | Make QtFontFamily::symbol_checked a bitfield.Andreas Kling2010-06-241-1/+1
|/ / | | | | | | Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-234-10/+38
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: We need to swallow the event, otherwise it might pop up several times. Set the item data thru the model, so we actually emit dataChanged. There where still references to the old Assistant. Newly created folders in QFileDialog are disabled on Cocoa. don't remove the path from the name of included files add some comments remove support for QMAKE_POST_INCLUDE_FILES remove unused function fix prompt() stdin safety check Improve text performance with QtWebKit in Qt 4.7 Removed support for static linking of QtWebKit. When a drag is finished with on Mac, then it should delete itself
| * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-06-231-2/+2
| |\ \ | | |/
| * | Newly created folders in QFileDialog are disabled on Cocoa.Prasanth Ullattil2010-06-231-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | For a newly created folder in the current path, we were returning NO for the "shouldShowFilename" callback. This patch moves the check for directories to the begining. Task-number: QTBUG-11532 Reviewed-by: Carlos Duclos
| * | Improve text performance with QtWebKit in Qt 4.7Simon Hausmann2010-06-231-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | Implemented the straight string-to-glyph conversion in the core text font engine, that bypasses the shaping. This is used by the fast text code path in QtWebKit. Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
| * | When a drag is finished with on Mac, then it should delete itselfAndy Shaw2010-06-232-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On other platforms then when a drag is finished then it cleans up by calling setMimeData(0) and deleteLater() on the drag object, this didn't happen before on the Mac which meant it did not delete the QDrag objects until the parent of them was deleted thus taking up memory. Task-number: QTBUG-11613 Reviewed-by: Prasanth
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-234-0/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Provide the Webkit Qml plugin with a UID3 on Symbian Provide Qml plugins with UID3s on Symbian Fix "missing store_build" errors
| * | | Provide the Webkit Qml plugin with a UID3 on SymbianAlessandro Portale2010-06-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | ...otherwise we cannot Symbian sign it. Reviewed-by: Miikka Heikkinen
| * | | Provide Qml plugins with UID3s on SymbianAlessandro Portale2010-06-233-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | ...otherwise we cannot Symbian sign them. Reviewed-by: Miikka Heikkinen
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-06-231-0/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fix missing QImage::Format to QVideoFrame::PixelFormat conversion.
| * | | Fix missing QImage::Format to QVideoFrame::PixelFormat conversion.Andrew den Exter2010-06-231-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This resulted in the the video widget example not being able to play some gif files. Task-number: MOBILITY-1137 MOBILITY-1138 Reviewed-by: Justin McPherson
* | | | Build declarative before webkit.Alexis Menard2010-06-231-2/+2
| |_|/ |/| |
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-231-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix build on Symbian^3.
| * | | Fix build on Symbian^3.Aaron McCarthy2010-06-221-0/+1
| | | |
* | | | Merge remote branch 'origin/4.7' into qml-4.7Rohan McGovern2010-06-22161-8497/+3018
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: examples/declarative/modelviews/webview/transparent.qml
| * | | Fix a crash on exit. Destruction order in font database. (Symbian^4)Alessandro Portale2010-06-222-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation for the QT_2746 task had a wrong destruction order of font database elements. The 'QSymbianTypeFaceExtras' in Symbian^4 hold a CFont which is retrieved from the Symbian ScreenDevice. They have to be released by the same ScreenDevice. The error was that the release was attempted after the connection to the ScreenDevice was closed. This fix causes an earlier destruction of all 'QSymbianTypeFaceExtras' and the removal of their their CFonts in qt_cleanup. While the connection to the ScreenDevice is still alive. Task-number: QT_2746
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-223-3/+0
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Removed unnecessary data_caging_paths.prf loading from applications
| | * | Removed unnecessary data_caging_paths.prf loading from applicationsMiikka Heikkinen2010-06-223-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since plugin and import paths variables were moved to symbian.conf, there were many unnecessary load(data_caging_paths) statements left in applications. Task-number: QTBUG-11619 Reviewed-by: Janne Koskinen
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Simon Hausmann2010-06-2290-7332/+2331
| |\ \ \ | | |/ /
| | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2290-7332/+2331
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fix examples Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cd Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066d Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aef Update S60 stuff after renaming the webkit component. Update qmlchanges from import org.webkit to QtWebKit Updated WebKit to e32cb21d4f1787147bcb681883b96a95f867749a Updated WebKit to a99218d1984be36e00966f988123fa7e2b18eec5 Remove the old WebView element in src/import. The new one is in src/3rdparty/webkit Updated WebKit to d7a095a2a9514e1f132b779b99279585820b46f5 Updated WebKit to c6f08f4c13f88491a5d1ae1794c72166af0c26ba
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2290-7332/+2331
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Fix examples Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cd Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066d Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aef Update S60 stuff after renaming the webkit component. Update qmlchanges from import org.webkit to QtWebKit Updated WebKit to e32cb21d4f1787147bcb681883b96a95f867749a Updated WebKit to a99218d1984be36e00966f988123fa7e2b18eec5 Remove the old WebView element in src/import. The new one is in src/3rdparty/webkit Updated WebKit to d7a095a2a9514e1f132b779b99279585820b46f5 Updated WebKit to c6f08f4c13f88491a5d1ae1794c72166af0c26ba
| | | | * | Updated WebKit to 45d1c9149ef8940081fa8dd35854d2b95ebaf3cdSimon Hausmann2010-06-2133-322/+996
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/6274> || text repainting does not account for glyphs which draw outside the typographic bounds of the font || || <https://webkit.org/b/40840> || [Qt] Symbian builds in release sometimes try to link with the debug JavaScriptCore static lib. || || <https://webkit.org/b/40620> || [Qt] Get rid of the the unused imageSize of ImageDecoderQt::internalHandleCurrentImage() || || <https://webkit.org/b/37292> || http://trac.webkit.org/changeset/57215 caused perf regressions || || <https://webkit.org/b/40077> || [Qt] Implement the simple font code path. || || <https://webkit.org/b/40910> || [Qt] Avoid unnecessary image conversion in RGBA32Buffer::zeroFill() || || <https://webkit.org/b/40797> || [Qt] Decode images directly to QPixmap || || <https://webkit.org/b/36510> || [chromium] use integral glyph widths ||
| | | | * | Updated WebKit to 4ad38c43081bedb69c7e26a9ca0fb2c50456066dSimon Hausmann2010-06-217-39/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Integrated changes: || <https://webkit.org/b/40714> || [Qt] Compilation in QWebPagePrivate::timerEvent with clang || || <https://webkit.org/b/40717> || [Qt] Bridge documentation: some snippets have the wrong indentation || || <https://webkit.org/b/40662> || [Qt] Avoid truncation of zoom factor in QWebFrame's print function. ||
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit into 4.7-integrationQt Continuous Integration System2010-06-2160-6986/+1252
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit: Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185 Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aef Update S60 stuff after renaming the webkit component. Update qmlchanges from import org.webkit to QtWebKit Updated WebKit to e32cb21d4f1787147bcb681883b96a95f867749a Updated WebKit to a99218d1984be36e00966f988123fa7e2b18eec5 Remove the old WebView element in src/import. The new one is in src/3rdparty/webkit Updated WebKit to d7a095a2a9514e1f132b779b99279585820b46f5 Updated WebKit to c6f08f4c13f88491a5d1ae1794c72166af0c26ba
| | | | | * | Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185Simon Hausmann2010-06-2029-5961/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Don't include QtScript Phoenix here until it's ready for release :)
| | | | | * | Updated WebKit to 19de3d2848b715f937eb375a078672cc8e9b8185Simon Hausmann2010-06-194-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | || <https://webkit.org/b/40483> || [Qt] The new Qt's documentation text layout is messed up with QtWebKit. ||
| | | | | * | Updated WebKit to 515aae71494436816cd0250cdc52caa4f2566aefSimon Hausmann2010-06-184-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Doc fixes from Alexis :)
| | | | | * | Update S60 stuff after renaming the webkit component.Alexis Menard2010-06-182-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new name is QtWebKit not org.webkit. Reviewed-by:jbarron