diff options
107 files changed, 1702 insertions, 1126 deletions
diff --git a/demos/declarative/samegame/SamegameCore/samegame.js b/demos/declarative/samegame/SamegameCore/samegame.js index cc0a70d..f9c6184 100755 --- a/demos/declarative/samegame/SamegameCore/samegame.js +++ b/demos/declarative/samegame/SamegameCore/samegame.js @@ -176,14 +176,13 @@ function createBlock(column,row){ // not be ready immediately. There is a statusChanged signal on the // component you could use if you want to wait to load remote files. if(component.status == Component.Ready){ - var dynamicObject = component.createObject(); + var dynamicObject = component.createObject(gameCanvas); if(dynamicObject == null){ console.log("error creating block"); console.log(component.errorsString()); return false; } dynamicObject.type = Math.floor(Math.random() * 3); - dynamicObject.parent = gameCanvas; dynamicObject.x = column*gameCanvas.blockSize; dynamicObject.targetX = column*gameCanvas.blockSize; dynamicObject.targetY = row*gameCanvas.blockSize; diff --git a/demos/declarative/snake/content/snake.js b/demos/declarative/snake/content/snake.js index 102bd87..f5c231e 100644 --- a/demos/declarative/snake/content/snake.js +++ b/demos/declarative/snake/content/snake.js @@ -59,8 +59,7 @@ function startNewGame() console.log("Still loading linkComponent"); continue;//TODO: Better error handling? } - var link = linkComponent.createObject(); - link.parent = playfield; + var link = linkComponent.createObject(playfield); link.z = numRows * numColumns + 1 - i; link.type = i == 0 ? 2 : 0; link.spawned = false; @@ -300,8 +299,7 @@ function createCookie(value) { console.log("Still loading cookieComponent"); return;//TODO: Better error handling? } - cookie = cookieComponent.createObject(); - cookie.parent = head.parent; + cookie = cookieComponent.createObject(head.parent); cookie.value = value; cookie.row = row; cookie.column = column; diff --git a/doc/src/declarative/dynamicobjects.qdoc b/doc/src/declarative/dynamicobjects.qdoc index dc0277d..2688ee5 100644 --- a/doc/src/declarative/dynamicobjects.qdoc +++ b/doc/src/declarative/dynamicobjects.qdoc @@ -69,7 +69,9 @@ This function takes the URL of the QML file as its only argument and returns a component object which can be used to create and load that QML file. Once you have a component you can use its \l {Component::createObject()}{createObject()} method to create an instance of -the component. +the component. This function takes exactly one argument, which is the parent for the new item. Since graphical items will +not appear on the scene without a parent, it is recommended that you set the parent this way. However, if you wish to set +the parent later you can safely pass null to this function. Here is an example. Here is a \c Sprite.qml, which defines a simple QML component: diff --git a/doc/src/declarative/globalobject.qdoc b/doc/src/declarative/globalobject.qdoc index 7c27ae4..bc9830a 100644 --- a/doc/src/declarative/globalobject.qdoc +++ b/doc/src/declarative/globalobject.qdoc @@ -258,7 +258,10 @@ The methods and properties of the Component element are defined in its own page, but when using it dynamically only two methods are usually used. \c Component.createObject() returns the created object or \c null if there is an error. If there is an error, \l {Component::errorsString()}{Component.errorsString()} describes -the error that occurred. +the error that occurred. Note that createObject() takes exactly one argument, which is set +to the parent of the created object. Graphical objects without a parent will not appear +on the scene, but if you do not wish to parent the item at this point you can safely pass +in null. If you want to just create an arbitrary string of QML, instead of loading a QML file, consider the \l{Qt.createQmlObject(string qml, object parent, string filepath)}{Qt.createQmlObject()} function. diff --git a/doc/src/snippets/declarative/componentCreation.js b/doc/src/snippets/declarative/componentCreation.js index be928f0..f6fb379 100644 --- a/doc/src/snippets/declarative/componentCreation.js +++ b/doc/src/snippets/declarative/componentCreation.js @@ -4,11 +4,10 @@ var sprite; function finishCreation() { if (component.status == Component.Ready) { - sprite = component.createObject(); + sprite = component.createObject(appWindow); if (sprite == null) { // Error Handling } else { - sprite.parent = appWindow; sprite.x = 100; sprite.y = 100; // ... @@ -32,13 +31,12 @@ else //![2] component = Qt.createComponent("Sprite.qml"); -sprite = component.createObject(); +sprite = component.createObject(appWindow); if (sprite == null) { // Error Handling console.log("Error loading component:", component.errorsString()); } else { - sprite.parent = appWindow; sprite.x = 100; sprite.y = 100; // ... @@ -47,5 +45,3 @@ if (sprite == null) { } -createSpriteObjects(); - diff --git a/doc/src/snippets/declarative/dynamicObjects.qml b/doc/src/snippets/declarative/dynamicObjects.qml index dd55d78..6a8c927 100644 --- a/doc/src/snippets/declarative/dynamicObjects.qml +++ b/doc/src/snippets/declarative/dynamicObjects.qml @@ -21,8 +21,7 @@ Rectangle { } function createRectangle() { - var object = rectComponent.createObject(); - object.parent = rootItem; + var object = rectComponent.createObject(rootItem); } Component.onCompleted: createRectangle() diff --git a/examples/declarative/dynamic/dynamic.qml b/examples/declarative/dynamic/dynamic.qml index 0e6e197..52c7c1e 100644 --- a/examples/declarative/dynamic/dynamic.qml +++ b/examples/declarative/dynamic/dynamic.qml @@ -4,44 +4,49 @@ import "qml" Item { id: window + + property int activeSuns: 0 + //This is a desktop-sized example width: 1024; height: 512 - property int activeSuns: 0 - //This is the message that pops up when there's an error - Rectangle{ + //This is the message box that pops up when there's an error + Rectangle { id: dialog + opacity: 0 anchors.centerIn: parent - width: dialogText.width + 6 - height: dialogText.height + 6 + width: dialogText.width + 6; height: dialogText.height + 6 border.color: 'black' color: 'lightsteelblue' z: 65535 //Arbitrary number chosen to be above all the items, including the scaled perspective ones. + function show(str){ dialogText.text = str; dialogAnim.start(); } - Text{ + + Text { id: dialogText - x:3 - y:3 + x: 3; y: 3 font.pixelSize: 14 } - SequentialAnimation{ + + SequentialAnimation { id: dialogAnim - NumberAnimation{target: dialog; property:"opacity"; to: 1; duration: 1000} - PauseAnimation{duration: 5000} - NumberAnimation{target: dialog; property:"opacity"; to: 0; duration: 1000} + NumberAnimation { target: dialog; property:"opacity"; to: 1; duration: 1000 } + PauseAnimation { duration: 5000 } + NumberAnimation { target: dialog; property:"opacity"; to: 0; duration: 1000 } } } // sky - Rectangle { id: sky + Rectangle { + id: sky anchors { left: parent.left; top: parent.top; right: toolbox.right; bottom: parent.verticalCenter } gradient: Gradient { - GradientStop { id: stopA; position: 0.0; color: "#0E1533" } - GradientStop { id: stopB; position: 1.0; color: "#437284" } + GradientStop { id: gradientStopA; position: 0.0; color: "#0E1533" } + GradientStop { id: gradientStopB; position: 1.0; color: "#437284" } } } @@ -49,109 +54,123 @@ Item { Particles { id: stars x: 0; y: 0; width: parent.width; height: parent.height / 2 - source: "images/star.png"; angleDeviation: 360; velocity: 0 - velocityDeviation: 0; count: parent.width / 10; fadeInDuration: 2800 + source: "images/star.png" + angleDeviation: 360 + velocity: 0; velocityDeviation: 0 + count: parent.width / 10 + fadeInDuration: 2800 opacity: 1 } - // ground, which has a z such that the sun can set behind it + // ground Rectangle { id: ground - z: 2 - anchors { left: parent.left; top: parent.verticalCenter; right: toolbox.right; bottom: parent.bottom } + z: 2 // just above the sun so that the sun can set behind it + anchors { left: parent.left; top: parent.verticalCenter; right: toolbox.left; bottom: parent.bottom } gradient: Gradient { GradientStop { position: 0.0; color: "ForestGreen" } GradientStop { position: 1.0; color: "DarkGreen" } } } - //Day state, for when you place a sun - states: State { - name: "Day"; when: window.activeSuns > 0 - PropertyChanges { target: stopA; color: "DeepSkyBlue"} - PropertyChanges { target: stopB; color: "SkyBlue"} - PropertyChanges { target: stars; opacity: 0 } - } - - transitions: Transition { - PropertyAnimation { duration: 3000 } - ColorAnimation { duration: 3000 } - } - SystemPalette { id: activePalette } - // toolbox + // right-hand panel Rectangle { id: toolbox - z: 3 //Above ground - color: activePalette.window; + width: 480 - anchors { right: parent.right; top:parent.top; bottom: parent.bottom } - Rectangle { //Not a child of any positioner - border.color: "black"; - width: toolRow.width + 4 - height: toolRow.height + 4 - x: toolboxPositioner.x + toolRow.x - 2 - y: toolboxPositioner.y + toolRow.y - 2 - } + color: activePalette.window + anchors { right: parent.right; top: parent.top; bottom: parent.bottom } + Column { - id: toolboxPositioner anchors.centerIn: parent spacing: 8 + Text { text: "Drag an item into the scene." } - Row { - id: toolRow - spacing: 8; - PaletteItem { - anchors.verticalCenter: parent.verticalCenter - file: "Sun.qml"; - image: "../images/sun.png" - } - PaletteItem { - file: "GenericItem.qml" - image: "../images/moon.png" - } - PaletteItem { - anchors.verticalCenter: parent.verticalCenter - file: "PerspectiveItem.qml" - image: "../images/tree_s.png" - } - PaletteItem { - anchors.verticalCenter: parent.verticalCenter - file: "PerspectiveItem.qml" - image: "../images/rabbit_brown.png" - } - PaletteItem { - anchors.verticalCenter: parent.verticalCenter - file: "PerspectiveItem.qml" - image: "../images/rabbit_bw.png" + + Rectangle { + width: childrenRect.width + 10; height: childrenRect.height + 10 + border.color: "black" + + Row { + anchors.centerIn: parent + spacing: 8 + + PaletteItem { + anchors.verticalCenter: parent.verticalCenter + componentFile: "Sun.qml" + image: "../images/sun.png" + } + PaletteItem { + anchors.verticalCenter: parent.verticalCenter + componentFile: "GenericSceneItem.qml" + image: "../images/moon.png" + } + PaletteItem { + anchors.verticalCenter: parent.verticalCenter + componentFile: "PerspectiveItem.qml" + image: "../images/tree_s.png" + } + PaletteItem { + anchors.verticalCenter: parent.verticalCenter + componentFile: "PerspectiveItem.qml" + image: "../images/rabbit_brown.png" + } + PaletteItem { + anchors.verticalCenter: parent.verticalCenter + componentFile: "PerspectiveItem.qml" + image: "../images/rabbit_bw.png" + } } } + Text { text: "Active Suns: " + activeSuns } - Rectangle { width: 440; height: 1; color: "black" } - Text { text: "Arbitrary QML: " } - TextEdit { - id: qmlText - width: 460 - height: 220 - readOnly: false - focusOnPress: true - font.pixelSize: 14 - - text: "import Qt 4.7\nImage {\n id: smile;\n x: 500*Math.random();\n y: 200*Math.random(); \n source: 'images/face-smile.png';\n NumberAnimation on opacity { \n to: 0; duration: 1500;\n }\n Component.onCompleted: smile.destroy(1500);\n}" + + Rectangle { width: parent.width; height: 1; color: "black" } + + Text { text: "Arbitrary QML:" } + + Rectangle { + width: 460; height: 240 + + TextEdit { + id: qmlText + anchors.fill: parent; anchors.margins: 5 + readOnly: false + focusOnPress: true + font.pixelSize: 14 + + text: "import Qt 4.7\nImage {\n id: smile\n x: 500 * Math.random()\n y: 200 * Math.random() \n source: 'images/face-smile.png'\n\n NumberAnimation on opacity { \n to: 0; duration: 1500\n }\n\n Component.onCompleted: smile.destroy(1500);\n}" + } } + Button { text: "Create" - function makeCustom() { - try{ + onClicked: { + try { Qt.createQmlObject(qmlText.text, window, 'CustomObject'); - }catch(err){ - dialog.show('Error on line ' + err.qmlErrors[0].lineNumber + '\n' + err.qmlErrors[0].message ); + } catch(err) { + dialog.show('Error on line ' + err.qmlErrors[0].lineNumber + '\n' + err.qmlErrors[0].message); } } - onClicked: makeCustom(); } } } + //Day state, for when a sun is added to the scene + states: State { + name: "Day" + when: window.activeSuns > 0 + + PropertyChanges { target: gradientStopA; color: "DeepSkyBlue" } + PropertyChanges { target: gradientStopB; color: "SkyBlue" } + PropertyChanges { target: stars; opacity: 0 } + } + + transitions: Transition { + PropertyAnimation { duration: 3000 } + ColorAnimation { duration: 3000 } + } + } diff --git a/examples/declarative/dynamic/qml/Button.qml b/examples/declarative/dynamic/qml/Button.qml index 53588bb..963a850 100644 --- a/examples/declarative/dynamic/qml/Button.qml +++ b/examples/declarative/dynamic/qml/Button.qml @@ -6,19 +6,35 @@ Rectangle { property variant text signal clicked - SystemPalette { id: activePalette } - height: text.height + 10 - width: text.width + 20 + height: text.height + 10; width: text.width + 20 border.width: 1 - radius: 4; smooth: true + radius: 4 + smooth: true + gradient: Gradient { - GradientStop { position: 0.0; - color: if(!mr.pressed){activePalette.light;}else{activePalette.button;} + GradientStop { + position: 0.0 + color: !mouseArea.pressed ? activePalette.light : activePalette.button } - GradientStop { position: 1.0; - color: if(!mr.pressed){activePalette.button;}else{activePalette.dark;} + GradientStop { + position: 1.0 + color: !mouseArea.pressed ? activePalette.button : activePalette.dark } } - MouseArea { id:mr; anchors.fill: parent; onClicked: container.clicked() } - Text { id: text; anchors.centerIn:parent; font.pointSize: 10; text: parent.text; color: activePalette.buttonText } + + SystemPalette { id: activePalette } + + MouseArea { + id: mouseArea + anchors.fill: parent + onClicked: container.clicked() + } + + Text { + id: text + anchors.centerIn:parent + font.pointSize: 10 + text: parent.text + color: activePalette.buttonText + } } diff --git a/examples/declarative/dynamic/qml/GenericItem.qml b/examples/declarative/dynamic/qml/GenericItem.qml deleted file mode 100644 index faac06d..0000000 --- a/examples/declarative/dynamic/qml/GenericItem.qml +++ /dev/null @@ -1,13 +0,0 @@ -import Qt 4.7 - -Item{ - property bool created: false - property string image - width: imageItem.width - height: imageItem.height - z: 2 - Image{ - id: imageItem - source: image; - } -} diff --git a/examples/declarative/dynamic/qml/PaletteItem.qml b/examples/declarative/dynamic/qml/PaletteItem.qml index e8f2ed4..dcb5cc3 100644 --- a/examples/declarative/dynamic/qml/PaletteItem.qml +++ b/examples/declarative/dynamic/qml/PaletteItem.qml @@ -1,13 +1,19 @@ import Qt 4.7 import "itemCreation.js" as Code -GenericItem { - id: itemButton - property string file +Image { + id: paletteItem + + property string componentFile + property string image + + source: image + MouseArea { - anchors.fill: parent; + anchors.fill: parent + onPressed: Code.startDrag(mouse); - onPositionChanged: Code.moveDrag(mouse); + onPositionChanged: Code.continueDrag(mouse); onReleased: Code.endDrag(mouse); } } diff --git a/examples/declarative/dynamic/qml/PerspectiveItem.qml b/examples/declarative/dynamic/qml/PerspectiveItem.qml index 6d763c3..c04d3dc 100644 --- a/examples/declarative/dynamic/qml/PerspectiveItem.qml +++ b/examples/declarative/dynamic/qml/PerspectiveItem.qml @@ -1,15 +1,25 @@ import Qt 4.7 Image { - id: tree + id: rootItem + property bool created: false - property double scaleFactor: Math.max((y+height-250)*0.01, 0.3) - property double scaledBottom: y + (height+height*scaleFactor)/2 - property bool onLand: scaledBottom > window.height/2 - property string image //Needed for compatibility with GenericItem + property string image + + property double scaledBottom: y + (height + height*scale) / 2 + property bool onLand: scaledBottom > window.height / 2 + + source: image opacity: onLand ? 1 : 0.25 - onCreatedChanged: if (created && !onLand) { tree.destroy() } else { z = scaledBottom } - scale: scaleFactor - source: image; smooth: true - onYChanged: z = scaledBottom + scale: Math.max((y + height - 250) * 0.01, 0.3) + smooth: true + + onCreatedChanged: { + if (created && !onLand) + rootItem.destroy(); + else + z = scaledBottom; + } + + onYChanged: z = scaledBottom; } diff --git a/examples/declarative/dynamic/qml/Sun.qml b/examples/declarative/dynamic/qml/Sun.qml index 3627964..43dcb9a 100644 --- a/examples/declarative/dynamic/qml/Sun.qml +++ b/examples/declarative/dynamic/qml/Sun.qml @@ -2,23 +2,37 @@ import Qt 4.7 Image { id: sun + property bool created: false property string image: "../images/sun.png" - onCreatedChanged: if(created){window.activeSuns++;}else{window.activeSuns--;} - source: image; - z: 1 + source: image - //x and y get set when instantiated - //head offscreen + // once item is created, start moving offscreen NumberAnimation on y { - to: window.height / 2; + to: window.height / 2 running: created - onRunningChanged: if (running) duration = (window.height - sun.y) * 10; else state = "OffScreen"; + onRunningChanged: { + if (running) + duration = (window.height - sun.y) * 10; + else + state = "OffScreen" + } } states: State { - name: "OffScreen"; - StateChangeScript { script: { sun.created = false; sun.destroy() } } + name: "OffScreen" + StateChangeScript { + script: { sun.created = false; sun.destroy() } + } + } + + onCreatedChanged: { + if (created) { + sun.z = 1; // above the sky but below the ground layer + window.activeSuns++; + } else { + window.activeSuns--; + } } } diff --git a/examples/declarative/dynamic/qml/itemCreation.js b/examples/declarative/dynamic/qml/itemCreation.js index 3c1b975..59750f3 100644 --- a/examples/declarative/dynamic/qml/itemCreation.js +++ b/examples/declarative/dynamic/qml/itemCreation.js @@ -1,54 +1,38 @@ var itemComponent = null; var draggedItem = null; var startingMouse; -var startingZ; -//Until QT-2385 is resolved we need to convert to scene coordinates manually -var xOffset; -var yOffset; -function setSceneOffset() -{ - xOffset = 0; - yOffset = 0; - var p = itemButton; - while(p != window){ - xOffset += p.x; - yOffset += p.y; - p = p.parent; - } -} +var posnInWindow; function startDrag(mouse) { - setSceneOffset(); + posnInWindow = paletteItem.mapToItem(null, 0, 0); startingMouse = { x: mouse.x, y: mouse.y } loadComponent(); } -//Creation is split into two functions due to an asyncronous wait while +//Creation is split into two functions due to an asynchronous wait while //possible external files are loaded. function loadComponent() { - if (itemComponent != null) //Already loaded the component + if (itemComponent != null) { // component has been previously loaded createItem(); + return; + } - itemComponent = Qt.createComponent(itemButton.file); - //console.log(itemButton.file) - if(itemComponent.status == Component.Loading){ - component.statusChanged.connect(finishCreation); - }else{//Depending on the content, it can be ready or error immediately + itemComponent = Qt.createComponent(paletteItem.componentFile); + if (itemComponent.status == Component.Loading) //Depending on the content, it can be ready or error immediately + component.statusChanged.connect(createItem); + else createItem(); - } } function createItem() { if (itemComponent.status == Component.Ready && draggedItem == null) { - draggedItem = itemComponent.createObject(); - draggedItem.parent = window; - draggedItem.image = itemButton.image; - draggedItem.x = xOffset; - draggedItem.y = yOffset; - startingZ = draggedItem.z; - draggedItem.z = 4;//On top + draggedItem = itemComponent.createObject(window); + draggedItem.image = paletteItem.image; + draggedItem.x = posnInWindow.x; + draggedItem.y = posnInWindow.y; + draggedItem.z = 3; // make sure created item is above the ground layer } else if (itemComponent.status == Component.Error) { draggedItem = null; console.log("error creating component"); @@ -56,25 +40,24 @@ function createItem() { } } -function moveDrag(mouse) +function continueDrag(mouse) { - if(draggedItem == null) + if (draggedItem == null) return; - draggedItem.x = mouse.x + xOffset - startingMouse.x; - draggedItem.y = mouse.y + yOffset - startingMouse.y; + draggedItem.x = mouse.x + posnInWindow.x - startingMouse.x; + draggedItem.y = mouse.y + posnInWindow.y - startingMouse.y; } function endDrag(mouse) { - if(draggedItem == null) + if (draggedItem == null) return; - if(draggedItem.x + draggedItem.width > toolbox.x){ //Don't drop it in the toolbox + if (draggedItem.x + draggedItem.width > toolbox.x) { //Don't drop it in the toolbox draggedItem.destroy(); draggedItem = null; - }else{ - draggedItem.z = startingZ; + } else { draggedItem.created = true; draggedItem = null; } diff --git a/examples/declarative/layouts/layoutItem/layoutItem.qml b/examples/declarative/layouts/layoutItem/layoutItem.qml index 9b9db22..460c564 100644 --- a/examples/declarative/layouts/layoutItem/layoutItem.qml +++ b/examples/declarative/layouts/layoutItem/layoutItem.qml @@ -1,5 +1,4 @@ import Qt 4.7 -import Qt.widgets 4.7 LayoutItem {//Sized by the layout id: resizable diff --git a/examples/declarative/tutorials/samegame/samegame2/samegame.js b/examples/declarative/tutorials/samegame/samegame2/samegame.js index bcfb5b6..0dbe6a6 100644 --- a/examples/declarative/tutorials/samegame/samegame2/samegame.js +++ b/examples/declarative/tutorials/samegame/samegame2/samegame.js @@ -41,13 +41,12 @@ function createBlock(column, row) { // Loading and we should wait for the component's statusChanged() signal to // know when the file is downloaded and ready before calling createObject(). if (component.status == Component.Ready) { - var dynamicObject = component.createObject(); + var dynamicObject = component.createObject(background); if (dynamicObject == null) { console.log("error creating block"); console.log(component.errorsString()); return false; } - dynamicObject.parent = background; dynamicObject.x = column * blockSize; dynamicObject.y = row * blockSize; dynamicObject.width = blockSize; diff --git a/examples/declarative/tutorials/samegame/samegame3/samegame.js b/examples/declarative/tutorials/samegame/samegame3/samegame.js index 84439fc..3e97264 100644 --- a/examples/declarative/tutorials/samegame/samegame3/samegame.js +++ b/examples/declarative/tutorials/samegame/samegame3/samegame.js @@ -38,14 +38,13 @@ function createBlock(column, row) { // Loading and we should wait for the component's statusChanged() signal to // know when the file is downloaded and ready before calling createObject(). if (component.status == Component.Ready) { - var dynamicObject = component.createObject(); + var dynamicObject = component.createObject(gameCanvas); if (dynamicObject == null) { console.log("error creating block"); console.log(component.errorsString()); return false; } dynamicObject.type = Math.floor(Math.random() * 3); - dynamicObject.parent = gameCanvas; dynamicObject.x = column * gameCanvas.blockSize; dynamicObject.y = row * gameCanvas.blockSize; dynamicObject.width = gameCanvas.blockSize; diff --git a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js index 06d21e6..0505b8d 100755 --- a/examples/declarative/tutorials/samegame/samegame4/content/samegame.js +++ b/examples/declarative/tutorials/samegame/samegame4/content/samegame.js @@ -49,14 +49,13 @@ function createBlock(column, row) { // Loading and we should wait for the component's statusChanged() signal to // know when the file is downloaded and ready before calling createObject(). if (component.status == Component.Ready) { - var dynamicObject = component.createObject(); + var dynamicObject = component.createObject(gameCanvas); if (dynamicObject == null) { console.log("error creating block"); console.log(component.errorsString()); return false; } dynamicObject.type = Math.floor(Math.random() * 3); - dynamicObject.parent = gameCanvas; dynamicObject.x = column * gameCanvas.blockSize; dynamicObject.targetX = column * gameCanvas.blockSize; dynamicObject.targetY = row * gameCanvas.blockSize; diff --git a/examples/declarative/tvtennis/click.wav b/examples/declarative/tvtennis/click.wav Binary files differdeleted file mode 100644 index 26c46f8..0000000 --- a/examples/declarative/tvtennis/click.wav +++ /dev/null diff --git a/examples/declarative/tvtennis/paddle.wav b/examples/declarative/tvtennis/paddle.wav Binary files differdeleted file mode 100644 index 604e0e5..0000000 --- a/examples/declarative/tvtennis/paddle.wav +++ /dev/null diff --git a/examples/declarative/tvtennis/tvtennis.qml b/examples/declarative/tvtennis/tvtennis.qml index 354a16f..c90d9c5 100644 --- a/examples/declarative/tvtennis/tvtennis.qml +++ b/examples/declarative/tvtennis/tvtennis.qml @@ -1,5 +1,4 @@ import Qt 4.7 -import Qt.multimedia 4.7 Rectangle { id: page @@ -17,17 +16,12 @@ Rectangle { x: 20; width: 20; height: 20; z: 1 color: "Lime" - SoundEffect { id: paddle; source: "paddle.wav" } - SoundEffect { id: wall; source: "click.wav" } - // Move the ball to the right and back to the left repeatedly SequentialAnimation on x { loops: Animation.Infinite NumberAnimation { to: page.width - 40; duration: 2000 } - ScriptAction { script: paddle.play() } PropertyAction { target: ball; property: "direction"; value: "left" } NumberAnimation { to: 20; duration: 2000 } - ScriptAction { script: paddle.play() } PropertyAction { target: ball; property: "direction"; value: "right" } } @@ -37,10 +31,8 @@ Rectangle { // Detect the ball hitting the top or bottom of the view and bounce it onYChanged: { if (y <= 0) { - wall.play(); targetY = page.height - 20; } else if (y >= page.height - 20) { - wall.play(); targetY = 0; } } diff --git a/src/3rdparty/webkit/.tag b/src/3rdparty/webkit/.tag index b6feeb1..75fc5e7 100644 --- a/src/3rdparty/webkit/.tag +++ b/src/3rdparty/webkit/.tag @@ -1 +1 @@ -992e57ee469bd8c6a2afef6b15896a161ab8aeb3 +b4aa5e1ddc41edab895132aba3cc66d9d7129444 diff --git a/src/3rdparty/webkit/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/JavaScriptCore/ChangeLog index eb22ea0..1439ae0 100644 --- a/src/3rdparty/webkit/JavaScriptCore/ChangeLog +++ b/src/3rdparty/webkit/JavaScriptCore/ChangeLog @@ -1,3 +1,15 @@ +2010-05-02 Laszlo Gombos <laszlo.1.gombos@nokia.com> + + Reviewed by Eric Seidel. + + [Qt] Enable JIT for QtWebKit on Symbian + https://bugs.webkit.org/show_bug.cgi?id=38339 + + JIT on Symbian has been stable for quite some time, it + is time to turn it on by default. + + * wtf/Platform.h: + 2010-04-28 Simon Hausmann <simon.hausmann@nokia.com>, Kent Hansen <kent.hansen@nokia.com> Reviewed by Darin Adler. diff --git a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h index 96ed9bd..c582905 100644 --- a/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h +++ b/src/3rdparty/webkit/JavaScriptCore/wtf/Platform.h @@ -939,6 +939,8 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ #define ENABLE_JIT 1 #elif CPU(ARM_TRADITIONAL) && OS(LINUX) #define ENABLE_JIT 1 +#elif CPU(ARM_TRADITIONAL) && OS(SYMBIAN) && COMPILER(RVCT) + #define ENABLE_JIT 1 #endif #endif /* PLATFORM(QT) */ @@ -1008,6 +1010,7 @@ on MinGW. See https://bugs.webkit.org/show_bug.cgi?id=29268 */ || (CPU(X86) && OS(LINUX) && GCC_VERSION >= 40100) \ || (CPU(X86_64) && OS(LINUX) && GCC_VERSION >= 40100) \ || (CPU(ARM_TRADITIONAL) && OS(LINUX)) \ + || (CPU(ARM_TRADITIONAL) && OS(SYMBIAN) && COMPILER(RVCT)) \ || (CPU(MIPS) && OS(LINUX)) #define ENABLE_YARR 1 #define ENABLE_YARR_JIT 1 diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index c3d6314..98debf6 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -4,4 +4,4 @@ This is a snapshot of the Qt port of WebKit from and has the sha1 checksum - 3f0f51f4c87e65bfe04165c6af4c00934b0ca1e2 + 07b60cf799680fcfb7785ee88e14f8030a5dbfa2 diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index 05fc2af..6617b66 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,147 @@ +2010-05-04 Luiz Agostini <luiz.agostini@openbossa.org> + + Reviewed by Simon Hausmann. + + [Qt] QT_MOBILE_THEME compile time flag + https://bugs.webkit.org/show_bug.cgi?id=38439 + + Replacing preprocessor conditional used in RenderThemeQt from Q_WS_MAEMO_5 to + USE(QT_MOBILE_THEME). + + * WebCore.pro: + * platform/qt/RenderThemeQt.cpp: + (WebCore::RenderThemeQt::RenderThemeQt): + (WebCore::RenderThemeQt::qStyle): + (WebCore::RenderThemeQt::extraDefaultStyleSheet): + (WebCore::RenderThemeQt::adjustMenuListButtonStyle): + (WebCore::RenderThemeQt::setPaletteFromPageClientIfExists): + * platform/qt/RenderThemeQt.h: + +2010-03-25 Tasuku Suzuki <tasuku.suzuki@nokia.com> + + Reviewed by Eric Seidel. + + [Qt]Fix compile error with QT_NO_LIBRARY + https://bugs.webkit.org/show_bug.cgi?id=36533 + + * platform/FileSystem.h: + * platform/qt/FileSystemQt.cpp: + (WebCore::unloadModule): + +2010-05-06 Csaba Osztrogonác <ossy@webkit.org> + + Unreviewed WinCE buildfix after r58842. + Preprocessor doesn't understand "true", changed to "1" + + * platform/graphics/MediaPlayer.cpp: + +2010-05-06 Antonio Gomes <tonikitoo@webkit.org> + + Reviewed by Kenneth Christiansen. + + Spatial Navigation: adapt the logic of {deep}findFocusableNodeInDirection to do traversal starting from Node* not Document* + https://bugs.webkit.org/show_bug.cgi?id=37803 + + Instead of receiving a Document pointer as incoming parameter, patch modifies + findFocusableNodeInDirection and deepFindFocusableNodeInDirection methods to + receive a Node pointer as start for content traversal. + This way we can make good use of deepFindFocusableNodeInDirection to traverse + other scrollable container like scrollable div's, and not only frames or iframes. + + Patch also makes use of 'while' instead of 'for' to loop control, that gives move + flexibility to the incremental step: e.g. if a scrollable div was processed, the incremental + step in the loop does not have to do node->traverseNextNode() but node->traverseNextSibling(). + + No behavior change. It is a preparation for supporting scrollable containers in Spatial + Navigation. + + * page/FocusController.cpp: + (WebCore::FocusController::advanceFocusDirectionally): + (WebCore::FocusController::findFocusableNodeInDirection): + (WebCore::FocusController::deepFindFocusableNodeInDirection): + * page/FocusController.h: + +2010-05-06 Simon Hausmann <simon.hausmann@nokia.com> + + Reviewed by Kenneth Rohde Christiansen. + + [Qt] REGRESSION: Loading of external CSS and JS files over network fails in some cases + https://bugs.webkit.org/show_bug.cgi?id=36755 + + Enable the direct connection between QtNetwork and QtWebKit only for Qt versions + greater than 4.6.2, due to a bug in Qt that's been fixed after 4.6.2. + + * platform/network/qt/QNetworkReplyHandler.cpp: + +2010-05-05 Csaba Osztrogonác <ossy@webkit.org> + + Reviewed by Simon Hausmann. + + [Qt]Disable Qt Multimedia backend for HTML 5 Audio and Video elements + Fall back to the Phonon backend until the release situation has been cleared up. + + https://bugs.webkit.org/show_bug.cgi?id=38612 + + Buildfix for QT_VERSION >= 0x040700 after r58810. + + * platform/graphics/MediaPlayer.cpp: + +2010-05-03 Tor Arne Vestbø <tor.arne.vestbo@nokia.com> + + Reviewed by Simon Hausmann. + + [Qt] Fix rendering of <button> elements on Mac OS X + + The <button> element has ButtonPart appearance, not PushButton part, + so we have to include ButtonPart when we decide if we should draw the + button as raised on Mac OS X. + + https://bugs.webkit.org/show_bug.cgi?id=38458 + + * platform/qt/RenderThemeQt.cpp: + (WebCore::RenderThemeQt::initializeCommonQStyleOptions): + +2010-04-26 Luiz Agostini <luiz.agostini@openbossa.org> + + Reviewed by Kenneth Rohde Christiansen. + + View modes names in CSSValueKeywords.in + https://bugs.webkit.org/show_bug.cgi?id=38125 + + View mode names has changed in previous patch but CSSValueKeywords.in file was + not updated. + + * css/CSSValueKeywords.in: + +2010-04-28 Luiz Agostini <luiz.agostini@openbossa.org> + + Reviewed by Simon Fraser. + + Media queries empty values + https://bugs.webkit.org/show_bug.cgi?id=38116 + + Adding isValid() method to MediaQueryExp to make it possible to differentiate + between queries with empty values and queries with invalid values. + + Test: fast/media/media-query-invalid-value.html + + * css/MediaQueryEvaluator.cpp: + (WebCore::MediaQueryEvaluator::eval): + * css/MediaQueryExp.cpp: + (WebCore::MediaQueryExp::MediaQueryExp): + * css/MediaQueryExp.h: + (WebCore::MediaQueryExp::isValid): + +2010-05-05 Simon Hausmann <simon.hausmann@nokia.com> + + Reviewed by Tor Arne Vestbø. + + [Qt] Disable Qt Multimedia backend for HTML 5 Audio and Video elements + + Fall back to the Phonon backend until the release situation has been cleared up. + + * WebCore.pro: + 2010-05-03 Janne Koskinen <janne.p.koskinen@digia.com> Reviewed by Simon Hausmann. diff --git a/src/3rdparty/webkit/WebCore/WebCore.pri b/src/3rdparty/webkit/WebCore/WebCore.pri index 039f26c..ad514a2 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pri +++ b/src/3rdparty/webkit/WebCore/WebCore.pri @@ -96,10 +96,9 @@ greaterThan(QT_MINOR_VERSION, 5) { # Web Socket support. !contains(DEFINES, ENABLE_WEB_SOCKETS=.): DEFINES += ENABLE_WEB_SOCKETS=1 -# XSLT support with QtXmlPatterns +# Disable XSLT support with QtXmlPatterns in the 2.0 release !contains(DEFINES, ENABLE_XSLT=.) { - contains(QT_CONFIG, xmlpatterns):DEFINES += ENABLE_XSLT=1 - else:DEFINES += ENABLE_XSLT=0 + DEFINES += ENABLE_XSLT=0 } !CONFIG(QTDIR_build):!contains(DEFINES, ENABLE_QT_BEARER=.) { diff --git a/src/3rdparty/webkit/WebCore/WebCore.pro b/src/3rdparty/webkit/WebCore/WebCore.pro index 3d57562..beeb529 100644 --- a/src/3rdparty/webkit/WebCore/WebCore.pro +++ b/src/3rdparty/webkit/WebCore/WebCore.pro @@ -126,6 +126,10 @@ maemo5|symbian|embedded { } maemo5 { + DEFINES += WTF_USE_QT_MOBILE_THEME=1 +} + +contains(DEFINES, WTF_USE_QT_MOBILE_THEME=1) { DEFINES += ENABLE_NO_LISTBOX_RENDERING=1 } @@ -134,17 +138,12 @@ addJavaScriptCoreLib(../JavaScriptCore) # HTML5 Media Support -# We require phonon for versions of Qt < 4.7 -# We require QtMultimedia for versions of Qt >= 4.7 +# We require phonon. QtMultimedia support is disabled currently. !contains(DEFINES, ENABLE_VIDEO=.) { DEFINES -= ENABLE_VIDEO=1 DEFINES += ENABLE_VIDEO=0 - lessThan(QT_MINOR_VERSION, 7):contains(QT_CONFIG, phonon) { - DEFINES -= ENABLE_VIDEO=0 - DEFINES += ENABLE_VIDEO=1 - } - !lessThan(QT_MINOR_VERSION, 7):contains(QT_CONFIG, mediaservices) { + contains(QT_CONFIG, phonon) { DEFINES -= ENABLE_VIDEO=0 DEFINES += ENABLE_VIDEO=1 } @@ -2112,13 +2111,15 @@ SOURCES += \ ../WebKit/qt/Api/qwebinspector.cpp \ ../WebKit/qt/Api/qwebkitversion.cpp + +contains(DEFINES, WTF_USE_QT_MOBILE_THEME=1) { + HEADERS += platform/qt/Maemo5Webstyle.h + SOURCES += platform/qt/Maemo5Webstyle.cpp +} + maemo5 { - HEADERS += \ - ../WebKit/qt/WebCoreSupport/QtMaemoWebPopup.h \ - platform/qt/Maemo5Webstyle.h - SOURCES += \ - ../WebKit/qt/WebCoreSupport/QtMaemoWebPopup.cpp \ - platform/qt/Maemo5Webstyle.cpp + HEADERS += ../WebKit/qt/WebCoreSupport/QtMaemoWebPopup.h + SOURCES += ../WebKit/qt/WebCoreSupport/QtMaemoWebPopup.cpp } @@ -2369,8 +2370,8 @@ contains(DEFINES, ENABLE_VIDEO=1) { rendering/RenderMedia.cpp \ bindings/js/JSAudioConstructor.cpp - # QtMultimedia since 4.7 - greaterThan(QT_MINOR_VERSION, 6) { + # QtMultimedia disabled currently + false:greaterThan(QT_MINOR_VERSION, 6) { HEADERS += platform/graphics/qt/MediaPlayerPrivateQt.h SOURCES += platform/graphics/qt/MediaPlayerPrivateQt.cpp diff --git a/src/3rdparty/webkit/WebCore/css/CSSValueKeywords.in b/src/3rdparty/webkit/WebCore/css/CSSValueKeywords.in index 09d969a..1028dcf 100644 --- a/src/3rdparty/webkit/WebCore/css/CSSValueKeywords.in +++ b/src/3rdparty/webkit/WebCore/css/CSSValueKeywords.in @@ -711,7 +711,8 @@ geometricPrecision sRGB # (-webkit-view-mode:) media feature: -mini floating -application fullscreen +maximized +minimized +windowed diff --git a/src/3rdparty/webkit/WebCore/css/MediaQueryEvaluator.cpp b/src/3rdparty/webkit/WebCore/css/MediaQueryEvaluator.cpp index ded40b5..20c7bb9 100644 --- a/src/3rdparty/webkit/WebCore/css/MediaQueryEvaluator.cpp +++ b/src/3rdparty/webkit/WebCore/css/MediaQueryEvaluator.cpp @@ -533,6 +533,9 @@ bool MediaQueryEvaluator::eval(const MediaQueryExp* expr) const if (!m_frame || !m_style) return m_expResult; + if (!expr->isValid()) + return false; + if (!gFunctionMap) createFunctionMap(); diff --git a/src/3rdparty/webkit/WebCore/css/MediaQueryExp.cpp b/src/3rdparty/webkit/WebCore/css/MediaQueryExp.cpp index 7ba6d84..53c0b73 100644 --- a/src/3rdparty/webkit/WebCore/css/MediaQueryExp.cpp +++ b/src/3rdparty/webkit/WebCore/css/MediaQueryExp.cpp @@ -37,6 +37,7 @@ namespace WebCore { MediaQueryExp::MediaQueryExp(const AtomicString& mediaFeature, CSSParserValueList* valueList) : m_mediaFeature(mediaFeature) , m_value(0) + , m_isValid(true) { if (valueList) { if (valueList->size() == 1) { @@ -73,6 +74,7 @@ MediaQueryExp::MediaQueryExp(const AtomicString& mediaFeature, CSSParserValueLis if (isValid) m_value = list.release(); } + m_isValid = m_value; } } diff --git a/src/3rdparty/webkit/WebCore/css/MediaQueryExp.h b/src/3rdparty/webkit/WebCore/css/MediaQueryExp.h index fd55cf6..9272402 100644 --- a/src/3rdparty/webkit/WebCore/css/MediaQueryExp.h +++ b/src/3rdparty/webkit/WebCore/css/MediaQueryExp.h @@ -52,6 +52,8 @@ public: || (other.m_value && m_value && other.m_value->cssText() == m_value->cssText())); } + bool isValid() const { return m_isValid; } + bool isViewportDependent() const { return m_mediaFeature == MediaFeatureNames::widthMediaFeature || m_mediaFeature == MediaFeatureNames::heightMediaFeature || m_mediaFeature == MediaFeatureNames::min_widthMediaFeature || @@ -65,6 +67,7 @@ public: private: AtomicString m_mediaFeature; RefPtr<CSSValue> m_value; + bool m_isValid; }; } // namespace diff --git a/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.c b/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.c index 6a2581e..b7bf3de 100644 --- a/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.c +++ b/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.c @@ -203,7 +203,7 @@ findValue (register const char *str, register unsigned int len) { enum { - TOTAL_KEYWORDS = 613, + TOTAL_KEYWORDS = 614, MIN_WORD_LENGTH = 2, MAX_WORD_LENGTH = 35, MIN_HASH_VALUE = 0, @@ -226,7 +226,7 @@ findValue (register const char *str, register unsigned int len) {"end", CSSValueEnd}, #line 46 "CSSValueKeywords.gperf" {"700", CSSValue700}, -#line 621 "CSSValueKeywords.gperf" +#line 622 "CSSValueKeywords.gperf" {"lr", CSSValueLr}, #line 45 "CSSValueKeywords.gperf" {"600", CSSValue600}, @@ -236,17 +236,17 @@ findValue (register const char *str, register unsigned int len) {"400", CSSValue400}, #line 41 "CSSValueKeywords.gperf" {"200", CSSValue200}, -#line 623 "CSSValueKeywords.gperf" +#line 624 "CSSValueKeywords.gperf" {"tb", CSSValueTb}, #line 15 "CSSValueKeywords.gperf" {"inset", CSSValueInset}, #line 146 "CSSValueKeywords.gperf" {"sub", CSSValueSub}, -#line 520 "CSSValueKeywords.gperf" +#line 521 "CSSValueKeywords.gperf" {"indigo", CSSValueIndigo}, -#line 559 "CSSValueKeywords.gperf" +#line 560 "CSSValueKeywords.gperf" {"oldlace", CSSValueOldlace}, -#line 571 "CSSValueKeywords.gperf" +#line 572 "CSSValueKeywords.gperf" {"plum", CSSValuePlum}, #line 71 "CSSValueKeywords.gperf" {"cursive", CSSValueCursive}, @@ -264,7 +264,7 @@ findValue (register const char *str, register unsigned int len) {"armenian", CSSValueArmenian}, #line 299 "CSSValueKeywords.gperf" {"above", CSSValueAbove}, -#line 590 "CSSValueKeywords.gperf" +#line 591 "CSSValueKeywords.gperf" {"tomato", CSSValueTomato}, #line 36 "CSSValueKeywords.gperf" {"normal", CSSValueNormal}, @@ -272,7 +272,7 @@ findValue (register const char *str, register unsigned int len) {"cross", CSSValueCross}, #line 352 "CSSValueKeywords.gperf" {"multiple", CSSValueMultiple}, -#line 480 "CSSValueKeywords.gperf" +#line 481 "CSSValueKeywords.gperf" {"coral", CSSValueCoral}, #line 371 "CSSValueKeywords.gperf" {"ellipsis", CSSValueEllipsis}, @@ -294,7 +294,7 @@ findValue (register const char *str, register unsigned int len) {"contain", CSSValueContain}, #line 437 "CSSValueKeywords.gperf" {"logical", CSSValueLogical}, -#line 616 "CSSValueKeywords.gperf" +#line 617 "CSSValueKeywords.gperf" {"no-change", CSSValueNoChange}, #line 308 "CSSValueKeywords.gperf" {"crop", CSSValueCrop}, @@ -302,17 +302,17 @@ findValue (register const char *str, register unsigned int len) {"blue", CSSValueBlue}, #line 444 "CSSValueKeywords.gperf" {"ease", CSSValueEase}, -#line 588 "CSSValueKeywords.gperf" +#line 589 "CSSValueKeywords.gperf" {"tan", CSSValueTan}, #line 462 "CSSValueKeywords.gperf" {"srgb", CSSValueSrgb}, #line 53 "CSSValueKeywords.gperf" {"large", CSSValueLarge}, -#line 479 "CSSValueKeywords.gperf" +#line 480 "CSSValueKeywords.gperf" {"chocolate", CSSValueChocolate}, #line 258 "CSSValueKeywords.gperf" {"auto", CSSValueAuto}, -#line 618 "CSSValueKeywords.gperf" +#line 619 "CSSValueKeywords.gperf" {"lr-tb", CSSValueLrTb}, #line 298 "CSSValueKeywords.gperf" {"collapse", CSSValueCollapse}, @@ -326,9 +326,9 @@ findValue (register const char *str, register unsigned int len) {"orange", CSSValueOrange}, #line 18 "CSSValueKeywords.gperf" {"outset", CSSValueOutset}, -#line 576 "CSSValueKeywords.gperf" +#line 577 "CSSValueKeywords.gperf" {"salmon", CSSValueSalmon}, -#line 544 "CSSValueKeywords.gperf" +#line 545 "CSSValueKeywords.gperf" {"magenta", CSSValueMagenta}, #line 419 "CSSValueKeywords.gperf" {"caret", CSSValueCaret}, @@ -338,9 +338,9 @@ findValue (register const char *str, register unsigned int len) {"table", CSSValueTable}, #line 51 "CSSValueKeywords.gperf" {"small", CSSValueSmall}, -#line 613 "CSSValueKeywords.gperf" +#line 614 "CSSValueKeywords.gperf" {"hanging", CSSValueHanging}, -#line 474 "CSSValueKeywords.gperf" +#line 475 "CSSValueKeywords.gperf" {"blueviolet", CSSValueBlueviolet}, #line 243 "CSSValueKeywords.gperf" {"compact", CSSValueCompact}, @@ -368,10 +368,8 @@ findValue (register const char *str, register unsigned int len) {"top", CSSValueTop}, #line 310 "CSSValueKeywords.gperf" {"embed", CSSValueEmbed}, -#line 514 "CSSValueKeywords.gperf" +#line 515 "CSSValueKeywords.gperf" {"gold", CSSValueGold}, -#line 463 "CSSValueKeywords.gperf" - {"mini", CSSValueMini}, #line 439 "CSSValueKeywords.gperf" {"lines", CSSValueLines}, #line 351 "CSSValueKeywords.gperf" @@ -386,11 +384,11 @@ findValue (register const char *str, register unsigned int len) {"thin", CSSValueThin}, #line 21 "CSSValueKeywords.gperf" {"solid", CSSValueSolid}, -#line 543 "CSSValueKeywords.gperf" +#line 544 "CSSValueKeywords.gperf" {"linen", CSSValueLinen}, #line 319 "CSSValueKeywords.gperf" {"local", CSSValueLocal}, -#line 589 "CSSValueKeywords.gperf" +#line 590 "CSSValueKeywords.gperf" {"thistle", CSSValueThistle}, #line 392 "CSSValueKeywords.gperf" {"listitem", CSSValueListitem}, @@ -402,31 +400,31 @@ findValue (register const char *str, register unsigned int len) {"tibetan", CSSValueTibetan}, #line 105 "CSSValueKeywords.gperf" {"highlight", CSSValueHighlight}, -#line 484 "CSSValueKeywords.gperf" +#line 485 "CSSValueKeywords.gperf" {"cyan", CSSValueCyan}, -#line 483 "CSSValueKeywords.gperf" +#line 484 "CSSValueKeywords.gperf" {"crimson", CSSValueCrimson}, #line 117 "CSSValueKeywords.gperf" {"threedhighlight", CSSValueThreedhighlight}, -#line 592 "CSSValueKeywords.gperf" +#line 593 "CSSValueKeywords.gperf" {"violet", CSSValueViolet}, #line 164 "CSSValueKeywords.gperf" {"circle", CSSValueCircle}, #line 370 "CSSValueKeywords.gperf" {"clip", CSSValueClip}, -#line 535 "CSSValueKeywords.gperf" +#line 536 "CSSValueKeywords.gperf" {"lightsalmon", CSSValueLightsalmon}, -#line 557 "CSSValueKeywords.gperf" +#line 558 "CSSValueKeywords.gperf" {"moccasin", CSSValueMoccasin}, #line 206 "CSSValueKeywords.gperf" {"ethiopic", CSSValueEthiopic}, -#line 603 "CSSValueKeywords.gperf" +#line 604 "CSSValueKeywords.gperf" {"butt", CSSValueButt}, #line 356 "CSSValueKeywords.gperf" {"up", CSSValueUp}, #line 185 "CSSValueKeywords.gperf" {"urdu", CSSValueUrdu}, -#line 622 "CSSValueKeywords.gperf" +#line 623 "CSSValueKeywords.gperf" {"rl", CSSValueRl}, #line 312 "CSSValueKeywords.gperf" {"hand", CSSValueHand}, @@ -434,7 +432,7 @@ findValue (register const char *str, register unsigned int len) {"aqua", CSSValueAqua}, #line 211 "CSSValueKeywords.gperf" {"hangul", CSSValueHangul}, -#line 470 "CSSValueKeywords.gperf" +#line 471 "CSSValueKeywords.gperf" {"azure", CSSValueAzure}, #line 386 "CSSValueKeywords.gperf" {"button", CSSValueButton}, @@ -450,7 +448,7 @@ findValue (register const char *str, register unsigned int len) {"slow", CSSValueSlow}, #line 144 "CSSValueKeywords.gperf" {"baseline", CSSValueBaseline}, -#line 585 "CSSValueKeywords.gperf" +#line 586 "CSSValueKeywords.gperf" {"snow", CSSValueSnow}, #line 338 "CSSValueKeywords.gperf" {"static", CSSValueStatic}, @@ -460,7 +458,7 @@ findValue (register const char *str, register unsigned int len) {"outside", CSSValueOutside}, #line 306 "CSSValueKeywords.gperf" {"both", CSSValueBoth}, -#line 591 "CSSValueKeywords.gperf" +#line 592 "CSSValueKeywords.gperf" {"turquoise", CSSValueTurquoise}, #line 37 "CSSValueKeywords.gperf" {"bold", CSSValueBold}, @@ -470,11 +468,11 @@ findValue (register const char *str, register unsigned int len) {"inactivecaption", CSSValueInactivecaption}, #line 151 "CSSValueKeywords.gperf" {"bottom", CSSValueBottom}, -#line 612 "CSSValueKeywords.gperf" +#line 613 "CSSValueKeywords.gperf" {"alphabetic", CSSValueAlphabetic}, -#line 562 "CSSValueKeywords.gperf" +#line 563 "CSSValueKeywords.gperf" {"orchid", CSSValueOrchid}, -#line 620 "CSSValueKeywords.gperf" +#line 621 "CSSValueKeywords.gperf" {"tb-rl", CSSValueTbRl}, #line 32 "CSSValueKeywords.gperf" {"italic", CSSValueItalic}, @@ -486,7 +484,7 @@ findValue (register const char *str, register unsigned int len) {"oblique", CSSValueOblique}, #line 438 "CSSValueKeywords.gperf" {"visual", CSSValueVisual}, -#line 614 "CSSValueKeywords.gperf" +#line 615 "CSSValueKeywords.gperf" {"mathematical", CSSValueMathematical}, #line 22 "CSSValueKeywords.gperf" {"double", CSSValueDouble}, @@ -506,7 +504,7 @@ findValue (register const char *str, register unsigned int len) {"running", CSSValueRunning}, #line 279 "CSSValueKeywords.gperf" {"w-resize", CSSValueWResize}, -#line 513 "CSSValueKeywords.gperf" +#line 514 "CSSValueKeywords.gperf" {"ghostwhite", CSSValueGhostwhite}, #line 163 "CSSValueKeywords.gperf" {"disc", CSSValueDisc}, @@ -516,7 +514,7 @@ findValue (register const char *str, register unsigned int len) {"padding", CSSValuePadding}, #line 200 "CSSValueKeywords.gperf" {"amharic", CSSValueAmharic}, -#line 581 "CSSValueKeywords.gperf" +#line 582 "CSSValueKeywords.gperf" {"skyblue", CSSValueSkyblue}, #line 100 "CSSValueKeywords.gperf" {"buttonhighlight", CSSValueButtonhighlight}, @@ -524,8 +522,6 @@ findValue (register const char *str, register unsigned int len) {"landscape", CSSValueLandscape}, #line 246 "CSSValueKeywords.gperf" {"inline-table", CSSValueInlineTable}, -#line 465 "CSSValueKeywords.gperf" - {"application", CSSValueApplication}, #line 259 "CSSValueKeywords.gperf" {"crosshair", CSSValueCrosshair}, #line 267 "CSSValueKeywords.gperf" @@ -546,13 +542,13 @@ findValue (register const char *str, register unsigned int len) {"portrait", CSSValuePortrait}, #line 130 "CSSValueKeywords.gperf" {"no-repeat", CSSValueNoRepeat}, -#line 582 "CSSValueKeywords.gperf" +#line 583 "CSSValueKeywords.gperf" {"slateblue", CSSValueSlateblue}, #line 294 "CSSValueKeywords.gperf" {"capitalize", CSSValueCapitalize}, -#line 619 "CSSValueKeywords.gperf" +#line 620 "CSSValueKeywords.gperf" {"rl-tb", CSSValueRlTb}, -#line 602 "CSSValueKeywords.gperf" +#line 603 "CSSValueKeywords.gperf" {"crispedges", CSSValueCrispedges}, #line 293 "CSSValueKeywords.gperf" {"rtl", CSSValueRtl}, @@ -568,11 +564,13 @@ findValue (register const char *str, register unsigned int len) {"small-caps", CSSValueSmallCaps}, #line 147 "CSSValueKeywords.gperf" {"super", CSSValueSuper}, -#line 477 "CSSValueKeywords.gperf" +#line 478 "CSSValueKeywords.gperf" {"cadetblue", CSSValueCadetblue}, -#line 596 "CSSValueKeywords.gperf" +#line 466 "CSSValueKeywords.gperf" + {"minimized", CSSValueMinimized}, +#line 597 "CSSValueKeywords.gperf" {"nonzero", CSSValueNonzero}, -#line 475 "CSSValueKeywords.gperf" +#line 476 "CSSValueKeywords.gperf" {"brown", CSSValueBrown}, #line 90 "CSSValueKeywords.gperf" {"white", CSSValueWhite}, @@ -606,29 +604,29 @@ findValue (register const char *str, register unsigned int len) {"linear", CSSValueLinear}, #line 171 "CSSValueKeywords.gperf" {"cambodian", CSSValueCambodian}, -#line 467 "CSSValueKeywords.gperf" +#line 468 "CSSValueKeywords.gperf" {"aliceblue", CSSValueAliceblue}, -#line 527 "CSSValueKeywords.gperf" +#line 528 "CSSValueKeywords.gperf" {"lightblue", CSSValueLightblue}, #line 314 "CSSValueKeywords.gperf" {"higher", CSSValueHigher}, #line 19 "CSSValueKeywords.gperf" {"dotted", CSSValueDotted}, -#line 564 "CSSValueKeywords.gperf" +#line 565 "CSSValueKeywords.gperf" {"palegreen", CSSValuePalegreen}, #line 141 "CSSValueKeywords.gperf" {"xor", CSSValueXor}, #line 154 "CSSValueKeywords.gperf" {"left", CSSValueLeft}, -#line 519 "CSSValueKeywords.gperf" +#line 520 "CSSValueKeywords.gperf" {"indianred", CSSValueIndianred}, #line 39 "CSSValueKeywords.gperf" {"lighter", CSSValueLighter}, -#line 586 "CSSValueKeywords.gperf" +#line 587 "CSSValueKeywords.gperf" {"springgreen", CSSValueSpringgreen}, #line 80 "CSSValueKeywords.gperf" {"green", CSSValueGreen}, -#line 482 "CSSValueKeywords.gperf" +#line 483 "CSSValueKeywords.gperf" {"cornsilk", CSSValueCornsilk}, #line 79 "CSSValueKeywords.gperf" {"gray", CSSValueGray}, @@ -636,27 +634,27 @@ findValue (register const char *str, register unsigned int len) {"round", CSSValueRound}, #line 181 "CSSValueKeywords.gperf" {"myanmar", CSSValueMyanmar}, -#line 554 "CSSValueKeywords.gperf" +#line 555 "CSSValueKeywords.gperf" {"midnightblue", CSSValueMidnightblue}, #line 366 "CSSValueKeywords.gperf" {"element", CSSValueElement}, -#line 555 "CSSValueKeywords.gperf" +#line 556 "CSSValueKeywords.gperf" {"mintcream", CSSValueMintcream}, #line 242 "CSSValueKeywords.gperf" {"run-in", CSSValueRunIn}, #line 449 "CSSValueKeywords.gperf" {"document", CSSValueDocument}, -#line 540 "CSSValueKeywords.gperf" +#line 541 "CSSValueKeywords.gperf" {"lightsteelblue", CSSValueLightsteelblue}, #line 264 "CSSValueKeywords.gperf" {"cell", CSSValueCell}, #line 179 "CSSValueKeywords.gperf" {"malayalam", CSSValueMalayalam}, -#line 532 "CSSValueKeywords.gperf" +#line 533 "CSSValueKeywords.gperf" {"lightgreen", CSSValueLightgreen}, #line 92 "CSSValueKeywords.gperf" {"transparent", CSSValueTransparent}, -#line 542 "CSSValueKeywords.gperf" +#line 543 "CSSValueKeywords.gperf" {"limegreen", CSSValueLimegreen}, #line 456 "CSSValueKeywords.gperf" {"stroke", CSSValueStroke}, @@ -664,7 +662,7 @@ findValue (register const char *str, register unsigned int len) {"intrinsic", CSSValueIntrinsic}, #line 454 "CSSValueKeywords.gperf" {"painted", CSSValuePainted}, -#line 536 "CSSValueKeywords.gperf" +#line 537 "CSSValueKeywords.gperf" {"lightseagreen", CSSValueLightseagreen}, #line 331 "CSSValueKeywords.gperf" {"pre", CSSValuePre}, @@ -676,7 +674,7 @@ findValue (register const char *str, register unsigned int len) {"gurmukhi", CSSValueGurmukhi}, #line 348 "CSSValueKeywords.gperf" {"vertical", CSSValueVertical}, -#line 528 "CSSValueKeywords.gperf" +#line 529 "CSSValueKeywords.gperf" {"lightcoral", CSSValueLightcoral}, #line 384 "CSSValueKeywords.gperf" {"push-button", CSSValuePushButton}, @@ -696,7 +694,7 @@ findValue (register const char *str, register unsigned int len) {"close-quote", CSSValueCloseQuote}, #line 183 "CSSValueKeywords.gperf" {"oriya", CSSValueOriya}, -#line 464 "CSSValueKeywords.gperf" +#line 463 "CSSValueKeywords.gperf" {"floating", CSSValueFloating}, #line 143 "CSSValueKeywords.gperf" {"plus-lighter", CSSValuePlusLighter}, @@ -714,15 +712,15 @@ findValue (register const char *str, register unsigned int len) {"source-in", CSSValueSourceIn}, #line 261 "CSSValueKeywords.gperf" {"pointer", CSSValuePointer}, -#line 472 "CSSValueKeywords.gperf" +#line 473 "CSSValueKeywords.gperf" {"bisque", CSSValueBisque}, -#line 598 "CSSValueKeywords.gperf" +#line 599 "CSSValueKeywords.gperf" {"accumulate", CSSValueAccumulate}, #line 119 "CSSValueKeywords.gperf" {"threedshadow", CSSValueThreedshadow}, #line 339 "CSSValueKeywords.gperf" {"thick", CSSValueThick}, -#line 561 "CSSValueKeywords.gperf" +#line 562 "CSSValueKeywords.gperf" {"orangered", CSSValueOrangered}, #line 132 "CSSValueKeywords.gperf" {"copy", CSSValueCopy}, @@ -732,9 +730,9 @@ findValue (register const char *str, register unsigned int len) {"no-close-quote", CSSValueNoCloseQuote}, #line 459 "CSSValueKeywords.gperf" {"optimizespeed", CSSValueOptimizespeed}, -#line 570 "CSSValueKeywords.gperf" +#line 571 "CSSValueKeywords.gperf" {"pink", CSSValuePink}, -#line 604 "CSSValueKeywords.gperf" +#line 605 "CSSValueKeywords.gperf" {"miter", CSSValueMiter}, #line 442 "CSSValueKeywords.gperf" {"flat", CSSValueFlat}, @@ -744,7 +742,7 @@ findValue (register const char *str, register unsigned int len) {"bolder", CSSValueBolder}, #line 436 "CSSValueKeywords.gperf" {"cover", CSSValueCover}, -#line 469 "CSSValueKeywords.gperf" +#line 470 "CSSValueKeywords.gperf" {"aquamarine", CSSValueAquamarine}, #line 429 "CSSValueKeywords.gperf" {"border", CSSValueBorder}, @@ -760,7 +758,7 @@ findValue (register const char *str, register unsigned int len) {"button-bevel", CSSValueButtonBevel}, #line 325 "CSSValueKeywords.gperf" {"no-open-quote", CSSValueNoOpenQuote}, -#line 529 "CSSValueKeywords.gperf" +#line 530 "CSSValueKeywords.gperf" {"lightcyan", CSSValueLightcyan}, #line 118 "CSSValueKeywords.gperf" {"threedlightshadow", CSSValueThreedlightshadow}, @@ -772,13 +770,13 @@ findValue (register const char *str, register unsigned int len) {"ahead", CSSValueAhead}, #line 284 "CSSValueKeywords.gperf" {"col-resize", CSSValueColResize}, -#line 579 "CSSValueKeywords.gperf" +#line 580 "CSSValueKeywords.gperf" {"seashell", CSSValueSeashell}, -#line 473 "CSSValueKeywords.gperf" +#line 474 "CSSValueKeywords.gperf" {"blanchedalmond", CSSValueBlanchedalmond}, #line 76 "CSSValueKeywords.gperf" {"black", CSSValueBlack}, -#line 518 "CSSValueKeywords.gperf" +#line 519 "CSSValueKeywords.gperf" {"hotpink", CSSValueHotpink}, #line 78 "CSSValueKeywords.gperf" {"fuchsia", CSSValueFuchsia}, @@ -786,13 +784,13 @@ findValue (register const char *str, register unsigned int len) {"down", CSSValueDown}, #line 409 "CSSValueKeywords.gperf" {"menulist", CSSValueMenulist}, -#line 566 "CSSValueKeywords.gperf" +#line 567 "CSSValueKeywords.gperf" {"palevioletred", CSSValuePalevioletred}, -#line 515 "CSSValueKeywords.gperf" +#line 516 "CSSValueKeywords.gperf" {"goldenrod", CSSValueGoldenrod}, -#line 534 "CSSValueKeywords.gperf" +#line 535 "CSSValueKeywords.gperf" {"lightpink", CSSValueLightpink}, -#line 569 "CSSValueKeywords.gperf" +#line 570 "CSSValueKeywords.gperf" {"peru", CSSValuePeru}, #line 455 "CSSValueKeywords.gperf" {"fill", CSSValueFill}, @@ -800,7 +798,7 @@ findValue (register const char *str, register unsigned int len) {"kannada", CSSValueKannada}, #line 373 "CSSValueKeywords.gperf" {"dot-dash", CSSValueDotDash}, -#line 492 "CSSValueKeywords.gperf" +#line 493 "CSSValueKeywords.gperf" {"darkmagenta", CSSValueDarkmagenta}, #line 174 "CSSValueKeywords.gperf" {"gujarati", CSSValueGujarati}, @@ -816,17 +814,17 @@ findValue (register const char *str, register unsigned int len) {"currentcolor", CSSValueCurrentcolor}, #line 172 "CSSValueKeywords.gperf" {"khmer", CSSValueKhmer}, -#line 503 "CSSValueKeywords.gperf" +#line 504 "CSSValueKeywords.gperf" {"darkviolet", CSSValueDarkviolet}, #line 106 "CSSValueKeywords.gperf" {"highlighttext", CSSValueHighlighttext}, -#line 497 "CSSValueKeywords.gperf" +#line 498 "CSSValueKeywords.gperf" {"darksalmon", CSSValueDarksalmon}, #line 305 "CSSValueKeywords.gperf" {"blink", CSSValueBlink}, -#line 574 "CSSValueKeywords.gperf" +#line 575 "CSSValueKeywords.gperf" {"royalblue", CSSValueRoyalblue}, -#line 580 "CSSValueKeywords.gperf" +#line 581 "CSSValueKeywords.gperf" {"sienna", CSSValueSienna}, #line 349 "CSSValueKeywords.gperf" {"inline-axis", CSSValueInlineAxis}, @@ -840,7 +838,7 @@ findValue (register const char *str, register unsigned int len) {"buttonshadow", CSSValueButtonshadow}, #line 59 "CSSValueKeywords.gperf" {"wider", CSSValueWider}, -#line 468 "CSSValueKeywords.gperf" +#line 469 "CSSValueKeywords.gperf" {"antiquewhite", CSSValueAntiquewhite}, #line 54 "CSSValueKeywords.gperf" {"x-large", CSSValueXLarge}, @@ -848,7 +846,7 @@ findValue (register const char *str, register unsigned int len) {"ethiopic-abegede", CSSValueEthiopicAbegede}, #line 207 "CSSValueKeywords.gperf" {"ethiopic-halehame-gez", CSSValueEthiopicHalehameGez}, -#line 593 "CSSValueKeywords.gperf" +#line 594 "CSSValueKeywords.gperf" {"wheat", CSSValueWheat}, #line 295 "CSSValueKeywords.gperf" {"uppercase", CSSValueUppercase}, @@ -856,19 +854,21 @@ findValue (register const char *str, register unsigned int len) {"buttontext", CSSValueButtontext}, #line 317 "CSSValueKeywords.gperf" {"level", CSSValueLevel}, -#line 560 "CSSValueKeywords.gperf" +#line 561 "CSSValueKeywords.gperf" {"olivedrab", CSSValueOlivedrab}, -#line 512 "CSSValueKeywords.gperf" +#line 513 "CSSValueKeywords.gperf" {"gainsboro", CSSValueGainsboro}, +#line 465 "CSSValueKeywords.gperf" + {"maximized", CSSValueMaximized}, #line 186 "CSSValueKeywords.gperf" {"telugu", CSSValueTelugu}, -#line 607 "CSSValueKeywords.gperf" +#line 608 "CSSValueKeywords.gperf" {"after-edge", CSSValueAfterEdge}, #line 332 "CSSValueKeywords.gperf" {"pre-line", CSSValuePreLine}, #line 87 "CSSValueKeywords.gperf" {"red", CSSValueRed}, -#line 508 "CSSValueKeywords.gperf" +#line 509 "CSSValueKeywords.gperf" {"dodgerblue", CSSValueDodgerblue}, #line 83 "CSSValueKeywords.gperf" {"navy", CSSValueNavy}, @@ -882,7 +882,7 @@ findValue (register const char *str, register unsigned int len) {"inactivecaptiontext", CSSValueInactivecaptiontext}, #line 260 "CSSValueKeywords.gperf" {"default", CSSValueDefault}, -#line 471 "CSSValueKeywords.gperf" +#line 472 "CSSValueKeywords.gperf" {"beige", CSSValueBeige}, #line 244 "CSSValueKeywords.gperf" {"inline-block", CSSValueInlineBlock}, @@ -898,17 +898,17 @@ findValue (register const char *str, register unsigned int len) {"captiontext", CSSValueCaptiontext}, #line 166 "CSSValueKeywords.gperf" {"decimal", CSSValueDecimal}, -#line 583 "CSSValueKeywords.gperf" +#line 584 "CSSValueKeywords.gperf" {"slategray", CSSValueSlategray}, #line 156 "CSSValueKeywords.gperf" {"center", CSSValueCenter}, -#line 584 "CSSValueKeywords.gperf" +#line 585 "CSSValueKeywords.gperf" {"slategrey", CSSValueSlategrey}, #line 99 "CSSValueKeywords.gperf" {"buttonface", CSSValueButtonface}, -#line 563 "CSSValueKeywords.gperf" +#line 564 "CSSValueKeywords.gperf" {"palegoldenrod", CSSValuePalegoldenrod}, -#line 608 "CSSValueKeywords.gperf" +#line 609 "CSSValueKeywords.gperf" {"central", CSSValueCentral}, #line 269 "CSSValueKeywords.gperf" {"not-allowed", CSSValueNotAllowed}, @@ -924,21 +924,21 @@ findValue (register const char *str, register unsigned int len) {"sw-resize", CSSValueSwResize}, #line 318 "CSSValueKeywords.gperf" {"line-through", CSSValueLineThrough}, -#line 594 "CSSValueKeywords.gperf" +#line 595 "CSSValueKeywords.gperf" {"whitesmoke", CSSValueWhitesmoke}, -#line 466 "CSSValueKeywords.gperf" +#line 464 "CSSValueKeywords.gperf" {"fullscreen", CSSValueFullscreen}, #line 120 "CSSValueKeywords.gperf" {"window", CSSValueWindow}, #line 66 "CSSValueKeywords.gperf" {"expanded", CSSValueExpanded}, -#line 517 "CSSValueKeywords.gperf" +#line 518 "CSSValueKeywords.gperf" {"honeydew", CSSValueHoneydew}, #line 274 "CSSValueKeywords.gperf" {"nw-resize", CSSValueNwResize}, #line 326 "CSSValueKeywords.gperf" {"nowrap", CSSValueNowrap}, -#line 523 "CSSValueKeywords.gperf" +#line 524 "CSSValueKeywords.gperf" {"lavender", CSSValueLavender}, #line 233 "CSSValueKeywords.gperf" {"georgian", CSSValueGeorgian}, @@ -946,7 +946,7 @@ findValue (register const char *str, register unsigned int len) {"xx-small", CSSValueXxSmall}, #line 133 "CSSValueKeywords.gperf" {"source-over", CSSValueSourceOver}, -#line 511 "CSSValueKeywords.gperf" +#line 512 "CSSValueKeywords.gperf" {"forestgreen", CSSValueForestgreen}, #line 198 "CSSValueKeywords.gperf" {"ethiopic-halehame-aa-et", CSSValueEthiopicHalehameAaEt}, @@ -956,99 +956,99 @@ findValue (register const char *str, register unsigned int len) {"ethiopic-halehame-am-et", CSSValueEthiopicHalehameAmEt}, #line 452 "CSSValueKeywords.gperf" {"visiblefill", CSSValueVisiblefill}, -#line 558 "CSSValueKeywords.gperf" +#line 559 "CSSValueKeywords.gperf" {"navajowhite", CSSValueNavajowhite}, #line 303 "CSSValueKeywords.gperf" {"below", CSSValueBelow}, #line 286 "CSSValueKeywords.gperf" {"text", CSSValueText}, -#line 605 "CSSValueKeywords.gperf" +#line 606 "CSSValueKeywords.gperf" {"bevel", CSSValueBevel}, #line 214 "CSSValueKeywords.gperf" {"ethiopic-halehame-om-et", CSSValueEthiopicHalehameOmEt}, #line 276 "CSSValueKeywords.gperf" {"se-resize", CSSValueSeResize}, -#line 556 "CSSValueKeywords.gperf" +#line 557 "CSSValueKeywords.gperf" {"mistyrose", CSSValueMistyrose}, #line 218 "CSSValueKeywords.gperf" {"ethiopic-halehame-so-et", CSSValueEthiopicHalehameSoEt}, #line 432 "CSSValueKeywords.gperf" {"content-box", CSSValueContentBox}, -#line 541 "CSSValueKeywords.gperf" +#line 542 "CSSValueKeywords.gperf" {"lightyellow", CSSValueLightyellow}, -#line 531 "CSSValueKeywords.gperf" +#line 532 "CSSValueKeywords.gperf" {"lightgray", CSSValueLightgray}, #line 226 "CSSValueKeywords.gperf" {"ethiopic-halehame-ti-et", CSSValueEthiopicHalehameTiEt}, -#line 533 "CSSValueKeywords.gperf" +#line 534 "CSSValueKeywords.gperf" {"lightgrey", CSSValueLightgrey}, #line 265 "CSSValueKeywords.gperf" {"context-menu", CSSValueContextMenu}, #line 273 "CSSValueKeywords.gperf" {"ne-resize", CSSValueNeResize}, -#line 611 "CSSValueKeywords.gperf" +#line 612 "CSSValueKeywords.gperf" {"ideographic", CSSValueIdeographic}, -#line 478 "CSSValueKeywords.gperf" +#line 479 "CSSValueKeywords.gperf" {"chartreuse", CSSValueChartreuse}, -#line 522 "CSSValueKeywords.gperf" +#line 523 "CSSValueKeywords.gperf" {"khaki", CSSValueKhaki}, #line 250 "CSSValueKeywords.gperf" {"table-row", CSSValueTableRow}, -#line 600 "CSSValueKeywords.gperf" +#line 601 "CSSValueKeywords.gperf" {"linearrgb", CSSValueLinearrgb}, -#line 538 "CSSValueKeywords.gperf" - {"lightslategray", CSSValueLightslategray}, #line 539 "CSSValueKeywords.gperf" + {"lightslategray", CSSValueLightslategray}, +#line 540 "CSSValueKeywords.gperf" {"lightslategrey", CSSValueLightslategrey}, -#line 525 "CSSValueKeywords.gperf" +#line 526 "CSSValueKeywords.gperf" {"lawngreen", CSSValueLawngreen}, -#line 587 "CSSValueKeywords.gperf" +#line 588 "CSSValueKeywords.gperf" {"steelblue", CSSValueSteelblue}, #line 127 "CSSValueKeywords.gperf" {"repeat", CSSValueRepeat}, -#line 546 "CSSValueKeywords.gperf" +#line 547 "CSSValueKeywords.gperf" {"mediumblue", CSSValueMediumblue}, -#line 578 "CSSValueKeywords.gperf" +#line 579 "CSSValueKeywords.gperf" {"seagreen", CSSValueSeagreen}, #line 336 "CSSValueKeywords.gperf" {"separate", CSSValueSeparate}, -#line 565 "CSSValueKeywords.gperf" +#line 566 "CSSValueKeywords.gperf" {"paleturquoise", CSSValuePaleturquoise}, -#line 485 "CSSValueKeywords.gperf" +#line 486 "CSSValueKeywords.gperf" {"darkblue", CSSValueDarkblue}, #line 138 "CSSValueKeywords.gperf" {"destination-in", CSSValueDestinationIn}, -#line 476 "CSSValueKeywords.gperf" +#line 477 "CSSValueKeywords.gperf" {"burlywood", CSSValueBurlywood}, -#line 599 "CSSValueKeywords.gperf" +#line 600 "CSSValueKeywords.gperf" {"new", CSSValueNew}, -#line 550 "CSSValueKeywords.gperf" +#line 551 "CSSValueKeywords.gperf" {"mediumslateblue", CSSValueMediumslateblue}, #line 196 "CSSValueKeywords.gperf" {"upper-latin", CSSValueUpperLatin}, -#line 499 "CSSValueKeywords.gperf" +#line 500 "CSSValueKeywords.gperf" {"darkslateblue", CSSValueDarkslateblue}, -#line 549 "CSSValueKeywords.gperf" +#line 550 "CSSValueKeywords.gperf" {"mediumseagreen", CSSValueMediumseagreen}, #line 104 "CSSValueKeywords.gperf" {"graytext", CSSValueGraytext}, #line 458 "CSSValueKeywords.gperf" {"subpixel-antialiased", CSSValueSubpixelAntialiased}, -#line 489 "CSSValueKeywords.gperf" +#line 490 "CSSValueKeywords.gperf" {"darkgreen", CSSValueDarkgreen}, #line 140 "CSSValueKeywords.gperf" {"destination-atop", CSSValueDestinationAtop}, -#line 494 "CSSValueKeywords.gperf" +#line 495 "CSSValueKeywords.gperf" {"darkorange", CSSValueDarkorange}, #line 195 "CSSValueKeywords.gperf" {"upper-alpha", CSSValueUpperAlpha}, -#line 498 "CSSValueKeywords.gperf" +#line 499 "CSSValueKeywords.gperf" {"darkseagreen", CSSValueDarkseagreen}, #line 377 "CSSValueKeywords.gperf" {"skip-white-space", CSSValueSkipWhiteSpace}, #line 169 "CSSValueKeywords.gperf" {"binary", CSSValueBinary}, -#line 521 "CSSValueKeywords.gperf" +#line 522 "CSSValueKeywords.gperf" {"ivory", CSSValueIvory}, #line 460 "CSSValueKeywords.gperf" {"optimizelegibility", CSSValueOptimizelegibility}, @@ -1056,23 +1056,25 @@ findValue (register const char *str, register unsigned int len) {"serif", CSSValueSerif}, #line 60 "CSSValueKeywords.gperf" {"narrower", CSSValueNarrower}, -#line 575 "CSSValueKeywords.gperf" +#line 576 "CSSValueKeywords.gperf" {"saddlebrown", CSSValueSaddlebrown}, #line 209 "CSSValueKeywords.gperf" {"ethiopic-abegede-gez", CSSValueEthiopicAbegedeGez}, +#line 467 "CSSValueKeywords.gperf" + {"windowed", CSSValueWindowed}, #line 72 "CSSValueKeywords.gperf" {"fantasy", CSSValueFantasy}, #line 414 "CSSValueKeywords.gperf" {"progress-bar", CSSValueProgressBar}, -#line 493 "CSSValueKeywords.gperf" +#line 494 "CSSValueKeywords.gperf" {"darkolivegreen", CSSValueDarkolivegreen}, #line 31 "CSSValueKeywords.gperf" {"status-bar", CSSValueStatusBar}, -#line 506 "CSSValueKeywords.gperf" - {"dimgray", CSSValueDimgray}, #line 507 "CSSValueKeywords.gperf" + {"dimgray", CSSValueDimgray}, +#line 508 "CSSValueKeywords.gperf" {"dimgrey", CSSValueDimgrey}, -#line 567 "CSSValueKeywords.gperf" +#line 568 "CSSValueKeywords.gperf" {"papayawhip", CSSValuePapayawhip}, #line 453 "CSSValueKeywords.gperf" {"visiblestroke", CSSValueVisiblestroke}, @@ -1092,9 +1094,9 @@ findValue (register const char *str, register unsigned int len) {"destination-out", CSSValueDestinationOut}, #line 231 "CSSValueKeywords.gperf" {"hebrew", CSSValueHebrew}, -#line 617 "CSSValueKeywords.gperf" +#line 618 "CSSValueKeywords.gperf" {"reset-size", CSSValueResetSize}, -#line 597 "CSSValueKeywords.gperf" +#line 598 "CSSValueKeywords.gperf" {"evenodd", CSSValueEvenodd}, #line 107 "CSSValueKeywords.gperf" {"inactiveborder", CSSValueInactiveborder}, @@ -1106,7 +1108,7 @@ findValue (register const char *str, register unsigned int len) {"overline", CSSValueOverline}, #line 389 "CSSValueKeywords.gperf" {"inner-spin-button", CSSValueInnerSpinButton}, -#line 486 "CSSValueKeywords.gperf" +#line 487 "CSSValueKeywords.gperf" {"darkcyan", CSSValueDarkcyan}, #line 113 "CSSValueKeywords.gperf" {"menutext", CSSValueMenutext}, @@ -1114,15 +1116,15 @@ findValue (register const char *str, register unsigned int len) {"tigrinya-et", CSSValueTigrinyaEt}, #line 64 "CSSValueKeywords.gperf" {"semi-condensed", CSSValueSemiCondensed}, -#line 496 "CSSValueKeywords.gperf" +#line 497 "CSSValueKeywords.gperf" {"darkred", CSSValueDarkred}, -#line 601 "CSSValueKeywords.gperf" +#line 602 "CSSValueKeywords.gperf" {"optimizequality", CSSValueOptimizequality}, #line 203 "CSSValueKeywords.gperf" {"ethiopic-abegede-am-et", CSSValueEthiopicAbegedeAmEt}, #line 148 "CSSValueKeywords.gperf" {"text-top", CSSValueTextTop}, -#line 510 "CSSValueKeywords.gperf" +#line 511 "CSSValueKeywords.gperf" {"floralwhite", CSSValueFloralwhite}, #line 70 "CSSValueKeywords.gperf" {"sans-serif", CSSValueSansSerif}, @@ -1130,7 +1132,7 @@ findValue (register const char *str, register unsigned int len) {"padding-box", CSSValuePaddingBox}, #line 55 "CSSValueKeywords.gperf" {"xx-large", CSSValueXxLarge}, -#line 553 "CSSValueKeywords.gperf" +#line 554 "CSSValueKeywords.gperf" {"mediumvioletred", CSSValueMediumvioletred}, #line 228 "CSSValueKeywords.gperf" {"ethiopic-abegede-ti-et", CSSValueEthiopicAbegedeTiEt}, @@ -1140,13 +1142,13 @@ findValue (register const char *str, register unsigned int len) {"open-quote", CSSValueOpenQuote}, #line 61 "CSSValueKeywords.gperf" {"ultra-condensed", CSSValueUltraCondensed}, -#line 547 "CSSValueKeywords.gperf" +#line 548 "CSSValueKeywords.gperf" {"mediumorchid", CSSValueMediumorchid}, -#line 524 "CSSValueKeywords.gperf" +#line 525 "CSSValueKeywords.gperf" {"lavenderblush", CSSValueLavenderblush}, #line 199 "CSSValueKeywords.gperf" {"ethiopic-halehame-aa-er", CSSValueEthiopicHalehameAaEr}, -#line 495 "CSSValueKeywords.gperf" +#line 496 "CSSValueKeywords.gperf" {"darkorchid", CSSValueDarkorchid}, #line 410 "CSSValueKeywords.gperf" {"menulist-button", CSSValueMenulistButton}, @@ -1166,11 +1168,11 @@ findValue (register const char *str, register unsigned int len) {"ethiopic-halehame-ti-er", CSSValueEthiopicHalehameTiEr}, #line 95 "CSSValueKeywords.gperf" {"activeborder", CSSValueActiveborder}, -#line 516 "CSSValueKeywords.gperf" +#line 517 "CSSValueKeywords.gperf" {"greenyellow", CSSValueGreenyellow}, #line 443 "CSSValueKeywords.gperf" {"preserve-3d", CSSValuePreserve3d}, -#line 548 "CSSValueKeywords.gperf" +#line 549 "CSSValueKeywords.gperf" {"mediumpurple", CSSValueMediumpurple}, #line 263 "CSSValueKeywords.gperf" {"vertical-text", CSSValueVerticalText}, @@ -1178,7 +1180,7 @@ findValue (register const char *str, register unsigned int len) {"fixed", CSSValueFixed}, #line 378 "CSSValueKeywords.gperf" {"break-all", CSSValueBreakAll}, -#line 615 "CSSValueKeywords.gperf" +#line 616 "CSSValueKeywords.gperf" {"use-script", CSSValueUseScript}, #line 413 "CSSValueKeywords.gperf" {"outer-spin-button", CSSValueOuterSpinButton}, @@ -1198,23 +1200,23 @@ findValue (register const char *str, register unsigned int len) {"forwards", CSSValueForwards}, #line 251 "CSSValueKeywords.gperf" {"table-column-group", CSSValueTableColumnGroup}, -#line 606 "CSSValueKeywords.gperf" +#line 607 "CSSValueKeywords.gperf" {"before-edge", CSSValueBeforeEdge}, #line 415 "CSSValueKeywords.gperf" {"slider-horizontal", CSSValueSliderHorizontal}, -#line 537 "CSSValueKeywords.gperf" +#line 538 "CSSValueKeywords.gperf" {"lightskyblue", CSSValueLightskyblue}, #line 26 "CSSValueKeywords.gperf" {"message-box", CSSValueMessageBox}, -#line 545 "CSSValueKeywords.gperf" +#line 546 "CSSValueKeywords.gperf" {"mediumaquamarine", CSSValueMediumaquamarine}, #line 304 "CSSValueKeywords.gperf" {"bidi-override", CSSValueBidiOverride}, -#line 572 "CSSValueKeywords.gperf" +#line 573 "CSSValueKeywords.gperf" {"powderblue", CSSValuePowderblue}, #line 388 "CSSValueKeywords.gperf" {"default-button", CSSValueDefaultButton}, -#line 487 "CSSValueKeywords.gperf" +#line 488 "CSSValueKeywords.gperf" {"darkgoldenrod", CSSValueDarkgoldenrod}, #line 97 "CSSValueKeywords.gperf" {"appworkspace", CSSValueAppworkspace}, @@ -1232,23 +1234,23 @@ findValue (register const char *str, register unsigned int len) {"media-mute-button", CSSValueMediaMuteButton}, #line 346 "CSSValueKeywords.gperf" {"reverse", CSSValueReverse}, -#line 488 "CSSValueKeywords.gperf" +#line 489 "CSSValueKeywords.gperf" {"darkgray", CSSValueDarkgray}, -#line 490 "CSSValueKeywords.gperf" +#line 491 "CSSValueKeywords.gperf" {"darkgrey", CSSValueDarkgrey}, #line 282 "CSSValueKeywords.gperf" {"nesw-resize", CSSValueNeswResize}, -#line 551 "CSSValueKeywords.gperf" +#line 552 "CSSValueKeywords.gperf" {"mediumspringgreen", CSSValueMediumspringgreen}, #line 142 "CSSValueKeywords.gperf" {"plus-darker", CSSValuePlusDarker}, -#line 500 "CSSValueKeywords.gperf" - {"darkslategray", CSSValueDarkslategray}, #line 501 "CSSValueKeywords.gperf" + {"darkslategray", CSSValueDarkslategray}, +#line 502 "CSSValueKeywords.gperf" {"darkslategrey", CSSValueDarkslategrey}, #line 285 "CSSValueKeywords.gperf" {"row-resize", CSSValueRowResize}, -#line 577 "CSSValueKeywords.gperf" +#line 578 "CSSValueKeywords.gperf" {"sandybrown", CSSValueSandybrown}, #line 221 "CSSValueKeywords.gperf" {"tigrinya-er", CSSValueTigrinyaEr}, @@ -1258,27 +1260,27 @@ findValue (register const char *str, register unsigned int len) {"background", CSSValueBackground}, #line 430 "CSSValueKeywords.gperf" {"border-box", CSSValueBorderBox}, -#line 552 "CSSValueKeywords.gperf" +#line 553 "CSSValueKeywords.gperf" {"mediumturquoise", CSSValueMediumturquoise}, -#line 502 "CSSValueKeywords.gperf" +#line 503 "CSSValueKeywords.gperf" {"darkturquoise", CSSValueDarkturquoise}, #line 115 "CSSValueKeywords.gperf" {"threeddarkshadow", CSSValueThreeddarkshadow}, #line 224 "CSSValueKeywords.gperf" {"ethiopic-abegede-ti-er", CSSValueEthiopicAbegedeTiEr}, -#line 573 "CSSValueKeywords.gperf" +#line 574 "CSSValueKeywords.gperf" {"rosybrown", CSSValueRosybrown}, #line 328 "CSSValueKeywords.gperf" {"overlay", CSSValueOverlay}, -#line 491 "CSSValueKeywords.gperf" +#line 492 "CSSValueKeywords.gperf" {"darkkhaki", CSSValueDarkkhaki}, -#line 481 "CSSValueKeywords.gperf" +#line 482 "CSSValueKeywords.gperf" {"cornflowerblue", CSSValueCornflowerblue}, #line 402 "CSSValueKeywords.gperf" {"media-sliderthumb", CSSValueMediaSliderthumb}, #line 418 "CSSValueKeywords.gperf" {"sliderthumb-vertical", CSSValueSliderthumbVertical}, -#line 595 "CSSValueKeywords.gperf" +#line 596 "CSSValueKeywords.gperf" {"yellowgreen", CSSValueYellowgreen}, #line 354 "CSSValueKeywords.gperf" {"backwards", CSSValueBackwards}, @@ -1286,7 +1288,7 @@ findValue (register const char *str, register unsigned int len) {"table-header-group", CSSValueTableHeaderGroup}, #line 129 "CSSValueKeywords.gperf" {"repeat-y", CSSValueRepeatY}, -#line 509 "CSSValueKeywords.gperf" +#line 510 "CSSValueKeywords.gperf" {"firebrick", CSSValueFirebrick}, #line 382 "CSSValueKeywords.gperf" {"checkbox", CSSValueCheckbox}, @@ -1294,7 +1296,7 @@ findValue (register const char *str, register unsigned int len) {"media-volume-slider", CSSValueMediaVolumeSlider}, #line 230 "CSSValueKeywords.gperf" {"upper-norwegian", CSSValueUpperNorwegian}, -#line 530 "CSSValueKeywords.gperf" +#line 531 "CSSValueKeywords.gperf" {"lightgoldenrodyellow", CSSValueLightgoldenrodyellow}, #line 65 "CSSValueKeywords.gperf" {"semi-expanded", CSSValueSemiExpanded}, @@ -1318,7 +1320,7 @@ findValue (register const char *str, register unsigned int len) {"upper-greek", CSSValueUpperGreek}, #line 247 "CSSValueKeywords.gperf" {"table-row-group", CSSValueTableRowGroup}, -#line 526 "CSSValueKeywords.gperf" +#line 527 "CSSValueKeywords.gperf" {"lemonchiffon", CSSValueLemonchiffon}, #line 212 "CSSValueKeywords.gperf" {"lower-norwegian", CSSValueLowerNorwegian}, @@ -1328,7 +1330,7 @@ findValue (register const char *str, register unsigned int len) {"media-play-button", CSSValueMediaPlayButton}, #line 427 "CSSValueKeywords.gperf" {"caps-lock-indicator", CSSValueCapsLockIndicator}, -#line 504 "CSSValueKeywords.gperf" +#line 505 "CSSValueKeywords.gperf" {"deeppink", CSSValueDeeppink}, #line 121 "CSSValueKeywords.gperf" {"windowframe", CSSValueWindowframe}, @@ -1350,7 +1352,7 @@ findValue (register const char *str, register unsigned int len) {"table-footer-group", CSSValueTableFooterGroup}, #line 223 "CSSValueKeywords.gperf" {"tigrinya-er-abegede", CSSValueTigrinyaErAbegede}, -#line 568 "CSSValueKeywords.gperf" +#line 569 "CSSValueKeywords.gperf" {"peachpuff", CSSValuePeachpuff}, #line 379 "CSSValueKeywords.gperf" {"break-word", CSSValueBreakWord}, @@ -1376,11 +1378,11 @@ findValue (register const char *str, register unsigned int len) {"-webkit-center", CSSValueWebkitCenter}, #line 393 "CSSValueKeywords.gperf" {"media-fullscreen-button", CSSValueMediaFullscreenButton}, -#line 610 "CSSValueKeywords.gperf" +#line 611 "CSSValueKeywords.gperf" {"text-after-edge", CSSValueTextAfterEdge}, #line 30 "CSSValueKeywords.gperf" {"-webkit-control", CSSValueWebkitControl}, -#line 505 "CSSValueKeywords.gperf" +#line 506 "CSSValueKeywords.gperf" {"deepskyblue", CSSValueDeepskyblue}, #line 290 "CSSValueKeywords.gperf" {"-webkit-grab", CSSValueWebkitGrab}, @@ -1394,7 +1396,7 @@ findValue (register const char *str, register unsigned int len) {"-webkit-text", CSSValueWebkitText}, #line 94 "CSSValueKeywords.gperf" {"-webkit-activelink", CSSValueWebkitActivelink}, -#line 609 "CSSValueKeywords.gperf" +#line 610 "CSSValueKeywords.gperf" {"text-before-edge", CSSValueTextBeforeEdge}, #line 421 "CSSValueKeywords.gperf" {"searchfield-decoration", CSSValueSearchfieldDecoration}, @@ -1482,118 +1484,118 @@ findValue (register const char *str, register unsigned int len) -1, 66, -1, -1, -1, 67, 68, -1, -1, -1, 69, 70, 71, -1, -1, 72, -1, -1, 73, -1, -1, 74, -1, -1, -1, 75, -1, 76, -1, -1, - 77, 78, -1, -1, -1, -1, 79, -1, -1, -1, - -1, 80, 81, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 82, -1, -1, 83, 84, -1, -1, - -1, -1, -1, -1, -1, -1, 85, -1, -1, -1, - 86, 87, -1, -1, -1, 88, 89, -1, -1, -1, - -1, 90, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 91, 92, -1, -1, -1, + 77, 78, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 79, 80, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 81, -1, -1, 82, 83, -1, -1, + -1, -1, -1, -1, -1, -1, 84, -1, -1, -1, + 85, 86, -1, -1, -1, 87, 88, -1, -1, -1, + -1, 89, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 90, 91, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 92, -1, -1, -1, -1, -1, -1, -1, -1, -1, 93, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 94, -1, -1, -1, - 95, 96, -1, -1, -1, -1, -1, -1, -1, -1, - 97, -1, -1, 98, -1, -1, 99, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 100, -1, 101, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 102, -1, -1, -1, -1, - 103, -1, 104, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 105, -1, -1, 106, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 107, 108, 109, -1, -1, - -1, -1, 110, -1, -1, -1, -1, 111, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 112, -1, -1, - -1, 113, -1, -1, -1, -1, 114, 115, -1, -1, - 116, 117, -1, -1, -1, 118, -1, -1, -1, -1, - -1, 119, -1, -1, -1, -1, -1, -1, -1, -1, - 120, -1, -1, -1, -1, -1, 121, 122, -1, -1, - -1, 123, -1, -1, -1, -1, -1, -1, -1, 124, - 125, 126, 127, -1, -1, 128, -1, -1, 129, -1, - -1, 130, -1, 131, -1, 132, -1, 133, -1, -1, - -1, 134, 135, 136, -1, -1, 137, -1, -1, -1, - -1, -1, 138, 139, -1, 140, -1, 141, -1, -1, - 142, 143, -1, -1, -1, -1, -1, -1, -1, -1, - 144, -1, -1, 145, 146, -1, -1, -1, 147, -1, - -1, -1, -1, -1, -1, -1, 148, 149, -1, -1, - -1, 150, -1, -1, -1, 151, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 152, -1, -1, -1, -1, - -1, -1, 153, -1, -1, -1, -1, -1, -1, -1, + 94, 95, -1, -1, -1, -1, -1, -1, -1, -1, + 96, -1, -1, 97, -1, -1, 98, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 99, -1, 100, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 101, -1, -1, -1, -1, + 102, -1, 103, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 104, -1, -1, 105, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 106, 107, 108, -1, -1, + -1, -1, 109, -1, -1, -1, -1, 110, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 111, -1, -1, + -1, 112, -1, -1, -1, -1, 113, 114, -1, -1, + 115, 116, -1, -1, -1, 117, -1, -1, -1, -1, + -1, 118, -1, -1, -1, -1, -1, -1, -1, -1, + 119, -1, -1, -1, -1, -1, 120, 121, -1, -1, + -1, 122, -1, -1, -1, -1, -1, -1, -1, 123, + 124, 125, 126, -1, -1, 127, -1, -1, 128, -1, + -1, 129, -1, 130, -1, 131, -1, 132, -1, -1, + -1, 133, 134, 135, -1, -1, 136, -1, -1, -1, + -1, -1, 137, 138, -1, 139, -1, 140, -1, -1, + 141, 142, -1, -1, -1, -1, -1, -1, -1, -1, + 143, -1, -1, 144, 145, -1, -1, -1, 146, -1, + -1, -1, -1, -1, -1, -1, 147, 148, -1, -1, + -1, 149, -1, -1, -1, 150, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 151, -1, -1, -1, -1, + -1, -1, 152, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 153, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 154, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 155, -1, -1, -1, 156, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 157, -1, -1, -1, -1, 158, -1, -1, -1, - -1, 159, -1, -1, -1, 160, -1, -1, 161, -1, - 162, 163, -1, -1, -1, 164, -1, -1, -1, -1, - 165, -1, -1, 166, -1, 167, -1, 168, 169, -1, - -1, -1, -1, -1, -1, -1, -1, 170, -1, -1, - 171, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 172, 173, -1, -1, -1, -1, -1, -1, -1, - 174, 175, -1, -1, -1, 176, -1, -1, -1, 177, - 178, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 179, -1, -1, -1, -1, -1, 180, 181, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 182, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 183, -1, -1, -1, 184, -1, -1, -1, -1, - 185, -1, -1, -1, -1, -1, -1, 186, -1, -1, - -1, -1, -1, 187, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 188, -1, 189, -1, 190, -1, -1, - 191, 192, -1, -1, -1, -1, -1, -1, 193, -1, - 194, 195, -1, -1, -1, 196, 197, -1, 198, 199, - 200, 201, -1, -1, -1, 202, 203, -1, -1, -1, - 204, -1, -1, -1, -1, -1, -1, -1, 205, 206, - -1, -1, -1, -1, -1, -1, 207, 208, -1, -1, - -1, 209, 210, -1, -1, 211, -1, -1, 212, -1, - 213, 214, 215, -1, -1, 216, -1, -1, -1, -1, - -1, -1, -1, 217, -1, 218, -1, -1, -1, -1, - 219, -1, -1, -1, 220, 221, -1, 222, -1, -1, - -1, -1, 223, -1, -1, 224, 225, -1, -1, 226, - 227, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 228, 229, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 230, -1, -1, -1, -1, -1, 231, 232, -1, - -1, -1, -1, 233, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 234, 235, -1, -1, 236, -1, -1, -1, -1, - 237, -1, -1, 238, -1, -1, 239, 240, -1, -1, - -1, 241, -1, -1, -1, -1, 242, -1, -1, 243, - 244, -1, -1, -1, -1, -1, -1, 245, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 246, 247, -1, -1, -1, 248, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 249, -1, -1, - -1, 250, -1, 251, -1, 252, -1, 253, 254, -1, - -1, 255, 256, -1, -1, -1, -1, -1, -1, -1, - 257, -1, -1, -1, -1, 258, -1, 259, 260, -1, - -1, 261, -1, -1, -1, 262, -1, -1, -1, -1, - 263, -1, -1, -1, -1, 264, 265, 266, -1, -1, - 267, -1, 268, -1, -1, 269, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 270, -1, 271, -1, 272, - -1, -1, -1, -1, -1, 273, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 274, 275, - 276, 277, -1, -1, -1, 278, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 279, -1, -1, -1, -1, - -1, 280, -1, -1, -1, -1, 281, 282, 283, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 284, -1, - 285, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 286, -1, 287, -1, -1, -1, 288, -1, -1, -1, - 289, -1, -1, -1, -1, 290, 291, 292, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 293, -1, 294, -1, 295, -1, -1, -1, -1, - 296, 297, -1, -1, -1, 298, -1, -1, -1, -1, - -1, -1, -1, 299, -1, -1, -1, 300, -1, -1, - -1, -1, 301, -1, 302, -1, 303, 304, 305, -1, - -1, -1, -1, -1, -1, 306, 307, -1, -1, -1, - 308, -1, -1, -1, -1, 309, -1, 310, -1, -1, - -1, -1, -1, -1, 311, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 312, - -1, -1, 313, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 314, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 315, - -1, 316, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 317, -1, -1, 318, -1, -1, -1, - -1, -1, -1, -1, 319, -1, -1, 320, -1, -1, - -1, 321, -1, 322, -1, -1, -1, 323, -1, -1, - -1, -1, -1, -1, -1, -1, 324, 325, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 155, -1, -1, -1, -1, 156, -1, -1, -1, + -1, 157, -1, -1, -1, 158, -1, -1, 159, -1, + 160, 161, -1, -1, -1, 162, -1, -1, -1, -1, + 163, -1, -1, 164, -1, 165, -1, 166, 167, -1, + -1, -1, -1, -1, -1, -1, -1, 168, -1, -1, + 169, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 170, 171, -1, -1, -1, -1, -1, -1, -1, + 172, 173, -1, -1, -1, 174, -1, -1, -1, 175, + 176, -1, -1, -1, -1, -1, 177, -1, -1, -1, + 178, -1, -1, -1, -1, -1, 179, 180, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 181, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 182, -1, -1, -1, 183, -1, -1, -1, -1, + 184, -1, -1, -1, -1, -1, -1, 185, -1, -1, + -1, -1, -1, 186, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 187, -1, 188, -1, 189, -1, -1, + 190, 191, -1, -1, -1, -1, -1, -1, 192, -1, + 193, 194, -1, -1, -1, 195, 196, -1, 197, 198, + 199, 200, -1, -1, -1, 201, 202, -1, -1, -1, + 203, -1, -1, -1, -1, -1, -1, -1, 204, 205, + -1, -1, -1, -1, -1, -1, 206, 207, -1, -1, + -1, 208, 209, -1, -1, 210, -1, -1, 211, -1, + 212, 213, 214, -1, -1, 215, -1, -1, -1, -1, + -1, -1, -1, 216, -1, 217, -1, -1, -1, -1, + 218, -1, -1, -1, 219, 220, -1, 221, -1, -1, + -1, -1, 222, -1, -1, 223, 224, -1, -1, 225, + 226, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 227, 228, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 229, -1, -1, -1, -1, -1, 230, 231, -1, + -1, -1, -1, 232, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 233, 234, -1, -1, 235, -1, -1, -1, -1, + 236, -1, -1, 237, -1, -1, 238, 239, -1, -1, + -1, 240, -1, -1, -1, -1, 241, -1, -1, 242, + 243, -1, -1, -1, -1, -1, -1, 244, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 245, 246, -1, -1, -1, 247, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 248, -1, -1, + -1, 249, -1, 250, -1, 251, -1, 252, 253, -1, + -1, 254, 255, -1, -1, -1, -1, -1, -1, -1, + 256, -1, -1, -1, -1, 257, -1, 258, 259, -1, + -1, 260, -1, -1, -1, 261, -1, -1, -1, -1, + 262, -1, -1, -1, -1, 263, 264, 265, -1, -1, + 266, -1, 267, -1, -1, 268, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 269, -1, 270, -1, 271, + -1, -1, -1, -1, -1, 272, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 273, 274, + 275, 276, -1, -1, -1, 277, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 278, -1, -1, -1, -1, + -1, 279, -1, -1, -1, -1, 280, 281, 282, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 283, -1, + 284, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 285, -1, 286, -1, -1, -1, 287, -1, -1, -1, + 288, -1, -1, -1, -1, 289, 290, 291, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 292, -1, 293, -1, 294, -1, -1, -1, -1, + 295, 296, -1, -1, -1, 297, -1, -1, -1, -1, + -1, -1, -1, 298, -1, -1, -1, 299, -1, -1, + -1, -1, 300, -1, 301, -1, 302, 303, 304, -1, + -1, -1, -1, -1, -1, 305, 306, -1, -1, -1, + 307, -1, -1, -1, -1, 308, -1, 309, -1, -1, + -1, -1, -1, -1, 310, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 311, + -1, -1, 312, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 313, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 314, + -1, 315, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 316, -1, -1, 317, -1, -1, -1, + -1, -1, -1, -1, 318, -1, -1, 319, -1, -1, + -1, 320, -1, 321, -1, -1, -1, 322, -1, -1, + -1, -1, -1, -1, -1, 323, 324, 325, -1, -1, 326, -1, -1, -1, -1, 327, -1, -1, -1, -1, -1, 328, -1, -1, -1, -1, 329, -1, -1, -1, -1, 330, -1, -1, -1, 331, -1, -1, -1, -1, @@ -1639,136 +1641,135 @@ findValue (register const char *str, register unsigned int len) -1, 417, -1, -1, -1, -1, 418, -1, 419, -1, 420, -1, -1, -1, -1, -1, 421, -1, -1, -1, -1, 422, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 423, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 424, 425, -1, -1, -1, - -1, -1, -1, -1, -1, 426, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 427, -1, 428, -1, -1, -1, -1, 429, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 430, - 431, 432, -1, -1, -1, -1, -1, -1, -1, 433, - 434, -1, 435, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 436, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 437, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 438, -1, 439, -1, -1, 440, 441, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 442, -1, -1, - -1, -1, -1, 443, -1, -1, -1, -1, -1, -1, - -1, -1, 444, -1, -1, -1, -1, -1, -1, -1, - -1, 445, -1, -1, -1, 446, -1, 447, -1, -1, - -1, -1, -1, -1, -1, 448, -1, 449, -1, -1, - 450, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 451, -1, -1, -1, -1, -1, -1, 452, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 453, -1, -1, -1, 454, -1, 455, -1, -1, - 456, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 457, -1, -1, -1, -1, -1, -1, -1, 458, - -1, -1, 459, -1, -1, -1, 460, -1, -1, -1, - -1, 461, -1, -1, 462, 463, -1, -1, -1, -1, - -1, 464, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 465, -1, -1, -1, -1, 466, -1, -1, - -1, -1, -1, 467, -1, -1, -1, -1, -1, -1, - 468, -1, -1, -1, -1, 469, -1, -1, -1, -1, - -1, -1, -1, -1, 470, 471, -1, -1, 472, 473, - -1, -1, -1, 474, -1, -1, -1, 475, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 476, -1, -1, - -1, -1, 477, -1, -1, -1, -1, 478, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 479, -1, 480, -1, -1, - -1, -1, -1, -1, -1, -1, 481, 482, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 483, -1, 484, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 485, -1, -1, 486, -1, 487, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 488, 489, -1, -1, -1, -1, - -1, -1, 490, -1, -1, -1, -1, -1, -1, -1, - -1, 491, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 423, 424, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 425, 426, -1, -1, -1, + -1, -1, -1, -1, -1, 427, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 428, -1, 429, -1, -1, -1, -1, 430, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 431, + 432, 433, -1, -1, -1, -1, -1, -1, -1, 434, + 435, -1, 436, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 437, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 438, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 439, -1, 440, -1, -1, 441, 442, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 443, -1, -1, + -1, -1, -1, 444, -1, -1, -1, -1, -1, -1, + -1, -1, 445, -1, -1, -1, -1, -1, -1, -1, + -1, 446, -1, -1, -1, 447, -1, 448, -1, -1, + -1, -1, -1, -1, -1, 449, -1, 450, -1, -1, + 451, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 452, -1, -1, -1, -1, -1, -1, 453, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 454, -1, -1, -1, 455, -1, 456, -1, -1, + 457, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 458, -1, -1, -1, -1, -1, -1, -1, 459, + -1, -1, 460, -1, -1, -1, 461, -1, -1, -1, + -1, 462, -1, -1, 463, 464, -1, -1, -1, -1, + -1, 465, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 466, -1, -1, -1, -1, 467, -1, -1, + -1, -1, -1, 468, -1, -1, -1, -1, -1, -1, + 469, -1, -1, -1, -1, 470, -1, -1, -1, -1, + -1, -1, -1, -1, 471, 472, -1, -1, 473, 474, + -1, -1, -1, 475, -1, -1, -1, 476, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 477, -1, -1, + -1, -1, 478, -1, -1, -1, -1, 479, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 480, -1, 481, -1, -1, + -1, -1, -1, -1, -1, -1, 482, 483, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 484, -1, 485, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 486, -1, -1, 487, -1, 488, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 489, 490, -1, -1, -1, -1, + -1, -1, 491, -1, -1, -1, -1, -1, -1, -1, -1, 492, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 493, -1, -1, + -1, 493, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 494, -1, -1, - -1, -1, -1, -1, -1, 495, -1, -1, -1, -1, - -1, 496, 497, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 498, -1, - 499, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 500, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 495, -1, -1, + -1, -1, -1, -1, -1, 496, -1, -1, -1, -1, + -1, 497, 498, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 499, -1, + 500, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 501, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 501, -1, -1, -1, -1, -1, -1, - -1, -1, 502, -1, -1, 503, -1, -1, -1, -1, - -1, -1, -1, 504, -1, -1, -1, -1, -1, -1, - 505, 506, -1, -1, -1, -1, 507, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 508, 509, -1, -1, -1, - -1, -1, -1, 510, -1, -1, -1, -1, 511, -1, - -1, 512, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 502, -1, -1, -1, -1, -1, -1, + -1, -1, 503, -1, -1, 504, -1, -1, -1, -1, + -1, -1, -1, 505, -1, -1, -1, -1, -1, -1, + 506, 507, -1, -1, -1, -1, 508, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 513, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 514, - -1, -1, -1, 515, -1, -1, -1, -1, 516, -1, - 517, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 509, 510, -1, -1, -1, + -1, -1, -1, 511, -1, -1, -1, -1, 512, -1, + -1, 513, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 518, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 519, -1, -1, + -1, -1, 514, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 515, + -1, -1, -1, 516, -1, -1, -1, -1, 517, -1, + 518, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 520, -1, -1, -1, -1, -1, -1, -1, 521, -1, - 522, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 523, -1, -1, + -1, 519, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 520, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 524, + 521, -1, -1, -1, -1, -1, -1, -1, 522, -1, + 523, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 524, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 525, - -1, -1, -1, -1, -1, -1, 526, -1, -1, -1, - -1, 527, -1, -1, -1, -1, 528, -1, -1, -1, - -1, -1, 529, -1, -1, -1, -1, -1, -1, -1, - -1, 530, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 526, + -1, -1, -1, -1, -1, -1, 527, -1, -1, -1, + -1, 528, -1, -1, -1, -1, 529, -1, -1, -1, + -1, -1, 530, -1, -1, -1, -1, -1, -1, -1, -1, 531, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 532, - -1, -1, 533, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 532, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 533, + -1, -1, 534, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 534, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 535, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 536, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 535, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 536, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 537, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 537, -1, -1, -1, 538, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 539, -1, -1, - -1, 540, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 541, -1, -1, -1, -1, 542, -1, -1, -1, -1, + -1, -1, -1, 538, -1, -1, -1, 539, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 540, -1, -1, + -1, 541, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 543, -1, 544, -1, -1, -1, -1, - 545, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 542, -1, -1, -1, -1, 543, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 546, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 547, -1, + -1, -1, -1, 544, -1, 545, -1, -1, -1, -1, + 546, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 547, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 548, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 548, -1, -1, 549, -1, -1, -1, -1, - 550, -1, 551, -1, -1, -1, -1, 552, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 553, -1, -1, -1, - -1, -1, 554, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 549, -1, -1, 550, -1, -1, -1, -1, + 551, -1, 552, -1, -1, -1, -1, 553, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 555, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 554, -1, -1, -1, + -1, -1, 555, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 556, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 556, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 557, - -1, -1, 558, 559, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 557, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 558, + -1, -1, 559, 560, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 560, -1, -1, -1, - -1, -1, -1, 561, -1, 562, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 561, -1, -1, -1, + -1, -1, -1, 562, -1, 563, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1787,38 +1788,38 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 563, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 564, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 564, -1, -1, 565, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 565, -1, -1, 566, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 566, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 567, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 567, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 568, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 568, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 569, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 569, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 570, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 570, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 571, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 571, -1, -1, -1, - -1, -1, 572, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 572, -1, -1, -1, + -1, -1, 573, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1826,12 +1827,12 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 573, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 574, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 574, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 575, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 575, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 576, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1847,58 +1848,59 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 576, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 577, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 577, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 578, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 578, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 579, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 579, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 580, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 580, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - 581, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 582, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 583, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 581, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + 582, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 583, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 584, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 584, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 585, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 585, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, 586, -1, -1, -1, -1, -1, - -1, -1, 587, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 586, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, 587, -1, -1, -1, -1, -1, + -1, -1, 588, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, 588, - -1, -1, 589, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, 589, + -1, -1, 590, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 590, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 591, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, 592, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 593, -1, -1, -1, -1, -1, -1, -1, + -1, 593, -1, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 594, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1907,37 +1909,37 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 594, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 595, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 595, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 596, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 596, -1, 597, -1, -1, -1, -1, 598, - -1, -1, -1, -1, -1, -1, -1, 599, -1, -1, + -1, -1, 597, -1, 598, -1, -1, -1, -1, 599, + -1, -1, -1, -1, -1, -1, -1, 600, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 600, -1, -1, + -1, -1, -1, -1, -1, -1, -1, 601, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 601, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 602, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 602, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 603, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 603, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 604, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 604, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 605, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1959,14 +1961,14 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, 605, -1, -1, -1, -1, + -1, -1, -1, -1, -1, 606, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, 606, -1, -1, -1, -1, -1, -1, -1, + -1, -1, 607, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -1980,7 +1982,7 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 607, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 608, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -2023,7 +2025,7 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, 608, -1, -1, -1, + -1, -1, -1, -1, -1, -1, 609, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -2060,7 +2062,7 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, 609, -1, -1, -1, -1, -1, -1, -1, -1, + -1, 610, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -2074,7 +2076,7 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, 610, -1, -1, -1, -1, -1, -1, + -1, -1, -1, 611, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -2133,7 +2135,7 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 611, -1, + -1, -1, -1, -1, -1, -1, -1, -1, 612, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -2157,7 +2159,7 @@ findValue (register const char *str, register unsigned int len) -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, 612 + -1, -1, -1, -1, -1, -1, -1, -1, 613 }; if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH) @@ -2179,7 +2181,7 @@ findValue (register const char *str, register unsigned int len) } return 0; } -#line 624 "CSSValueKeywords.gperf" +#line 625 "CSSValueKeywords.gperf" static const char * const valueList[] = { "", @@ -2635,10 +2637,11 @@ static const char * const valueList[] = { "optimizelegibility", "geometricprecision", "srgb", -"mini", "floating", -"application", "fullscreen", +"maximized", +"minimized", +"windowed", "aliceblue", "antiquewhite", "aquamarine", diff --git a/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.h b/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.h index d79e658..71e8514 100644 --- a/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.h +++ b/src/3rdparty/webkit/WebCore/generated/CSSValueKeywords.h @@ -456,168 +456,169 @@ const int CSSValueOptimizespeed = 449; const int CSSValueOptimizelegibility = 450; const int CSSValueGeometricprecision = 451; const int CSSValueSrgb = 452; -const int CSSValueMini = 453; -const int CSSValueFloating = 454; -const int CSSValueApplication = 455; -const int CSSValueFullscreen = 456; -const int CSSValueAliceblue = 457; -const int CSSValueAntiquewhite = 458; -const int CSSValueAquamarine = 459; -const int CSSValueAzure = 460; -const int CSSValueBeige = 461; -const int CSSValueBisque = 462; -const int CSSValueBlanchedalmond = 463; -const int CSSValueBlueviolet = 464; -const int CSSValueBrown = 465; -const int CSSValueBurlywood = 466; -const int CSSValueCadetblue = 467; -const int CSSValueChartreuse = 468; -const int CSSValueChocolate = 469; -const int CSSValueCoral = 470; -const int CSSValueCornflowerblue = 471; -const int CSSValueCornsilk = 472; -const int CSSValueCrimson = 473; -const int CSSValueCyan = 474; -const int CSSValueDarkblue = 475; -const int CSSValueDarkcyan = 476; -const int CSSValueDarkgoldenrod = 477; -const int CSSValueDarkgray = 478; -const int CSSValueDarkgreen = 479; -const int CSSValueDarkgrey = 480; -const int CSSValueDarkkhaki = 481; -const int CSSValueDarkmagenta = 482; -const int CSSValueDarkolivegreen = 483; -const int CSSValueDarkorange = 484; -const int CSSValueDarkorchid = 485; -const int CSSValueDarkred = 486; -const int CSSValueDarksalmon = 487; -const int CSSValueDarkseagreen = 488; -const int CSSValueDarkslateblue = 489; -const int CSSValueDarkslategray = 490; -const int CSSValueDarkslategrey = 491; -const int CSSValueDarkturquoise = 492; -const int CSSValueDarkviolet = 493; -const int CSSValueDeeppink = 494; -const int CSSValueDeepskyblue = 495; -const int CSSValueDimgray = 496; -const int CSSValueDimgrey = 497; -const int CSSValueDodgerblue = 498; -const int CSSValueFirebrick = 499; -const int CSSValueFloralwhite = 500; -const int CSSValueForestgreen = 501; -const int CSSValueGainsboro = 502; -const int CSSValueGhostwhite = 503; -const int CSSValueGold = 504; -const int CSSValueGoldenrod = 505; -const int CSSValueGreenyellow = 506; -const int CSSValueHoneydew = 507; -const int CSSValueHotpink = 508; -const int CSSValueIndianred = 509; -const int CSSValueIndigo = 510; -const int CSSValueIvory = 511; -const int CSSValueKhaki = 512; -const int CSSValueLavender = 513; -const int CSSValueLavenderblush = 514; -const int CSSValueLawngreen = 515; -const int CSSValueLemonchiffon = 516; -const int CSSValueLightblue = 517; -const int CSSValueLightcoral = 518; -const int CSSValueLightcyan = 519; -const int CSSValueLightgoldenrodyellow = 520; -const int CSSValueLightgray = 521; -const int CSSValueLightgreen = 522; -const int CSSValueLightgrey = 523; -const int CSSValueLightpink = 524; -const int CSSValueLightsalmon = 525; -const int CSSValueLightseagreen = 526; -const int CSSValueLightskyblue = 527; -const int CSSValueLightslategray = 528; -const int CSSValueLightslategrey = 529; -const int CSSValueLightsteelblue = 530; -const int CSSValueLightyellow = 531; -const int CSSValueLimegreen = 532; -const int CSSValueLinen = 533; -const int CSSValueMagenta = 534; -const int CSSValueMediumaquamarine = 535; -const int CSSValueMediumblue = 536; -const int CSSValueMediumorchid = 537; -const int CSSValueMediumpurple = 538; -const int CSSValueMediumseagreen = 539; -const int CSSValueMediumslateblue = 540; -const int CSSValueMediumspringgreen = 541; -const int CSSValueMediumturquoise = 542; -const int CSSValueMediumvioletred = 543; -const int CSSValueMidnightblue = 544; -const int CSSValueMintcream = 545; -const int CSSValueMistyrose = 546; -const int CSSValueMoccasin = 547; -const int CSSValueNavajowhite = 548; -const int CSSValueOldlace = 549; -const int CSSValueOlivedrab = 550; -const int CSSValueOrangered = 551; -const int CSSValueOrchid = 552; -const int CSSValuePalegoldenrod = 553; -const int CSSValuePalegreen = 554; -const int CSSValuePaleturquoise = 555; -const int CSSValuePalevioletred = 556; -const int CSSValuePapayawhip = 557; -const int CSSValuePeachpuff = 558; -const int CSSValuePeru = 559; -const int CSSValuePink = 560; -const int CSSValuePlum = 561; -const int CSSValuePowderblue = 562; -const int CSSValueRosybrown = 563; -const int CSSValueRoyalblue = 564; -const int CSSValueSaddlebrown = 565; -const int CSSValueSalmon = 566; -const int CSSValueSandybrown = 567; -const int CSSValueSeagreen = 568; -const int CSSValueSeashell = 569; -const int CSSValueSienna = 570; -const int CSSValueSkyblue = 571; -const int CSSValueSlateblue = 572; -const int CSSValueSlategray = 573; -const int CSSValueSlategrey = 574; -const int CSSValueSnow = 575; -const int CSSValueSpringgreen = 576; -const int CSSValueSteelblue = 577; -const int CSSValueTan = 578; -const int CSSValueThistle = 579; -const int CSSValueTomato = 580; -const int CSSValueTurquoise = 581; -const int CSSValueViolet = 582; -const int CSSValueWheat = 583; -const int CSSValueWhitesmoke = 584; -const int CSSValueYellowgreen = 585; -const int CSSValueNonzero = 586; -const int CSSValueEvenodd = 587; -const int CSSValueAccumulate = 588; -const int CSSValueNew = 589; -const int CSSValueLinearrgb = 590; -const int CSSValueOptimizequality = 591; -const int CSSValueCrispedges = 592; -const int CSSValueButt = 593; -const int CSSValueMiter = 594; -const int CSSValueBevel = 595; -const int CSSValueBeforeEdge = 596; -const int CSSValueAfterEdge = 597; -const int CSSValueCentral = 598; -const int CSSValueTextBeforeEdge = 599; -const int CSSValueTextAfterEdge = 600; -const int CSSValueIdeographic = 601; -const int CSSValueAlphabetic = 602; -const int CSSValueHanging = 603; -const int CSSValueMathematical = 604; -const int CSSValueUseScript = 605; -const int CSSValueNoChange = 606; -const int CSSValueResetSize = 607; -const int CSSValueLrTb = 608; -const int CSSValueRlTb = 609; -const int CSSValueTbRl = 610; -const int CSSValueLr = 611; -const int CSSValueRl = 612; -const int CSSValueTb = 613; -const int numCSSValueKeywords = 614; +const int CSSValueFloating = 453; +const int CSSValueFullscreen = 454; +const int CSSValueMaximized = 455; +const int CSSValueMinimized = 456; +const int CSSValueWindowed = 457; +const int CSSValueAliceblue = 458; +const int CSSValueAntiquewhite = 459; +const int CSSValueAquamarine = 460; +const int CSSValueAzure = 461; +const int CSSValueBeige = 462; +const int CSSValueBisque = 463; +const int CSSValueBlanchedalmond = 464; +const int CSSValueBlueviolet = 465; +const int CSSValueBrown = 466; +const int CSSValueBurlywood = 467; +const int CSSValueCadetblue = 468; +const int CSSValueChartreuse = 469; +const int CSSValueChocolate = 470; +const int CSSValueCoral = 471; +const int CSSValueCornflowerblue = 472; +const int CSSValueCornsilk = 473; +const int CSSValueCrimson = 474; +const int CSSValueCyan = 475; +const int CSSValueDarkblue = 476; +const int CSSValueDarkcyan = 477; +const int CSSValueDarkgoldenrod = 478; +const int CSSValueDarkgray = 479; +const int CSSValueDarkgreen = 480; +const int CSSValueDarkgrey = 481; +const int CSSValueDarkkhaki = 482; +const int CSSValueDarkmagenta = 483; +const int CSSValueDarkolivegreen = 484; +const int CSSValueDarkorange = 485; +const int CSSValueDarkorchid = 486; +const int CSSValueDarkred = 487; +const int CSSValueDarksalmon = 488; +const int CSSValueDarkseagreen = 489; +const int CSSValueDarkslateblue = 490; +const int CSSValueDarkslategray = 491; +const int CSSValueDarkslategrey = 492; +const int CSSValueDarkturquoise = 493; +const int CSSValueDarkviolet = 494; +const int CSSValueDeeppink = 495; +const int CSSValueDeepskyblue = 496; +const int CSSValueDimgray = 497; +const int CSSValueDimgrey = 498; +const int CSSValueDodgerblue = 499; +const int CSSValueFirebrick = 500; +const int CSSValueFloralwhite = 501; +const int CSSValueForestgreen = 502; +const int CSSValueGainsboro = 503; +const int CSSValueGhostwhite = 504; +const int CSSValueGold = 505; +const int CSSValueGoldenrod = 506; +const int CSSValueGreenyellow = 507; +const int CSSValueHoneydew = 508; +const int CSSValueHotpink = 509; +const int CSSValueIndianred = 510; +const int CSSValueIndigo = 511; +const int CSSValueIvory = 512; +const int CSSValueKhaki = 513; +const int CSSValueLavender = 514; +const int CSSValueLavenderblush = 515; +const int CSSValueLawngreen = 516; +const int CSSValueLemonchiffon = 517; +const int CSSValueLightblue = 518; +const int CSSValueLightcoral = 519; +const int CSSValueLightcyan = 520; +const int CSSValueLightgoldenrodyellow = 521; +const int CSSValueLightgray = 522; +const int CSSValueLightgreen = 523; +const int CSSValueLightgrey = 524; +const int CSSValueLightpink = 525; +const int CSSValueLightsalmon = 526; +const int CSSValueLightseagreen = 527; +const int CSSValueLightskyblue = 528; +const int CSSValueLightslategray = 529; +const int CSSValueLightslategrey = 530; +const int CSSValueLightsteelblue = 531; +const int CSSValueLightyellow = 532; +const int CSSValueLimegreen = 533; +const int CSSValueLinen = 534; +const int CSSValueMagenta = 535; +const int CSSValueMediumaquamarine = 536; +const int CSSValueMediumblue = 537; +const int CSSValueMediumorchid = 538; +const int CSSValueMediumpurple = 539; +const int CSSValueMediumseagreen = 540; +const int CSSValueMediumslateblue = 541; +const int CSSValueMediumspringgreen = 542; +const int CSSValueMediumturquoise = 543; +const int CSSValueMediumvioletred = 544; +const int CSSValueMidnightblue = 545; +const int CSSValueMintcream = 546; +const int CSSValueMistyrose = 547; +const int CSSValueMoccasin = 548; +const int CSSValueNavajowhite = 549; +const int CSSValueOldlace = 550; +const int CSSValueOlivedrab = 551; +const int CSSValueOrangered = 552; +const int CSSValueOrchid = 553; +const int CSSValuePalegoldenrod = 554; +const int CSSValuePalegreen = 555; +const int CSSValuePaleturquoise = 556; +const int CSSValuePalevioletred = 557; +const int CSSValuePapayawhip = 558; +const int CSSValuePeachpuff = 559; +const int CSSValuePeru = 560; +const int CSSValuePink = 561; +const int CSSValuePlum = 562; +const int CSSValuePowderblue = 563; +const int CSSValueRosybrown = 564; +const int CSSValueRoyalblue = 565; +const int CSSValueSaddlebrown = 566; +const int CSSValueSalmon = 567; +const int CSSValueSandybrown = 568; +const int CSSValueSeagreen = 569; +const int CSSValueSeashell = 570; +const int CSSValueSienna = 571; +const int CSSValueSkyblue = 572; +const int CSSValueSlateblue = 573; +const int CSSValueSlategray = 574; +const int CSSValueSlategrey = 575; +const int CSSValueSnow = 576; +const int CSSValueSpringgreen = 577; +const int CSSValueSteelblue = 578; +const int CSSValueTan = 579; +const int CSSValueThistle = 580; +const int CSSValueTomato = 581; +const int CSSValueTurquoise = 582; +const int CSSValueViolet = 583; +const int CSSValueWheat = 584; +const int CSSValueWhitesmoke = 585; +const int CSSValueYellowgreen = 586; +const int CSSValueNonzero = 587; +const int CSSValueEvenodd = 588; +const int CSSValueAccumulate = 589; +const int CSSValueNew = 590; +const int CSSValueLinearrgb = 591; +const int CSSValueOptimizequality = 592; +const int CSSValueCrispedges = 593; +const int CSSValueButt = 594; +const int CSSValueMiter = 595; +const int CSSValueBevel = 596; +const int CSSValueBeforeEdge = 597; +const int CSSValueAfterEdge = 598; +const int CSSValueCentral = 599; +const int CSSValueTextBeforeEdge = 600; +const int CSSValueTextAfterEdge = 601; +const int CSSValueIdeographic = 602; +const int CSSValueAlphabetic = 603; +const int CSSValueHanging = 604; +const int CSSValueMathematical = 605; +const int CSSValueUseScript = 606; +const int CSSValueNoChange = 607; +const int CSSValueResetSize = 608; +const int CSSValueLrTb = 609; +const int CSSValueRlTb = 610; +const int CSSValueTbRl = 611; +const int CSSValueLr = 612; +const int CSSValueRl = 613; +const int CSSValueTb = 614; +const int numCSSValueKeywords = 615; const size_t maxCSSValueKeywordLength = 35; const char* getValueName(unsigned short id); diff --git a/src/3rdparty/webkit/WebCore/page/FocusController.cpp b/src/3rdparty/webkit/WebCore/page/FocusController.cpp index fdd117b..6c2a956 100644 --- a/src/3rdparty/webkit/WebCore/page/FocusController.cpp +++ b/src/3rdparty/webkit/WebCore/page/FocusController.cpp @@ -304,7 +304,7 @@ bool FocusController::advanceFocusDirectionally(FocusDirection direction, Keyboa frame = frame->tree()->top(); FocusCandidate focusCandidate; - findFocusableNodeInDirection(frame->document(), focusedNode, direction, event, focusCandidate); + findFocusableNodeInDirection(frame->document()->firstChild(), focusedNode, direction, event, focusCandidate); Node* node = focusCandidate.node; if (!node || !node->isElementNode()) { @@ -391,20 +391,23 @@ static void updateFocusCandidateIfCloser(Node* focusedNode, const FocusCandidate } } -void FocusController::findFocusableNodeInDirection(Document* document, Node* focusedNode, +void FocusController::findFocusableNodeInDirection(Node* outer, Node* focusedNode, FocusDirection direction, KeyboardEvent* event, FocusCandidate& closestFocusCandidate, const FocusCandidate& candidateParent) { - ASSERT(document); - ASSERT(candidateParent.isNull() || static_cast<HTMLFrameOwnerElement*>(candidateParent.node)); + ASSERT(outer); + ASSERT(candidateParent.isNull() + || candidateParent.node->hasTagName(frameTag) + || candidateParent.node->hasTagName(iframeTag)); // Walk all the child nodes and update closestFocusCandidate if we find a nearer node. - for (Node* candidate = document->firstChild(); candidate; candidate = candidate->traverseNextNode()) { + Node* candidate = outer; + while (candidate) { // Inner documents case. if (candidate->isFrameOwnerElement()) - deepFindFocusableNodeInDirection(focusedNode, candidate, direction, event, closestFocusCandidate); + deepFindFocusableNodeInDirection(candidate, focusedNode, direction, event, closestFocusCandidate); else if (candidate != focusedNode && candidate->isKeyboardFocusable(event)) { FocusCandidate currentFocusCandidate(candidate); @@ -412,8 +415,10 @@ void FocusController::findFocusableNodeInDirection(Document* document, Node* foc distanceDataForNode(direction, focusedNode, currentFocusCandidate); // Bail out if distance is maximum. - if (currentFocusCandidate.distance == maxDistance()) + if (currentFocusCandidate.distance == maxDistance()) { + candidate = candidate->traverseNextNode(outer->parent()); continue; + } // If candidateParent is not null, it means that we are in a recursive call // from deepFineFocusableNodeInDirection (i.e. processing an element in an iframe), @@ -425,33 +430,54 @@ void FocusController::findFocusableNodeInDirection(Document* document, Node* foc updateFocusCandidateIfCloser(focusedNode, currentFocusCandidate, closestFocusCandidate); } + + candidate = candidate->traverseNextNode(outer->parent()); } } -void FocusController::deepFindFocusableNodeInDirection(Node* focusedNode, Node* candidate, +void FocusController::deepFindFocusableNodeInDirection(Node* container, Node* focusedNode, FocusDirection direction, KeyboardEvent* event, FocusCandidate& closestFocusCandidate) { - HTMLFrameOwnerElement* owner = static_cast<HTMLFrameOwnerElement*>(candidate); - if (!owner->contentFrame()) + ASSERT(container->hasTagName(frameTag) || container->hasTagName(iframeTag)); + + // Track if focusedNode is a descendant of the current container node being processed. + bool descendantOfContainer = false; + Node* firstChild = 0; + + // Iframe or Frame. + if (container->hasTagName(frameTag) || container->hasTagName(iframeTag)) { + + HTMLFrameOwnerElement* owner = static_cast<HTMLFrameOwnerElement*>(container); + if (!owner->contentFrame()) + return; + + Document* innerDocument = owner->contentFrame()->document(); + if (!innerDocument) + return; + + descendantOfContainer = innerDocument == focusedNode->document(); + firstChild = innerDocument->firstChild(); + + } + + if (descendantOfContainer) { + findFocusableNodeInDirection(firstChild, focusedNode, direction, event, closestFocusCandidate); return; + } - Document* innerDocument = owner->contentFrame()->document(); - if (!innerDocument) + // Check if the current container element itself is a good candidate + // to move focus to. If it is, then we traverse its inner nodes. + FocusCandidate candidateParent = FocusCandidate(container); + distanceDataForNode(direction, focusedNode, candidateParent); + + // Bail out if distance is maximum. + if (candidateParent.distance == maxDistance()) return; - if (innerDocument == focusedNode->document()) - findFocusableNodeInDirection(innerDocument, focusedNode, direction, event, closestFocusCandidate); - else { - // Check if the current {i}frame element itself is a good candidate - // to move focus to. If it is, then we traverse its inner nodes. - FocusCandidate candidateParent = FocusCandidate(candidate); - distanceDataForNode(direction, focusedNode, candidateParent); - - // FIXME: Consider alignment? - if (candidateParent.distance < closestFocusCandidate.distance) - findFocusableNodeInDirection(innerDocument, focusedNode, direction, event, closestFocusCandidate, candidateParent); - } + // FIXME: Consider alignment? + if (candidateParent.distance < closestFocusCandidate.distance) + findFocusableNodeInDirection(firstChild, focusedNode, direction, event, closestFocusCandidate, candidateParent); } static bool relinquishesEditingFocus(Node *node) diff --git a/src/3rdparty/webkit/WebCore/page/FocusController.h b/src/3rdparty/webkit/WebCore/page/FocusController.h index dfa3780..4410833 100644 --- a/src/3rdparty/webkit/WebCore/page/FocusController.h +++ b/src/3rdparty/webkit/WebCore/page/FocusController.h @@ -63,9 +63,10 @@ private: bool advanceFocusDirectionally(FocusDirection, KeyboardEvent*); bool advanceFocusInDocumentOrder(FocusDirection, KeyboardEvent*, bool initialFocus); - void findFocusableNodeInDirection(Document*, Node*, FocusDirection, KeyboardEvent*, FocusCandidate& closestFocusCandidate, + void findFocusableNodeInDirection(Node* outter, Node*, FocusDirection, KeyboardEvent*, + FocusCandidate& closestFocusCandidate, const FocusCandidate& parentCandidate = FocusCandidate()); - void deepFindFocusableNodeInDirection(Node*, Node*, FocusDirection, KeyboardEvent*, FocusCandidate&); + void deepFindFocusableNodeInDirection(Node* container, Node* focused, FocusDirection, KeyboardEvent*, FocusCandidate&); Page* m_page; RefPtr<Frame> m_focusedFrame; diff --git a/src/3rdparty/webkit/WebCore/platform/FileSystem.h b/src/3rdparty/webkit/WebCore/platform/FileSystem.h index 856d5bb..c236831 100644 --- a/src/3rdparty/webkit/WebCore/platform/FileSystem.h +++ b/src/3rdparty/webkit/WebCore/platform/FileSystem.h @@ -69,9 +69,11 @@ typedef HMODULE PlatformModule; #elif PLATFORM(QT) #if defined(Q_WS_MAC) typedef CFBundleRef PlatformModule; -#else +#elif !defined(QT_NO_LIBRARY) typedef QLibrary* PlatformModule; -#endif // defined(Q_WS_MAC) +#else +typedef void* PlatformModule; +#endif #elif PLATFORM(GTK) typedef GModule* PlatformModule; #elif PLATFORM(CF) diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayer.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayer.cpp index 1fdc1e5..035d1c5 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayer.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/MediaPlayer.cpp @@ -50,7 +50,8 @@ #elif PLATFORM(GTK) #include "MediaPlayerPrivateGStreamer.h" #elif PLATFORM(QT) -#if QT_VERSION < 0x040700 +// QtMultimedia support is disabled currently. +#if 1 || (QT_VERSION < 0x040700) #include "MediaPlayerPrivatePhonon.h" #else #include "MediaPlayerPrivateQt.h" diff --git a/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp index 4237fca..403718f 100644 --- a/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp +++ b/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp @@ -41,8 +41,9 @@ // What type of connection should be used for the signals of the // QNetworkReply? This depends on if Qt has a bugfix for this or not. -// It is fixed in Qt 4.6.1. See https://bugs.webkit.org/show_bug.cgi?id=32113 -#if QT_VERSION > QT_VERSION_CHECK(4, 6, 0) +// It is fixed in Qt 4.6.3. See https://bugs.webkit.org/show_bug.cgi?id=32113 +// and https://bugs.webkit.org/show_bug.cgi?id=36755 +#if QT_VERSION > QT_VERSION_CHECK(4, 6, 2) #define SIGNAL_CONN Qt::DirectConnection #else #define SIGNAL_CONN Qt::QueuedConnection diff --git a/src/3rdparty/webkit/WebCore/platform/qt/FileSystemQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/FileSystemQt.cpp index 4093fad..f9ced98 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/FileSystemQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/FileSystemQt.cpp @@ -154,11 +154,12 @@ bool unloadModule(PlatformModule module) return ::FreeLibrary(module); #else +#ifndef QT_NO_LIBRARY if (module->unload()) { delete module; return true; } - +#endif return false; #endif } diff --git a/src/3rdparty/webkit/WebCore/platform/qt/RenderThemeQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/RenderThemeQt.cpp index 0163adc..577903b 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/RenderThemeQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/RenderThemeQt.cpp @@ -42,7 +42,7 @@ #include "HTMLInputElement.h" #include "HTMLMediaElement.h" #include "HTMLNames.h" -#ifdef Q_WS_MAEMO_5 +#if USE(QT_MOBILE_THEME) #include "Maemo5Webstyle.h" #endif #include "NotImplemented.h" @@ -153,7 +153,7 @@ RenderThemeQt::RenderThemeQt(Page* page) m_buttonFontPixelSize = fontInfo.pixelSize(); #endif -#ifdef Q_WS_MAEMO_5 +#if USE(QT_MOBILE_THEME) m_fallbackStyle = new Maemo5WebStyle; #else m_fallbackStyle = QStyleFactory::create(QLatin1String("windows")); @@ -166,7 +166,7 @@ RenderThemeQt::~RenderThemeQt() delete m_lineEdit; } -#ifdef Q_WS_MAEMO_5 +#if USE(QT_MOBILE_THEME) bool RenderThemeQt::isControlStyled(const RenderStyle* style, const BorderData& border, const FillLayer& fill, const Color& backgroundColor) const { switch (style->appearance()) { @@ -198,7 +198,7 @@ QStyle* RenderThemeQt::fallbackStyle() const QStyle* RenderThemeQt::qStyle() const { -#ifdef Q_WS_MAEMO_5 +#if USE(QT_MOBILE_THEME) return fallbackStyle(); #endif @@ -218,7 +218,7 @@ String RenderThemeQt::extraDefaultStyleSheet() #if ENABLE(NO_LISTBOX_RENDERING) result += String(themeQtNoListboxesUserAgentStyleSheet, sizeof(themeQtNoListboxesUserAgentStyleSheet)); #endif -#ifdef Q_WS_MAEMO_5 +#if USE(QT_MOBILE_THEME) result += String(themeQtMaemo5UserAgentStyleSheet, sizeof(themeQtMaemo5UserAgentStyleSheet)); #endif return result; @@ -648,7 +648,9 @@ bool RenderThemeQt::paintMenuList(RenderObject* o, const RenderObject::PaintInfo void RenderThemeQt::adjustMenuListButtonStyle(CSSStyleSelector*, RenderStyle* style, Element*) const { -#ifndef Q_WS_MAEMO_5 +#if USE(QT_MOBILE_THEME) + // Mobile theme uses border radius. +#else // WORKAROUND because html.css specifies -webkit-border-radius for <select> so we override it here // see also http://bugs.webkit.org/show_bug.cgi?id=18399 style->resetBorderRadius(); @@ -870,7 +872,7 @@ bool RenderThemeQt::supportsFocus(ControlPart appearance) const void RenderThemeQt::setPaletteFromPageClientIfExists(QPalette& palette) const { -#ifdef Q_WS_MAEMO_5 +#if USE(QT_MOBILE_THEME) static QPalette lightGrayPalette(Qt::lightGray); palette = lightGrayPalette; return; @@ -932,7 +934,7 @@ ControlPart RenderThemeQt::initializeCommonQStyleOptions(QStyleOption& option, R case SearchFieldCancelButtonPart: { if (isPressed(o)) option.state |= QStyle::State_Sunken; - else if (result == PushButtonPart) + else if (result == PushButtonPart || result == ButtonPart) option.state |= QStyle::State_Raised; break; } diff --git a/src/3rdparty/webkit/WebCore/platform/qt/RenderThemeQt.h b/src/3rdparty/webkit/WebCore/platform/qt/RenderThemeQt.h index b16918a..591dd27 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/RenderThemeQt.h +++ b/src/3rdparty/webkit/WebCore/platform/qt/RenderThemeQt.h @@ -75,7 +75,7 @@ public: virtual double caretBlinkInterval() const; -#ifdef Q_WS_MAEMO_5 +#if USE(QT_MOBILE_THEME) virtual bool isControlStyled(const RenderStyle*, const BorderData&, const FillLayer&, const Color& backgroundColor) const; virtual int popupInternalPaddingBottom(RenderStyle*) const; #endif diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp index 1efae16..0c13e43 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qgraphicswebview.cpp @@ -428,7 +428,9 @@ QRectF QGraphicsWebViewPrivate::graphicsItemVisibleRect() const return QRectF(); QList<QGraphicsView*> views = q->scene()->views(); if (views.size() > 1) { +#ifndef QT_NO_DEBUG_STREAM qDebug() << "QGraphicsWebView is in more than one graphics views, unable to compute the visible rect"; +#endif return QRectF(); } if (views.size() < 1) diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp index 2305c7f..ae7f6a8 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.cpp @@ -454,7 +454,6 @@ QWebSettings::QWebSettings() d->attributes.insert(QWebSettings::LocalContentCanAccessRemoteUrls, false); d->attributes.insert(QWebSettings::LocalContentCanAccessFileUrls, true); d->attributes.insert(QWebSettings::AcceleratedCompositingEnabled, true); - d->attributes.insert(QWebSettings::WebGLEnabled, false); d->attributes.insert(QWebSettings::TiledBackingStoreEnabled, false); d->attributes.insert(QWebSettings::FrameFlatteningEnabled, false); d->offlineStorageDefaultQuota = 5 * 1024 * 1024; @@ -1053,8 +1052,9 @@ void QWebSettings::enablePersistentStorage(const QString& path) QString storagePath; if (path.isEmpty()) { +#ifndef QT_NO_DESKTOPSERVICES storagePath = QDesktopServices::storageLocation(QDesktopServices::DataLocation); - +#endif if (storagePath.isEmpty()) storagePath = WebCore::pathByAppendingComponent(QDir::homePath(), QCoreApplication::applicationName()); } else diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h index caba0d5..d2e536e 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebsettings.h @@ -70,7 +70,6 @@ public: DnsPrefetchEnabled, XSSAuditorEnabled, AcceleratedCompositingEnabled, - WebGLEnabled, SpatialNavigationEnabled, LocalContentCanAccessFileUrls, TiledBackingStoreEnabled, diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog index 6e450c2..555b14d 100644 --- a/src/3rdparty/webkit/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog @@ -1,3 +1,46 @@ +2010-04-09 Tasuku Suzuki <tasuku.suzuki@nokia.com> + + Reviewed by Simon Hausmann. + + [Qt]Fix compile error with QT_NO_IM + https://bugs.webkit.org/show_bug.cgi?id=36533 + + * WebCoreSupport/QtFallbackWebPopup.cpp: + (WebCore::QtFallbackWebPopupCombo::hidePopup): + +2010-04-02 Tasuku Suzuki <tasuku.suzuki@nokia.com> + + Reviewed by Eric Seidel. + + [Qt]Fix compile error with QT_NO_SETTINGS + https://bugs.webkit.org/show_bug.cgi?id=36533 + + If QT_NO_SETTINGS is defined, QSettings is not available. + + * WebCoreSupport/InspectorClientQt.cpp: + (WebCore::InspectorClientQt::populateSetting): + (WebCore::InspectorClientQt::storeSetting): + +2010-03-25 Tasuku Suzuki <tasuku.suzuki@nokia.com> + + Reviewed by Eric Seidel. + + [Qt]Fix compile error with QT_NO_DESKTOPSERVICES + https://bugs.webkit.org/show_bug.cgi?id=36533 + + * Api/qwebsettings.cpp: + (QWebSettings::enablePersistentStorage): + +2010-03-25 Tasuku Suzuki <tasuku.suzuki@nokia.com> + + Reviewed by Eric Seidel. + + [Qt]Fix compile error with QT_NO_DEBUG_STREAM + https://bugs.webkit.org/show_bug.cgi?id=36533 + + * Api/qgraphicswebview.cpp: + (QGraphicsWebViewPrivate::graphicsItemVisibleRect): + 2010-04-29 Janne Koskinen <janne.p.koskinen@digia.com> Reviewed by Simon Hausmann. diff --git a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp index c0c78ba..7fabbda 100644 --- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp +++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/InspectorClientQt.cpp @@ -110,6 +110,11 @@ void InspectorClientQt::hideHighlight() void InspectorClientQt::populateSetting(const String& key, String* setting) { +#ifdef QT_NO_SETTINGS + Q_UNUSED(key) + Q_UNUSED(setting) + qWarning("QWebInspector: QSettings is not supported by Qt."); +#else QSettings qsettings; if (qsettings.status() == QSettings::AccessError) { // QCoreApplication::setOrganizationName and QCoreApplication::setApplicationName haven't been called @@ -123,10 +128,16 @@ void InspectorClientQt::populateSetting(const String& key, String* setting) QVariant storedValue = qsettings.value(settingKey); storedValue.convert(QVariant::nameToType(storedValueType.toAscii().data())); *setting = variantToSetting(storedValue); +#endif // QT_NO_SETTINGS } void InspectorClientQt::storeSetting(const String& key, const String& setting) { +#ifdef QT_NO_SETTINGS + Q_UNUSED(key) + Q_UNUSED(setting) + qWarning("QWebInspector: QSettings is not supported by Qt."); +#else QSettings qsettings; if (qsettings.status() == QSettings::AccessError) { qWarning("QWebInspector: QSettings couldn't persist configuration setting [%s].", @@ -138,6 +149,7 @@ void InspectorClientQt::storeSetting(const String& key, const String& setting) QString settingKey(settingStoragePrefix + QString(key)); qsettings.setValue(settingKey, valueToStore); qsettings.setValue(settingKey + settingStorageTypeSuffix, QVariant::typeToName(valueToStore.type())); +#endif // QT_NO_SETTINGS } static String variantToSetting(const QVariant& qvariant) diff --git a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp index 65a28fe..7514077 100644 --- a/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp +++ b/src/3rdparty/webkit/WebKit/qt/WebCoreSupport/QtFallbackWebPopup.cpp @@ -55,6 +55,7 @@ void QtFallbackWebPopupCombo::showPopup() void QtFallbackWebPopupCombo::hidePopup() { +#ifndef QT_NO_IM QWidget* activeFocus = QApplication::focusWidget(); if (activeFocus && activeFocus == QComboBox::view() && activeFocus->testAttribute(Qt::WA_InputMethodEnabled)) { @@ -64,6 +65,7 @@ void QtFallbackWebPopupCombo::hidePopup() qic->setFocusWidget(0); } } +#endif // QT_NO_IM QComboBox::hidePopup(); diff --git a/src/declarative/graphicsitems/qdeclarativemousearea.cpp b/src/declarative/graphicsitems/qdeclarativemousearea.cpp index c5a995e..1947c00 100644 --- a/src/declarative/graphicsitems/qdeclarativemousearea.cpp +++ b/src/declarative/graphicsitems/qdeclarativemousearea.cpp @@ -197,8 +197,8 @@ QDeclarativeMouseAreaPrivate::~QDeclarativeMouseAreaPrivate() This handler is called when the mouse enters the mouse area. By default the onEntered handler is only called while a button is - pressed. Setting hoverEnabled to true enables handling of - onExited when no mouse button is pressed. + pressed. Setting hoverEnabled to true enables handling of + onEntered when no mouse button is pressed. \sa hoverEnabled */ @@ -209,7 +209,7 @@ QDeclarativeMouseAreaPrivate::~QDeclarativeMouseAreaPrivate() This handler is called when the mouse exists the mouse area. By default the onExited handler is only called while a button is - pressed. Setting hoverEnabled to true enables handling of + pressed. Setting hoverEnabled to true enables handling of onExited when no mouse button is pressed. \sa hoverEnabled @@ -288,6 +288,17 @@ QDeclarativeMouseAreaPrivate::~QDeclarativeMouseAreaPrivate() */ /*! + \qmlsignal MouseArea::onCanceled() + + This handler is called when the mouse events are canceled, either because the event was not accepted or + another element stole the mouse event handling. This signal is for advanced users, it's useful in case there + is more than one mouse areas handling input, or when there is a mouse area inside a flickable. In the latter + case, if you do some logic on pressed and then start dragging, the flickable will steal the mouse handling + from the mouse area. In these cases, to reset the logic when there is no mouse handling anymore, you should + use onCanceled, in addition to onReleased. +*/ + +/*! \internal \class QDeclarativeMouseArea \brief The QDeclarativeMouseArea class provides a simple mouse handling abstraction for use within Qml. @@ -562,10 +573,12 @@ bool QDeclarativeMouseArea::sceneEvent(QEvent *event) // state d->pressed = false; setKeepMouseGrab(false); - QDeclarativeMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, false, false); - emit released(&me); + emit canceled(); emit pressedChanged(); - setHovered(false); + if (d->hovered) { + d->hovered = false; + emit hoveredChanged(); + } } } return rv; diff --git a/src/declarative/graphicsitems/qdeclarativemousearea_p.h b/src/declarative/graphicsitems/qdeclarativemousearea_p.h index e3f523b..df77ac6 100644 --- a/src/declarative/graphicsitems/qdeclarativemousearea_p.h +++ b/src/declarative/graphicsitems/qdeclarativemousearea_p.h @@ -163,6 +163,7 @@ Q_SIGNALS: void doubleClicked(QDeclarativeMouseEvent *mouse); void entered(); void exited(); + void canceled(); protected: void setHovered(bool); diff --git a/src/declarative/graphicsitems/qdeclarativetextinput.cpp b/src/declarative/graphicsitems/qdeclarativetextinput.cpp index 9ae4e1a..604f508 100644 --- a/src/declarative/graphicsitems/qdeclarativetextinput.cpp +++ b/src/declarative/graphicsitems/qdeclarativetextinput.cpp @@ -62,6 +62,9 @@ QT_BEGIN_NAMESPACE Input constraints include setting a QValidator, an input mask, or a maximum input length. + + On Mac OS X, the Up/Down key bindings for Home/End are explicitly disabled. + If you want such bindings (on any platform), you will need to construct them in QML. */ QDeclarativeTextInput::QDeclarativeTextInput(QDeclarativeItem* parent) : QDeclarativePaintedItem(*(new QDeclarativeTextInputPrivate), parent) @@ -860,10 +863,12 @@ void QDeclarativeTextInputPrivate::focusChanged(bool hasFocus) void QDeclarativeTextInput::keyPressEvent(QKeyEvent* ev) { Q_D(QDeclarativeTextInput); - if(((d->control->cursor() == 0 && ev->key() == Qt::Key_Left) + if (((ev->key() == Qt::Key_Up || ev->key() == Qt::Key_Down) && ev->modifiers() == Qt::NoModifier) // Don't allow MacOSX up/down support, and we don't allow a completer. + || (((d->control->cursor() == 0 && ev->key() == Qt::Key_Left) || (d->control->cursor() == d->control->text().length() && ev->key() == Qt::Key_Right)) - && (d->lastSelectionStart == d->lastSelectionEnd)){ + && (d->lastSelectionStart == d->lastSelectionEnd))) + { //ignore when moving off the end //unless there is a selection, because then moving will do something (deselect) ev->ignore(); diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp index fb799dc..afdaee8 100644 --- a/src/declarative/qml/qdeclarativecomponent.cpp +++ b/src/declarative/qml/qdeclarativecomponent.cpp @@ -59,6 +59,7 @@ #include <QFileInfo> #include <QtCore/qdebug.h> #include <QApplication> +#include <QGraphicsObject> QT_BEGIN_NAMESPACE @@ -557,8 +558,11 @@ QDeclarativeComponent::QDeclarativeComponent(QDeclarativeComponentPrivate &dd, Q /*! \internal A version of create which returns a scriptObject, for use in script + + Sets graphics object parent because forgetting to do this is a frequent + and serious problem. */ -QScriptValue QDeclarativeComponent::createObject() +QScriptValue QDeclarativeComponent::createObject(QObject* parent) { Q_D(QDeclarativeComponent); QDeclarativeContext* ctxt = creationContext(); @@ -567,6 +571,20 @@ QScriptValue QDeclarativeComponent::createObject() QObject* ret = create(ctxt); if (!ret) return QScriptValue(QScriptValue::NullValue); + + QGraphicsObject* gobj = qobject_cast<QGraphicsObject*>(ret); + bool needParent = (gobj != 0); + if(parent){ + ret->setParent(parent); + QGraphicsObject* gparent = qobject_cast<QGraphicsObject*>(parent); + if(gparent){ + gobj->setParentItem(gparent); + needParent = false; + } + } + if(needParent) + qWarning("QDeclarativeComponent: Created graphical object was not placed in the graphics scene."); + QDeclarativeEnginePrivate *priv = QDeclarativeEnginePrivate::get(d->engine); QDeclarativeData::get(ret, true)->setImplicitDestructible(); return priv->objectClass->newQObject(ret, QMetaType::QObjectStar); diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h index b078174..688e233 100644 --- a/src/declarative/qml/qdeclarativecomponent.h +++ b/src/declarative/qml/qdeclarativecomponent.h @@ -109,7 +109,7 @@ Q_SIGNALS: protected: QDeclarativeComponent(QDeclarativeComponentPrivate &dd, QObject* parent); - Q_INVOKABLE QScriptValue createObject(); + Q_INVOKABLE QScriptValue createObject(QObject* parent); private: QDeclarativeComponent(QDeclarativeEngine *, QDeclarativeCompiledData *, int, int, QObject *parent); diff --git a/src/declarative/util/qdeclarativelistmodel.cpp b/src/declarative/util/qdeclarativelistmodel.cpp index 3810256..0985a6b 100644 --- a/src/declarative/util/qdeclarativelistmodel.cpp +++ b/src/declarative/util/qdeclarativelistmodel.cpp @@ -591,7 +591,7 @@ void QDeclarativeListModel::set(int index, const QScriptValue& valuemap) Changes the \a property of the item at \a index in the list model to \a value. \code - fruitModel.set(3, "cost", 5.95) + fruitModel.setProperty(3, "cost", 5.95) \endcode The \a index must be an element in the list. diff --git a/src/declarative/util/qdeclarativepropertychanges.cpp b/src/declarative/util/qdeclarativepropertychanges.cpp index c7e3bc5..6e88259 100644 --- a/src/declarative/util/qdeclarativepropertychanges.cpp +++ b/src/declarative/util/qdeclarativepropertychanges.cpp @@ -163,11 +163,13 @@ public: virtual void execute(Reason) { ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, expression); + Q_ASSERT(expression != ownedExpression); } virtual bool isReversable() { return true; } virtual void reverse(Reason) { ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, reverseExpression); + Q_ASSERT(reverseExpression != ownedExpression); } virtual void saveOriginals() { @@ -177,6 +179,7 @@ public: virtual void rewind() { ownedExpression = QDeclarativePropertyPrivate::setSignalExpression(property, rewindExpression); + Q_ASSERT(rewindExpression != ownedExpression); } virtual void saveCurrentValues() { rewindExpression = QDeclarativePropertyPrivate::signalExpression(property); diff --git a/src/declarative/util/qdeclarativeview.cpp b/src/declarative/util/qdeclarativeview.cpp index 62d913c..833e284 100644 --- a/src/declarative/util/qdeclarativeview.cpp +++ b/src/declarative/util/qdeclarativeview.cpp @@ -484,10 +484,7 @@ QSize QDeclarativeViewPrivate::rootObjectSize() QSize rootObjectSize(0,0); int widthCandidate = -1; int heightCandidate = -1; - if (declarativeItemRoot) { - widthCandidate = declarativeItemRoot->width(); - heightCandidate = declarativeItemRoot->height(); - } else if (root) { + if (root) { QSizeF size = root->boundingRect().size(); widthCandidate = size.width(); heightCandidate = size.height(); @@ -614,16 +611,15 @@ bool QDeclarativeView::eventFilter(QObject *watched, QEvent *e) /*! \internal - Preferred size follows the root object in - resize mode SizeViewToRootObject and - the view in resize mode SizeRootObjectToView. + Preferred size follows the root object geometry. */ QSize QDeclarativeView::sizeHint() const { - if (d->resizeMode == SizeRootObjectToView) { + QSize rootObjectSize = d->rootObjectSize(); + if (rootObjectSize.isEmpty()) { return size(); - } else { // d->resizeMode == SizeViewToRootObject - return d->rootObjectSize(); + } else { + return rootObjectSize; } } diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index ba674dd..b2bdc5c 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -1090,6 +1090,10 @@ void QGraphicsItemPrivate::setParentItemHelper(QGraphicsItem *newParent, const Q if (newParent == parent) return; + if (isWidget) + static_cast<QGraphicsWidgetPrivate *>(this)->fixFocusChainBeforeReparenting((newParent && + newParent->isWidget()) ? static_cast<QGraphicsWidget *>(newParent) : 0, + scene); if (scene) { // Deliver the change to the index if (scene->d_func()->indexMethod != QGraphicsScene::NoIndex) @@ -1796,9 +1800,6 @@ static void _q_qgraphicsItemSetFlag(QGraphicsItem *item, QGraphicsItem::Graphics */ void QGraphicsItem::setFlags(GraphicsItemFlags flags) { - if (isWindow()) - flags |= ItemIsPanel; - // Notify change and check for adjustment. if (quint32(d_ptr->flags) == quint32(flags)) return; diff --git a/src/gui/graphicsview/qgraphicswidget.cpp b/src/gui/graphicsview/qgraphicswidget.cpp index b264447..478c0c3 100644 --- a/src/gui/graphicsview/qgraphicswidget.cpp +++ b/src/gui/graphicsview/qgraphicswidget.cpp @@ -1105,9 +1105,6 @@ QVariant QGraphicsWidget::itemChange(GraphicsItemChange change, const QVariant & } break; case ItemParentChange: { - QGraphicsItem *parent = qVariantValue<QGraphicsItem *>(value); - d->fixFocusChainBeforeReparenting((parent && parent->isWidget()) ? static_cast<QGraphicsWidget *>(parent) : 0, scene()); - // Deliver ParentAboutToChange. QEvent event(QEvent::ParentAboutToChange); QApplication::sendEvent(this, &event); diff --git a/src/gui/graphicsview/qgraphicswidget_p.cpp b/src/gui/graphicsview/qgraphicswidget_p.cpp index 6e397b6..50b315a 100644 --- a/src/gui/graphicsview/qgraphicswidget_p.cpp +++ b/src/gui/graphicsview/qgraphicswidget_p.cpp @@ -71,14 +71,17 @@ void QGraphicsWidgetPrivate::init(QGraphicsItem *parentItem, Qt::WindowFlags wFl adjustWindowFlags(&wFlags); windowFlags = wFlags; - q->setParentItem(parentItem); + if (parentItem) + setParentItemHelper(parentItem, 0, 0); + q->setSizePolicy(QSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred, QSizePolicy::DefaultType)); q->setGraphicsItem(q); resolveLayoutDirection(); q->unsetWindowFrameMargins(); - q->setFlag(QGraphicsItem::ItemUsesExtendedStyleOption); - q->setFlag(QGraphicsItem::ItemSendsGeometryChanges); + flags |= QGraphicsItem::ItemUsesExtendedStyleOption | QGraphicsItem::ItemSendsGeometryChanges; + if (windowFlags & Qt::Window) + flags |= QGraphicsItem::ItemIsPanel; } qreal QGraphicsWidgetPrivate::titleBarHeight(const QStyleOptionTitleBar &options) const diff --git a/src/gui/painting/qdatabuffer_p.h b/src/gui/painting/qdatabuffer_p.h index bc5f1ef..8f8544f 100644 --- a/src/gui/painting/qdatabuffer_p.h +++ b/src/gui/painting/qdatabuffer_p.h @@ -60,16 +60,20 @@ QT_BEGIN_NAMESPACE template <typename Type> class QDataBuffer { public: - QDataBuffer(int res = 64) + QDataBuffer(int res) { capacity = res; - buffer = (Type*) qMalloc(capacity * sizeof(Type)); + if (res) + buffer = (Type*) qMalloc(capacity * sizeof(Type)); + else + buffer = 0; siz = 0; } ~QDataBuffer() { - qFree(buffer); + if (buffer) + qFree(buffer); } inline void reset() { siz = 0; } @@ -104,6 +108,8 @@ public: inline void reserve(int size) { if (size > capacity) { + if (capacity == 0) + capacity = 1; while (capacity < size) capacity *= 2; buffer = (Type*) qRealloc(buffer, capacity * sizeof(Type)); @@ -112,7 +118,12 @@ public: inline void shrink(int size) { capacity = size; - buffer = (Type*) qRealloc(buffer, capacity * sizeof(Type)); + if (size) + buffer = (Type*) qRealloc(buffer, capacity * sizeof(Type)); + else { + qFree(buffer); + buffer = 0; + } } inline void swap(QDataBuffer<Type> &other) { diff --git a/src/gui/painting/qoutlinemapper.cpp b/src/gui/painting/qoutlinemapper.cpp index ad0c2eb..1b01960 100644 --- a/src/gui/painting/qoutlinemapper.cpp +++ b/src/gui/painting/qoutlinemapper.cpp @@ -154,7 +154,8 @@ QT_FT_Outline *QOutlineMapper::convertPath(const QVectorPath &path) // ### We can kill this copying and just use the buffer straight... m_elements.resize(count); - memcpy(m_elements.data(), path.points(), count* sizeof(QPointF)); + if (count) + memcpy(m_elements.data(), path.points(), count* sizeof(QPointF)); m_element_types.resize(0); } diff --git a/src/gui/painting/qoutlinemapper_p.h b/src/gui/painting/qoutlinemapper_p.h index d0ce1a9..39b7593 100644 --- a/src/gui/painting/qoutlinemapper_p.h +++ b/src/gui/painting/qoutlinemapper_p.h @@ -87,8 +87,15 @@ const int QT_RASTER_COORD_LIMIT = 32767; class QOutlineMapper { public: - QOutlineMapper() - : m_round_coords(false) + QOutlineMapper() : + m_element_types(0), + m_elements(0), + m_elements_dev(0), + m_points(0), + m_tags(0), + m_contours(0), + m_polygon_dev(0), + m_round_coords(false) { } diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 9148ac2..6f395f6 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -251,6 +251,11 @@ static void qt_debug_path(const QPainterPath &path) } #endif +QRasterPaintEnginePrivate::QRasterPaintEnginePrivate() : + QPaintEngineExPrivate(), + cachedLines(0) +{ +} /*! @@ -336,17 +341,6 @@ void QRasterPaintEngine::init() d->hdc = 0; #endif - d->rasterPoolSize = 8192; - d->rasterPoolBase = -#if defined(Q_WS_WIN64) - // We make use of setjmp and longjmp in qgrayraster.c which requires - // 16-byte alignment, hence we hardcode this requirement here.. - (unsigned char *) _aligned_malloc(d->rasterPoolSize, sizeof(void*) * 2); -#else - (unsigned char *) malloc(d->rasterPoolSize); -#endif - Q_CHECK_PTR(d->rasterPoolBase); - // The antialiasing raster. d->grayRaster.reset(new QT_FT_Raster); Q_CHECK_PTR(d->grayRaster.data()); @@ -354,8 +348,6 @@ void QRasterPaintEngine::init() QT_THROW(std::bad_alloc()); // an error creating the raster is caused by a bad malloc - qt_ft_grays_raster.raster_reset(*d->grayRaster.data(), d->rasterPoolBase, d->rasterPoolSize); - d->rasterizer.reset(new QRasterizer); d->rasterBuffer.reset(new QRasterBuffer()); d->outlineMapper.reset(new QOutlineMapper); @@ -437,12 +429,6 @@ QRasterPaintEngine::~QRasterPaintEngine() { Q_D(QRasterPaintEngine); -#if defined(Q_WS_WIN64) - _aligned_free(d->rasterPoolBase); -#else - free(d->rasterPoolBase); -#endif - qt_ft_grays_raster.raster_done(*d->grayRaster.data()); } @@ -4090,6 +4076,22 @@ void QRasterPaintEnginePrivate::rasterize(QT_FT_Outline *outline, return; } + const int rasterPoolInitialSize = 8192; + int rasterPoolSize = rasterPoolInitialSize; + unsigned char *rasterPoolBase; +#if defined(Q_WS_WIN64) + rasterPoolBase = + // We make use of setjmp and longjmp in qgrayraster.c which requires + // 16-byte alignment, hence we hardcode this requirement here.. + (unsigned char *) _aligned_malloc(rasterPoolSize, sizeof(void*) * 2); +#else + unsigned char rasterPoolOnStack[rasterPoolInitialSize]; + rasterPoolBase = rasterPoolOnStack; +#endif + Q_CHECK_PTR(rasterPoolBase); + + qt_ft_grays_raster.raster_reset(*grayRaster.data(), rasterPoolBase, rasterPoolSize); + void *data = userData; QT_FT_BBox clip_box = { deviceRect.x(), @@ -4122,13 +4124,14 @@ void QRasterPaintEnginePrivate::rasterize(QT_FT_Outline *outline, int new_size = rasterPoolSize * 2; if (new_size > 1024 * 1024) { qWarning("QPainter: Rasterization of primitive failed"); - return; + break; } #if defined(Q_WS_WIN64) _aligned_free(rasterPoolBase); #else - free(rasterPoolBase); + if (rasterPoolBase != rasterPoolOnStack) // initially on the stack + free(rasterPoolBase); #endif rasterPoolSize = new_size; @@ -4149,6 +4152,13 @@ void QRasterPaintEnginePrivate::rasterize(QT_FT_Outline *outline, done = true; } } + +#if defined(Q_WS_WIN64) + _aligned_free(rasterPoolBase); +#else + if (rasterPoolBase != rasterPoolOnStack) // initially on the stack + free(rasterPoolBase); +#endif } void QRasterPaintEnginePrivate::recalculateFastImages() diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h index 55eb82e..1016f8d 100644 --- a/src/gui/painting/qpaintengine_raster_p.h +++ b/src/gui/painting/qpaintengine_raster_p.h @@ -300,6 +300,7 @@ QRasterPaintEnginePrivate : public QPaintEngineExPrivate { Q_DECLARE_PUBLIC(QRasterPaintEngine) public: + QRasterPaintEnginePrivate(); void rasterizeLine_dashed(QLineF line, qreal width, int *dashIndex, qreal *dashOffset, bool *inDash); @@ -354,8 +355,6 @@ public: QScopedPointer<QDashStroker> dashStroker; QScopedPointer<QT_FT_Raster> grayRaster; - unsigned long rasterPoolSize; - unsigned char *rasterPoolBase; QDataBuffer<QLineF> cachedLines; QSpanData image_filler; diff --git a/src/gui/painting/qpaintengineex.cpp b/src/gui/painting/qpaintengineex.cpp index a78cafb..fda937e 100644 --- a/src/gui/painting/qpaintengineex.cpp +++ b/src/gui/painting/qpaintengineex.cpp @@ -149,6 +149,7 @@ QDebug Q_GUI_EXPORT &operator<<(QDebug &s, const QVectorPath &path) struct StrokeHandler { + StrokeHandler(int reserve) : pts(reserve), types(reserve) {} QDataBuffer<qreal> pts; QDataBuffer<QPainterPath::ElementType> types; }; @@ -394,7 +395,7 @@ void QPaintEngineEx::stroke(const QVectorPath &path, const QPen &pen) return; if (!d->strokeHandler) { - d->strokeHandler = new StrokeHandler; + d->strokeHandler = new StrokeHandler(path.elementCount()+4); d->stroker.setMoveToHook(qpaintengineex_moveTo); d->stroker.setLineToHook(qpaintengineex_lineTo); d->stroker.setCubicToHook(qpaintengineex_cubicTo); diff --git a/src/gui/painting/qpathclipper.cpp b/src/gui/painting/qpathclipper.cpp index c910024..78553c9 100644 --- a/src/gui/painting/qpathclipper.cpp +++ b/src/gui/painting/qpathclipper.cpp @@ -278,7 +278,8 @@ private: }; SegmentTree::SegmentTree(QPathSegments &segments) - : m_segments(segments) + : m_segments(segments), + m_intersections(0) { m_bounds.x1 = qt_inf(); m_bounds.y1 = qt_inf(); @@ -806,7 +807,7 @@ void QWingedEdge::intersectAndAdd() for (int i = 0; i < m_segments.points(); ++i) addVertex(m_segments.pointAt(i)); - QDataBuffer<QPathSegments::Intersection> intersections; + QDataBuffer<QPathSegments::Intersection> intersections(m_segments.segments()); for (int i = 0; i < m_segments.segments(); ++i) { intersections.reset(); @@ -857,11 +858,17 @@ void QWingedEdge::intersectAndAdd() } } -QWingedEdge::QWingedEdge() +QWingedEdge::QWingedEdge() : + m_edges(0), + m_vertices(0), + m_segments(0) { } -QWingedEdge::QWingedEdge(const QPainterPath &subject, const QPainterPath &clip) +QWingedEdge::QWingedEdge(const QPainterPath &subject, const QPainterPath &clip) : + m_edges(subject.length()), + m_vertices(subject.length()), + m_segments(subject.length()) { m_segments.setPath(subject); m_segments.addPath(clip); @@ -1414,9 +1421,9 @@ bool QPathClipper::intersect() else if (clipIsRect) return subjectPath.intersects(r2); - QPathSegments a; + QPathSegments a(subjectPath.length()); a.setPath(subjectPath); - QPathSegments b; + QPathSegments b(clipPath.length()); b.setPath(clipPath); QIntersectionFinder finder; @@ -1459,9 +1466,9 @@ bool QPathClipper::contains() if (clipIsRect) return subjectPath.contains(r2); - QPathSegments a; + QPathSegments a(subjectPath.length()); a.setPath(subjectPath); - QPathSegments b; + QPathSegments b(clipPath.length()); b.setPath(clipPath); QIntersectionFinder finder; diff --git a/src/gui/painting/qpathclipper_p.h b/src/gui/painting/qpathclipper_p.h index 7962400..fab618d 100644 --- a/src/gui/painting/qpathclipper_p.h +++ b/src/gui/painting/qpathclipper_p.h @@ -199,7 +199,7 @@ public: }; - QPathSegments(); + QPathSegments(int reserve); void setPath(const QPainterPath &path); void addPath(const QPainterPath &path); @@ -345,7 +345,10 @@ inline QPathVertex::operator QPointF() const return QPointF(x, y); } -inline QPathSegments::QPathSegments() +inline QPathSegments::QPathSegments(int reserve) : + m_points(reserve), + m_segments(reserve), + m_intersections(reserve) { } diff --git a/src/gui/painting/qpolygonclipper_p.h b/src/gui/painting/qpolygonclipper_p.h index 1b4cbb3..cdaac1c 100644 --- a/src/gui/painting/qpolygonclipper_p.h +++ b/src/gui/painting/qpolygonclipper_p.h @@ -62,7 +62,8 @@ QT_BEGIN_NAMESPACE template <typename InType, typename OutType, typename CastType> class QPolygonClipper { public: - QPolygonClipper() + QPolygonClipper() : + buffer1(0), buffer2(0) { x1 = y1 = x2 = y2 = 0; } diff --git a/src/gui/painting/qrasterizer.cpp b/src/gui/painting/qrasterizer.cpp index 51d01c9..f8f8afb 100644 --- a/src/gui/painting/qrasterizer.cpp +++ b/src/gui/painting/qrasterizer.cpp @@ -198,9 +198,11 @@ public: }; QScanConverter::QScanConverter() - : m_alloc(0) + : m_lines(0) + , m_alloc(0) , m_size(0) , m_intersections(0) + , m_active(0) { } @@ -310,6 +312,10 @@ struct QBoolToType template <typename T> void qScanConvert(QScanConverter &d, T allVertical) { + if (!d.m_lines.size()) { + d.m_active.reset(); + return; + } qSort(d.m_lines.data(), d.m_lines.data() + d.m_lines.size(), QT_PREPEND_NAMESPACE(topOrder)); int line = 0; for (int y = d.m_lines.first().top; y <= d.m_bottom; ++y) { diff --git a/src/gui/painting/qstroker.cpp b/src/gui/painting/qstroker.cpp index e43544c..9b8e099 100644 --- a/src/gui/painting/qstroker.cpp +++ b/src/gui/painting/qstroker.cpp @@ -187,7 +187,7 @@ static inline qreal adapted_angle_on_x(const QLineF &line) } QStrokerOps::QStrokerOps() - : m_customData(0), m_moveTo(0), m_lineTo(0), m_cubicTo(0) + : m_elements(0), m_customData(0), m_moveTo(0), m_lineTo(0), m_cubicTo(0) { } diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 90b8be3..20297ae 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -1546,18 +1546,35 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option, QS60StylePrivate::pixelMetric(PM_DefaultFrameWidth); const int tabOverlap = QS60StylePrivate::pixelMetric(PM_TabBarTabOverlap) - borderThickness; - - if (skinElement==QS60StylePrivate::SE_TabBarTabEastInactive|| - skinElement==QS60StylePrivate::SE_TabBarTabEastActive|| - skinElement==QS60StylePrivate::SE_TabBarTabWestInactive|| - skinElement==QS60StylePrivate::SE_TabBarTabWestActive){ - optionTabAdj.rect.adjust(0, 0, 0, tabOverlap); - } else { - if (directionMirrored) - optionTabAdj.rect.adjust(-tabOverlap, 0, 0, 0); + const bool usesScrollButtons = + (widget) ? (qobject_cast<const QTabBar*>(widget))->usesScrollButtons() : false; + const int roomForScrollButton = + usesScrollButtons ? QS60StylePrivate::pixelMetric(PM_TabBarScrollButtonWidth) : 0; + + // adjust for overlapping tabs and scrollbuttons, if necessary + if (skinElement == QS60StylePrivate::SE_TabBarTabEastInactive || + skinElement == QS60StylePrivate::SE_TabBarTabEastActive || + skinElement == QS60StylePrivate::SE_TabBarTabWestInactive || + skinElement == QS60StylePrivate::SE_TabBarTabWestActive){ + if (optionTabAdj.position == QStyleOptionTabV3::Beginning) + optionTabAdj.rect.adjust(0, roomForScrollButton, 0, tabOverlap); + else if (optionTabAdj.position == QStyleOptionTabV3::End) + optionTabAdj.rect.adjust(0, 0, 0, tabOverlap); else - optionTabAdj.rect.adjust(0, 0, tabOverlap, 0); + optionTabAdj.rect.adjust(0, 0, 0, tabOverlap); + } else { + if (directionMirrored) { + if (optionTabAdj.position == QStyleOptionTabV3::Beginning) + optionTabAdj.rect.adjust(-tabOverlap, 0, -roomForScrollButton, 0); + else + optionTabAdj.rect.adjust(-tabOverlap, 0, 0, 0); + } else { + if (optionTabAdj.position == QStyleOptionTabV3::Beginning) + optionTabAdj.rect.adjust(roomForScrollButton, 0, tabOverlap, 0); + else + optionTabAdj.rect.adjust(0, 0, tabOverlap, 0); } + } } QS60StylePrivate::drawSkinElement(skinElement, painter, optionTabAdj.rect, flags); } @@ -1570,7 +1587,10 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option, const int borderThickness = QS60StylePrivate::pixelMetric(PM_DefaultFrameWidth); const int tabOverlap = QS60StylePrivate::pixelMetric(PM_TabBarTabOverlap) - borderThickness; - const QRect windowRect = painter->window(); + const bool usesScrollButtons = + (widget) ? (qobject_cast<const QTabBar*>(widget))->usesScrollButtons() : false; + const int roomForScrollButton = + usesScrollButtons ? QS60StylePrivate::pixelMetric(PM_TabBarScrollButtonWidth) : 0; switch (tab->shape) { case QTabBar::TriangularWest: @@ -1605,6 +1625,17 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option, || optionTab.shape == QTabBar::TriangularEast || optionTab.shape == QTabBar::TriangularWest; + //make room for scrollbuttons + if (!verticalTabs) { + if ((tab->position == QStyleOptionTabV3::Beginning && !directionMirrored)) + tr.adjust(roomForScrollButton, 0, 0, 0); + else if ((tab->position == QStyleOptionTabV3::Beginning && directionMirrored)) + tr.adjust(0, 0, -roomForScrollButton, 0); + } else { + if (tab->position == QStyleOptionTabV3::Beginning) + tr.adjust(0, roomForScrollButton, 0, 0); + } + if (verticalTabs) { painter->save(); int newX, newY, newRotation; @@ -1636,9 +1667,10 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option, alignment |= Qt::TextHideMnemonic; if (!optionTab.icon.isNull()) { QSize iconSize = optionTab.iconSize; - int iconExtent = pixelMetric(PM_TabBarIconSize); - if (iconSize.height() > iconExtent || iconSize.width() > iconExtent) + if (!iconSize.isValid()) { + const int iconExtent = pixelMetric(PM_TabBarIconSize); iconSize = QSize(iconExtent, iconExtent); + } QPixmap tabIcon = optionTab.icon.pixmap(iconSize, (optionTab.state & State_Enabled) ? QIcon::Normal : QIcon::Disabled); if (tab->text.isEmpty()) @@ -2490,6 +2522,19 @@ QSize QS60Style::sizeFromContents(ContentsType ct, const QStyleOption *opt, sz = QCommonStyle::sizeFromContents(ct, opt, csz, widget); if (naviPaneSize.height() > sz.height()) sz.setHeight(naviPaneSize.height()); + // Adjust beginning tabbar item size, if scrollbuttons are used. This is to ensure that the + // tabbar item content fits, since scrollbuttons are making beginning tabbar item smaller. + int scrollButtonSize = 0; + if (const QTabBar *tabBar = qobject_cast<const QTabBar *>(widget)) + scrollButtonSize = tabBar->usesScrollButtons() ? pixelMetric(PM_TabBarScrollButtonWidth) : 0; + if (const QStyleOptionTab *tab = qstyleoption_cast<const QStyleOptionTab *>(opt)) { + const bool verticalTabs = tab->shape == QTabBar::RoundedEast + || tab->shape == QTabBar::RoundedWest + || tab->shape == QTabBar::TriangularEast + || tab->shape == QTabBar::TriangularWest; + if (tab->position == QStyleOptionTab::Beginning) + sz += QSize(verticalTabs ? 0 : scrollButtonSize, !verticalTabs ? 0 : scrollButtonSize); + } } break; case CT_MenuItem: diff --git a/src/gui/widgets/qcombobox_p.h b/src/gui/widgets/qcombobox_p.h index 92d85cc..29a628c 100644 --- a/src/gui/widgets/qcombobox_p.h +++ b/src/gui/widgets/qcombobox_p.h @@ -200,7 +200,9 @@ protected: menuOpt.menuItemType = QStyleOptionMenuItem::Scroller; if (sliderAction == QAbstractSlider::SliderSingleStepAdd) menuOpt.state |= QStyle::State_DownArrow; +#ifndef Q_WS_S60 p.eraseRect(rect()); +#endif style()->drawControl(QStyle::CE_MenuScroller, &menuOpt, &p); } diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp index 8aaaade..d692307 100644 --- a/src/gui/widgets/qtabbar.cpp +++ b/src/gui/widgets/qtabbar.cpp @@ -67,6 +67,10 @@ #include <private/qt_cocoa_helpers_mac_p.h> #endif +#ifndef QT_NO_STYLE_S60 +#include "qs60style.h" +#endif + QT_BEGIN_NAMESPACE @@ -490,6 +494,9 @@ void QTabBarPrivate::layoutTabs() if (useScrollButtons && tabList.count() && last > available) { int extra = extraWidth(); +#ifndef QT_NO_STYLE_S60 + QS60Style *s60Style = qobject_cast<QS60Style*>(QApplication::style()); +#endif if (!vertTabs) { Qt::LayoutDirection ld = q->layoutDirection(); QRect arrows = QStyle::visualRect(ld, q->rect(), @@ -497,25 +504,57 @@ void QTabBarPrivate::layoutTabs() int buttonOverlap = q->style()->pixelMetric(QStyle::PM_TabBar_ScrollButtonOverlap, 0, q); if (ld == Qt::LeftToRight) { +// In S60style, tab scroll buttons are layoutted separately, on the sides of the tabbar. +#ifndef QT_NO_STYLE_S60 + if (s60Style) { + rightB->setGeometry(arrows.left() + extra / 2, arrows.top(), extra / 2, arrows.height()); + leftB->setGeometry(0, arrows.top(), extra / 2, arrows.height()); + } else { +#endif leftB->setGeometry(arrows.left(), arrows.top(), extra/2, arrows.height()); rightB->setGeometry(arrows.right() - extra/2 + buttonOverlap, arrows.top(), extra/2, arrows.height()); +#ifndef QT_NO_STYLE_S60 + } +#endif leftB->setArrowType(Qt::LeftArrow); rightB->setArrowType(Qt::RightArrow); } else { +#ifndef QT_NO_STYLE_S60 + if (s60Style) { + rightB->setGeometry(arrows.left() + extra / 2, arrows.top(), extra / 2, arrows.height()); + leftB->setGeometry(0, arrows.top(), extra / 2, arrows.height()); + } else { +#endif rightB->setGeometry(arrows.left(), arrows.top(), extra/2, arrows.height()); leftB->setGeometry(arrows.right() - extra/2 + buttonOverlap, arrows.top(), extra/2, arrows.height()); +#ifndef QT_NO_STYLE_S60 + } +#endif rightB->setArrowType(Qt::LeftArrow); leftB->setArrowType(Qt::RightArrow); } } else { +#ifndef QT_NO_STYLE_S60 + if (s60Style) { + QRect arrows = QRect(0, 0, size.width(), available ); + leftB->setGeometry(arrows.left(), arrows.top(), arrows.width(), extra / 2); + leftB->setArrowType(Qt::UpArrow); + rightB->setGeometry(arrows.left(), arrows.bottom() - extra / 2 + 1, + arrows.width(), extra / 2); + rightB->setArrowType(Qt::DownArrow); + } else { +#endif QRect arrows = QRect(0, available - extra, size.width(), extra ); leftB->setGeometry(arrows.left(), arrows.top(), arrows.width(), extra/2); leftB->setArrowType(Qt::UpArrow); rightB->setGeometry(arrows.left(), arrows.bottom() - extra/2 + 1, arrows.width(), extra/2); rightB->setArrowType(Qt::DownArrow); +#ifndef QT_NO_STYLE_S60 + } +#endif } leftB->setEnabled(scrollOffset > 0); rightB->setEnabled(last - scrollOffset >= available - extra); diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 1754908..a9d600e 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -1,6 +1,6 @@ TEMPLATE = subdirs -SUBDIRS += particles +SUBDIRS += particles gestures contains(QT_CONFIG, webkit): SUBDIRS += webkit contains(QT_CONFIG, mediaservices): SUBDIRS += multimedia diff --git a/src/imports/webkit/qdeclarativewebview.cpp b/src/imports/webkit/qdeclarativewebview.cpp index 5db812c..9571470 100644 --- a/src/imports/webkit/qdeclarativewebview.cpp +++ b/src/imports/webkit/qdeclarativewebview.cpp @@ -437,24 +437,39 @@ void QDeclarativeWebView::paintPage(const QRect& r) /*! \qmlproperty list<object> WebView::javaScriptWindowObjects - This property is a list of object that are available from within - the webview's JavaScript context. + A list of QML objects to expose to the web page. - The \a object will be inserted as a child of the frame's window - object, under the name given by the attached property \c WebView.windowObjectName. + Each object will be added as a property of the web frame's window object. The + property name is controlled by the value of \c WebView.windowObjectName + attached property. + + Exposing QML objects to a web page allows JavaScript executing in the web + page itself to communicate with QML, by reading and writing properties and + by calling methods of the exposed QML objects. + + This example shows how to call into a QML method using a window object. \qml WebView { - javaScriptWindowObjects: Object { - WebView.windowObjectName: "coordinates" + javaScriptWindowObjects: QtObject { + WebView.windowObjectName: "qml" + + function qmlCall() { + console.log("This call is in QML!"); + } } + + html: "<script>console.log(\"This is in WebKit!\"); window.qml.qmlCall();</script>" } \endqml - Properties of the object will be exposed as JavaScript properties and slots as - JavaScript methods. + The output of the example will be: + \code + This is in WebKit! + This call is in QML! + \endcode - If Javascript is not enabled for this page, then this property does nothing. + If Javascript is not enabled for the page, then this property does nothing. */ QDeclarativeListProperty<QObject> QDeclarativeWebView::javaScriptWindowObjects() { diff --git a/src/multimedia/mediaservices/mediaservices.pro b/src/multimedia/mediaservices/mediaservices.pro index d5b0e4c..8a065f4 100644 --- a/src/multimedia/mediaservices/mediaservices.pro +++ b/src/multimedia/mediaservices/mediaservices.pro @@ -2,6 +2,8 @@ TARGET = QtMediaServices QPRO_PWD = $$PWD QT = core gui multimedia +contains(QT_CONFIG, opengl): QT += opengl + DEFINES += QT_BUILD_MEDIASERVICES_LIB QT_NO_USING_NAMESPACE unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtGui QtMultimedia diff --git a/src/network/socket/qlocalserver_win.cpp b/src/network/socket/qlocalserver_win.cpp index 5d2be72..07baf1e 100644 --- a/src/network/socket/qlocalserver_win.cpp +++ b/src/network/socket/qlocalserver_win.cpp @@ -167,8 +167,8 @@ void QLocalServerPrivate::_q_onNewConnection() q->incomingConnection((quintptr)handle); } else { if (GetLastError() != ERROR_IO_INCOMPLETE) { + q->close(); setError(QLatin1String("QLocalServerPrivate::_q_onNewConnection")); - closeServer(); return; } diff --git a/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h b/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h index adc69ee..46029b9 100644 --- a/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h +++ b/src/opengl/gl2paintengineex/qgl2pexvertexarray_p.h @@ -100,8 +100,10 @@ class QGL2PEXVertexArray { public: QGL2PEXVertexArray() : + vertexArray(0), vertexArrayStops(0), maxX(-2e10), maxY(-2e10), minX(2e10), minY(2e10), - boundingRectDirty(true) {} + boundingRectDirty(true) + { } inline void addRect(const QRectF &rect) { diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h index 6ba0c42..0a046dc 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h @@ -177,6 +177,7 @@ public: ctx(0), useSystemClip(true), elementIndicesVBOId(0), + opacityArray(0), snapToPixelGrid(false), addOffset(false), nativePaintingActive(false), diff --git a/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp b/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp index f677ce1..9bc099d 100644 --- a/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp +++ b/src/opengl/gl2paintengineex/qtriangulatingstroker.cpp @@ -481,7 +481,8 @@ static void qdashprocessor_cubicTo(qreal, qreal, qreal, qreal, qreal, qreal, voi } QDashedStrokeProcessor::QDashedStrokeProcessor() - : m_dash_stroker(0), m_inv_scale(1) + : m_points(0), m_types(0), + m_dash_stroker(0), m_inv_scale(1) { m_dash_stroker.setMoveToHook(qdashprocessor_moveTo); m_dash_stroker.setLineToHook(qdashprocessor_lineTo); @@ -499,6 +500,8 @@ void QDashedStrokeProcessor::process(const QVectorPath &path, const QPen &pen, c m_points.reset(); m_types.reset(); + m_points.reserve(path.elementCount()); + m_types.reserve(path.elementCount()); qreal width = qpen_widthf(pen); if (width == 0) diff --git a/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h b/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h index 956d7cc..ab27ed6 100644 --- a/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h +++ b/src/opengl/gl2paintengineex/qtriangulatingstroker_p.h @@ -54,6 +54,7 @@ QT_BEGIN_NAMESPACE class QTriangulatingStroker { public: + QTriangulatingStroker() : m_vertices(0) {} void process(const QVectorPath &path, const QPen &pen, const QRectF &clip); inline int vertexCount() const { return m_vertices.size(); } diff --git a/src/opengl/gl2paintengineex/qtriangulator.cpp b/src/opengl/gl2paintengineex/qtriangulator.cpp index ce917ff..df7cbc2 100644 --- a/src/opengl/gl2paintengineex/qtriangulator.cpp +++ b/src/opengl/gl2paintengineex/qtriangulator.cpp @@ -510,6 +510,7 @@ template <class T> class QMaxHeap { public: + QMaxHeap() : m_data(0) {} inline int size() const {return m_data.size();} inline bool empty() const {return m_data.isEmpty();} inline bool isEmpty() const {return m_data.isEmpty();} @@ -1299,7 +1300,8 @@ public: class ComplexToSimple { public: - inline ComplexToSimple(QTriangulator *parent) : m_parent(parent) { } + inline ComplexToSimple(QTriangulator *parent) : m_parent(parent), + m_edges(0), m_events(0), m_splits(0) { } void decompose(); private: struct Edge @@ -1412,7 +1414,7 @@ public: class SimpleToMonotone { public: - inline SimpleToMonotone(QTriangulator *parent) : m_parent(parent) { } + inline SimpleToMonotone(QTriangulator *parent) : m_parent(parent), m_edges(0), m_upperVertex(0) { } void decompose(); private: enum VertexType {MergeVertex, EndVertex, RegularVertex, StartVertex, SplitVertex}; @@ -1486,7 +1488,7 @@ public: int m_length; }; - inline QTriangulator() { } + inline QTriangulator() : m_vertices(0) { } // Call this only once. void initialize(const qreal *polygon, int count, uint hint, const QTransform &matrix); @@ -2709,7 +2711,7 @@ void QTriangulator::SimpleToMonotone::monotoneDecomposition() return; Q_ASSERT(!m_edgeList.root); - QDataBuffer<QPair<int, int> > diagonals; + QDataBuffer<QPair<int, int> > diagonals(m_upperVertex.size()); int i = 0; for (int index = 1; index < m_edges.size(); ++index) { @@ -2853,7 +2855,7 @@ bool QTriangulator::SimpleToMonotone::CompareVertices::operator () (int i, int j void QTriangulator::MonotoneToTriangles::decompose() { QVector<quint32> result; - QDataBuffer<int> stack; + QDataBuffer<int> stack(m_parent->m_indices.size()); m_first = 0; // Require at least three more indices. while (m_first + 3 <= m_parent->m_indices.size()) { diff --git a/src/opengl/qpaintengine_opengl.cpp b/src/opengl/qpaintengine_opengl.cpp index 306fd8b..d2b0d4f 100644 --- a/src/opengl/qpaintengine_opengl.cpp +++ b/src/opengl/qpaintengine_opengl.cpp @@ -668,6 +668,7 @@ public: , last_created_state(0) , shader_ctx(0) , grad_palette(0) + , tess_points(0) , drawable_texture(0) , ref_cleaner(this) {} @@ -1950,6 +1951,8 @@ void QOpenGLPaintEnginePrivate::pathToVertexArrays(const QPainterPath &path) void QOpenGLPaintEnginePrivate::drawVertexArrays() { + if (tess_points_stops.count() == 0) + return; glEnableClientState(GL_VERTEX_ARRAY); glVertexPointer(2, GL_DOUBLE, 0, tess_points.data()); int previous_stop = 0; diff --git a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp index 964fa53..9de2a34 100644 --- a/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp +++ b/src/plugins/gfxdrivers/powervr/pvreglscreen/pvreglscreen.cpp @@ -259,7 +259,7 @@ int PvrEglScreen::transformation() const if (parent->classId() != QScreen::TransformedClass) return 0; return 90 * static_cast<const QTransformedScreen *>(parent) - ->transformation(); + ->transformOrientation(); } #else diff --git a/src/plugins/mediaservices/gstreamer/gstreamer.pro b/src/plugins/mediaservices/gstreamer/gstreamer.pro index 6af9c3f..6e05120 100644 --- a/src/plugins/mediaservices/gstreamer/gstreamer.pro +++ b/src/plugins/mediaservices/gstreamer/gstreamer.pro @@ -36,7 +36,7 @@ SOURCES += \ qvideosurfacegstsink.cpp -x11 { +!win32:!embedded:!mac:!symbian { LIBS += -lXv HEADERS += \ diff --git a/src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.cpp b/src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.cpp index f4065e4..1bebe0a 100644 --- a/src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.cpp +++ b/src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.cpp @@ -51,9 +51,11 @@ QT_BEGIN_NAMESPACE S60AudioPlayerSession::S60AudioPlayerSession(QObject *parent) : S60MediaPlayerSession(parent) , m_player(0) - , m_audioOutput(0) , m_audioEndpoint("Default") { +#ifndef HAS_NO_AUDIOROUTING + m_audioOutput = 0; +#endif QT_TRAP_THROWING(m_player = CAudioPlayer::NewL(*this, 0, EMdaPriorityPreferenceNone)); m_player->RegisterForAudioLoadingNotification(*this); } @@ -71,11 +73,13 @@ S60AudioPlayerSession::~S60AudioPlayerSession() void S60AudioPlayerSession::doLoadL(const TDesC &path) { +#ifndef HAS_NO_AUDIOROUTING // m_audioOutput needs to be reinitialized after MapcInitComplete if (m_audioOutput) m_audioOutput->UnregisterObserver(*this); delete m_audioOutput; m_audioOutput = NULL; +#endif m_player->OpenFileL(path); } @@ -171,12 +175,14 @@ void S60AudioPlayerSession::MapcInitComplete(TInt aError, const TTimeIntervalMic { Q_UNUSED(aDuration); setError(aError); +#ifndef HAS_NO_AUDIOROUTING TRAPD(err, m_audioOutput = CAudioOutput::NewL(*m_player); m_audioOutput->RegisterObserverL(*this); ); setActiveEndpoint(m_audioEndpoint); setError(err); +#endif loaded(); } @@ -217,6 +223,7 @@ QString S60AudioPlayerSession::defaultEndpoint() const void S60AudioPlayerSession::setActiveEndpoint(const QString& name) { +#if !defined(HAS_NO_AUDIOROUTING) CAudioOutput::TAudioOutputPreference output = CAudioOutput::ENoPreference; if (name == QString("Default")) @@ -229,7 +236,6 @@ void S60AudioPlayerSession::setActiveEndpoint(const QString& name) output = CAudioOutput::EPrivate; else if (name == QString("Speaker")) output = CAudioOutput::EPublic; -#if !defined(HAS_NO_AUDIOROUTING) if (m_audioOutput) { TRAPD(err, m_audioOutput->SetAudioOutputL(output)); setError(err); @@ -242,6 +248,7 @@ void S60AudioPlayerSession::setActiveEndpoint(const QString& name) #endif } +#if !defined(HAS_NO_AUDIOROUTING) void S60AudioPlayerSession::DefaultAudioOutputChanged(CAudioOutput& aAudioOutput, CAudioOutput::TAudioOutputPreference aNewDefault) { @@ -264,5 +271,5 @@ QString S60AudioPlayerSession::qStringFromTAudioOutputPreference(CAudioOutput::T return QString("Speaker"); return QString("Default"); } - +#endif QT_END_NAMESPACE diff --git a/src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h b/src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h index fca66b3..d7259b9 100644 --- a/src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h +++ b/src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h @@ -48,15 +48,19 @@ typedef CMdaAudioPlayerUtility CAudioPlayer; typedef MMdaAudioPlayerCallback MAudioPlayerObserver; +#ifndef HAS_NO_AUDIOROUTING #include <AudioOutput.h> #include <MAudioOutputObserver.h> +#endif QT_BEGIN_NAMESPACE class S60AudioPlayerSession : public S60MediaPlayerSession , public MAudioPlayerObserver , public MAudioLoadingObserver +#ifndef HAS_NO_AUDIOROUTING , public MAudioOutputObserver +#endif { Q_OBJECT @@ -72,10 +76,11 @@ public: void MaloLoadingStarted(); void MaloLoadingComplete(); +#ifndef HAS_NO_AUDIOROUTING // From MAudioOutputObserver void DefaultAudioOutputChanged( CAudioOutput& aAudioOutput, CAudioOutput::TAudioOutputPreference aNewDefault ); - +#endif public: // From S60MediaPlayerAudioEndpointSelector QString activeEndpoint() const; @@ -103,11 +108,14 @@ protected: private: void MapcInitComplete(TInt aError, const TTimeIntervalMicroSeconds& aDuration); void MapcPlayComplete(TInt aError); +#ifndef HAS_NO_AUDIOROUTING QString qStringFromTAudioOutputPreference(CAudioOutput::TAudioOutputPreference output) const; - +#endif private: CAudioPlayer *m_player; +#ifndef HAS_NO_AUDIOROUTING CAudioOutput *m_audioOutput; +#endif QString m_audioEndpoint; }; diff --git a/src/qt3support/widgets/q3spinwidget.cpp b/src/qt3support/widgets/q3spinwidget.cpp index 3dc36c5..3bfad06 100644 --- a/src/qt3support/widgets/q3spinwidget.cpp +++ b/src/qt3support/widgets/q3spinwidget.cpp @@ -340,11 +340,13 @@ void Q3SpinWidget::paintEvent(QPaintEvent *) QPainter p(this); QStyleOptionSpinBox opt = getStyleOption(this); - if (d->theButton & 1) + if (d->theButton & 1) { opt.activeSubControls = QStyle::SC_SpinBoxDown; - else if (d->theButton & 2) + opt.state |= QStyle::State_Sunken; + } else if (d->theButton & 2) { opt.activeSubControls = QStyle::SC_SpinBoxUp; - else + opt.state |= QStyle::State_Sunken; + } else opt.activeSubControls = QStyle::SC_None; opt.rect = style()->subControlRect(QStyle::CC_SpinBox, &opt, QStyle::SC_SpinBoxFrame, this); opt.subControls = QStyle::SC_All; diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp index 46431a8..1a0e737 100644 --- a/src/testlib/qplaintestlogger.cpp +++ b/src/testlib/qplaintestlogger.cpp @@ -182,6 +182,7 @@ namespace QTest { hbuffer->Des().Copy(ptr.Mid(i, size)); RDebug::Print(format, hbuffer); } + delete hbuffer; } else { // fast, no allocations, but truncates silently diff --git a/tests/auto/declarative/declarative.pro b/tests/auto/declarative/declarative.pro index b8e33cf..a9b069c 100644 --- a/tests/auto/declarative/declarative.pro +++ b/tests/auto/declarative/declarative.pro @@ -1,7 +1,6 @@ TEMPLATE = subdirs SUBDIRS += \ examples \ - graphicswidgets \ # Cover parserstress \ # Cover qmetaobjectbuilder \ # Cover qdeclarativeanimations \ # Cover @@ -64,6 +63,7 @@ SUBDIRS += \ qdeclarativestyledtext \ # Cover qdeclarativesqldatabase \ # Cover qdeclarativevisualdatamodel \ # Cover + qdeclarativeviewer \ # Cover qmlvisual # Cover contains(QT_CONFIG, webkit) { diff --git a/tests/auto/declarative/examples/tst_examples.cpp b/tests/auto/declarative/examples/tst_examples.cpp index 4f10a98..3759cb5 100644 --- a/tests/auto/declarative/examples/tst_examples.cpp +++ b/tests/auto/declarative/examples/tst_examples.cpp @@ -80,16 +80,6 @@ tst_examples::tst_examples() // Add directories you want excluded here - excludedDirs << "examples/declarative/extending"; - excludedDirs << "examples/declarative/tutorials/extending"; - excludedDirs << "examples/declarative/plugins"; - excludedDirs << "examples/declarative/proxywidgets"; - excludedDirs << "examples/declarative/gestures"; - - excludedDirs << "examples/declarative/imageprovider"; - excludedDirs << "examples/declarative/layouts/graphicsLayouts"; - excludedDirs << "demos/declarative/minehunt"; - excludedDirs << "doc/src/snippets/declarative/graphicswidgets"; #ifdef QT_NO_WEBKIT @@ -160,11 +150,14 @@ QStringList tst_examples::findQmlFiles(const QDir &d) QStringList rv; - QStringList files = d.entryList(QStringList() << QLatin1String("*.qml"), - QDir::Files); - foreach (const QString &file, files) { - if (file.at(0).isLower()) { - rv << d.absoluteFilePath(file); + QStringList cppfiles = d.entryList(QStringList() << QLatin1String("*.cpp"), QDir::Files); + if (cppfiles.isEmpty()) { + QStringList files = d.entryList(QStringList() << QLatin1String("*.qml"), + QDir::Files); + foreach (const QString &file, files) { + if (file.at(0).isLower()) { + rv << d.absoluteFilePath(file); + } } } diff --git a/tests/auto/declarative/graphicswidgets/data/graphicswidgets.qml b/tests/auto/declarative/graphicswidgets/data/graphicswidgets.qml deleted file mode 100644 index d6cf4de..0000000 --- a/tests/auto/declarative/graphicswidgets/data/graphicswidgets.qml +++ /dev/null @@ -1,52 +0,0 @@ -import Qt 4.7 -import Qt.widgets 4.7 - -QGraphicsWidget { - geometry: "20,0,600x400" - layout: QGraphicsLinearLayout { - orientation: Qt.Horizontal - QGraphicsWidget { - layout: QGraphicsLinearLayout { - spacing: 10; orientation: Qt.Vertical - LayoutItem { - QGraphicsLinearLayout.stretchFactor: 1 - QGraphicsLinearLayout.spacing: 1 - objectName: "left" - minimumSize: "100x100" - maximumSize: "300x300" - preferredSize: "100x100" - Rectangle { objectName: "yellowRect"; color: "yellow"; anchors.fill: parent } - } - LayoutItem { - QGraphicsLinearLayout.stretchFactor: 10 - QGraphicsLinearLayout.spacing: 10 - objectName: "left" - minimumSize: "100x100" - maximumSize: "300x300" - preferredSize: "100x100" - Rectangle { objectName: "yellowRect"; color: "blue"; anchors.fill: parent } - } - } - } - QGraphicsWidget { - layout: QGraphicsLinearLayout { - spacing: 10; orientation: Qt.Horizontal; contentsMargin: 10 - LayoutItem { - objectName: "left" - minimumSize: "100x100" - maximumSize: "300x300" - preferredSize: "100x100" - Rectangle { objectName: "yellowRect"; color: "red"; anchors.fill: parent } - } - LayoutItem { - objectName: "left" - minimumSize: "100x100" - maximumSize: "300x300" - preferredSize: "100x100" - Rectangle { objectName: "yellowRect"; color: "green"; anchors.fill: parent } - } - } - } - } -} - diff --git a/tests/auto/declarative/graphicswidgets/tst_graphicswidgets.cpp b/tests/auto/declarative/graphicswidgets/tst_graphicswidgets.cpp deleted file mode 100644 index f1a71d5..0000000 --- a/tests/auto/declarative/graphicswidgets/tst_graphicswidgets.cpp +++ /dev/null @@ -1,74 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#include <qtest.h> -#include <QFile> -#include <QtDeclarative/qdeclarativeengine.h> -#include <QtDeclarative/qdeclarativecomponent.h> -#include <QtGui/qgraphicswidget.h> - -class tst_graphicswidgets : public QObject - -{ - Q_OBJECT -public: - tst_graphicswidgets(); - -private slots: - void widgets(); -}; - -tst_graphicswidgets::tst_graphicswidgets() -{ -} - -void tst_graphicswidgets::widgets() -{ - QDeclarativeEngine engine; - QDeclarativeComponent c(&engine, QUrl::fromLocalFile(SRCDIR "/data/graphicswidgets.qml")); - QGraphicsWidget *obj = qobject_cast<QGraphicsWidget*>(c.create()); - - QVERIFY(obj != 0); - delete obj; -} - -QTEST_MAIN(tst_graphicswidgets) - -#include "tst_graphicswidgets.moc" diff --git a/tests/auto/declarative/qdeclarativeanchors/data/anchorsqgraphicswidget.qml b/tests/auto/declarative/qdeclarativeanchors/data/anchorsqgraphicswidget.qml index 91973a3..d430c2c 100644 --- a/tests/auto/declarative/qdeclarativeanchors/data/anchorsqgraphicswidget.qml +++ b/tests/auto/declarative/qdeclarativeanchors/data/anchorsqgraphicswidget.qml @@ -1,5 +1,4 @@ import Qt 4.7 -import Qt.widgets 4.7 Rectangle { color: "white" diff --git a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml index 3047e9b..7b132e1 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml +++ b/tests/auto/declarative/qdeclarativeecmascript/data/dynamicCreation.qml @@ -11,7 +11,7 @@ MyQmlObject{ function createTwo() { var component = Qt.createComponent('dynamicCreation.helper.qml'); - obj.objectProperty = component.createObject(); + obj.objectProperty = component.createObject(obj); } function createThree() @@ -22,6 +22,6 @@ MyQmlObject{ function dontCrash() { var component = Qt.createComponent('file-doesnt-exist.qml'); - obj.objectProperty = component.createObject(); + obj.objectProperty = component.createObject(obj); } } diff --git a/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml b/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml index 9bb0b37..3b851c1 100644 --- a/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml +++ b/tests/auto/declarative/qdeclarativeloader/data/GraphicsWidget250x250.qml @@ -1,5 +1,4 @@ import Qt 4.7 -import Qt.widgets 4.6 QGraphicsWidget { size: "250x250" diff --git a/tests/auto/declarative/qdeclarativemousearea/data/rejectEvent.qml b/tests/auto/declarative/qdeclarativemousearea/data/rejectEvent.qml new file mode 100644 index 0000000..c01e938 --- /dev/null +++ b/tests/auto/declarative/qdeclarativemousearea/data/rejectEvent.qml @@ -0,0 +1,28 @@ +import Qt 4.7 + +Rectangle { + id: root + color: "#ffffff" + width: 320; height: 240 + property bool mr1_pressed: false + property bool mr1_released: false + property bool mr1_canceled: false + property bool mr2_pressed: false + property bool mr2_released: false + property bool mr2_canceled: false + + MouseArea { + id: mouseRegion1 + anchors.fill: parent + onPressed: { root.mr1_pressed = true } + onReleased: { root.mr1_released = true } + onCanceled: { root.mr1_canceled = true } + } + MouseArea { + id: mouseRegion2 + width: 120; height: 120 + onPressed: { root.mr2_pressed = true; mouse.accepted = false } + onReleased: { root.mr2_released = true } + onCanceled: { root.mr2_canceled = true } + } +} diff --git a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp index eb4aa12..ff3bf45 100644 --- a/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp +++ b/tests/auto/declarative/qdeclarativemousearea/tst_qdeclarativemousearea.cpp @@ -56,6 +56,8 @@ private slots: void updateMouseAreaPosOnClick(); void updateMouseAreaPosOnResize(); void noOnClickedWithPressAndHold(); + void onMousePressRejected(); + private: QDeclarativeView *createView(); }; @@ -320,7 +322,7 @@ void tst_QDeclarativeMouseArea::noOnClickedWithPressAndHold() QTest::qWait(1000); - QGraphicsSceneMouseEvent releaseEvent(QEvent::GraphicsSceneMousePress); + QGraphicsSceneMouseEvent releaseEvent(QEvent::GraphicsSceneMouseRelease); releaseEvent.setScenePos(QPointF(100, 100)); releaseEvent.setButton(Qt::LeftButton); releaseEvent.setButtons(Qt::LeftButton); @@ -330,6 +332,48 @@ void tst_QDeclarativeMouseArea::noOnClickedWithPressAndHold() QVERIFY(canvas->rootObject()->property("held").toBool()); } +void tst_QDeclarativeMouseArea::onMousePressRejected() +{ + QDeclarativeView *canvas = createView(); + canvas->setSource(QUrl::fromLocalFile(SRCDIR "/data/rejectEvent.qml")); + canvas->show(); + canvas->setFocus(); + QVERIFY(canvas->rootObject() != 0); + + QVERIFY(!canvas->rootObject()->property("mr1_pressed").toBool()); + QVERIFY(!canvas->rootObject()->property("mr1_released").toBool()); + QVERIFY(!canvas->rootObject()->property("mr1_canceled").toBool()); + QVERIFY(!canvas->rootObject()->property("mr2_pressed").toBool()); + QVERIFY(!canvas->rootObject()->property("mr2_released").toBool()); + QVERIFY(!canvas->rootObject()->property("mr2_canceled").toBool()); + + QGraphicsScene *scene = canvas->scene(); + QGraphicsSceneMouseEvent pressEvent(QEvent::GraphicsSceneMousePress); + pressEvent.setScenePos(QPointF(100, 100)); + pressEvent.setButton(Qt::LeftButton); + pressEvent.setButtons(Qt::LeftButton); + QApplication::sendEvent(scene, &pressEvent); + + QVERIFY(canvas->rootObject()->property("mr1_pressed").toBool()); + QVERIFY(!canvas->rootObject()->property("mr1_released").toBool()); + QVERIFY(!canvas->rootObject()->property("mr1_canceled").toBool()); + QVERIFY(canvas->rootObject()->property("mr2_pressed").toBool()); + QVERIFY(!canvas->rootObject()->property("mr2_released").toBool()); + QVERIFY(canvas->rootObject()->property("mr2_canceled").toBool()); + + QTest::qWait(200); + + QGraphicsSceneMouseEvent releaseEvent(QEvent::GraphicsSceneMouseRelease); + releaseEvent.setScenePos(QPointF(100, 100)); + releaseEvent.setButton(Qt::LeftButton); + releaseEvent.setButtons(Qt::LeftButton); + QApplication::sendEvent(scene, &releaseEvent); + + QVERIFY(canvas->rootObject()->property("mr1_released").toBool()); + QVERIFY(!canvas->rootObject()->property("mr1_canceled").toBool()); + QVERIFY(!canvas->rootObject()->property("mr2_released").toBool()); +} + QTEST_MAIN(tst_QDeclarativeMouseArea) #include "tst_qdeclarativemousearea.moc" diff --git a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp index 0065ccf..c00390d 100644 --- a/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp +++ b/tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp @@ -576,6 +576,14 @@ void tst_qdeclarativetextinput::navigation() simulateKey(canvas, Qt::Key_Left); QVERIFY(input->hasFocus() == true); + // Up and Down should NOT do Home/End, even on Mac OS X (QTBUG-10438). + input->setCursorPosition(2); + QCOMPARE(input->cursorPosition(),2); + simulateKey(canvas, Qt::Key_Up); + QCOMPARE(input->cursorPosition(),2); + simulateKey(canvas, Qt::Key_Down); + QCOMPARE(input->cursorPosition(),2); + delete canvas; } diff --git a/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp b/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp index 1ed51c1..dd2f46e 100644 --- a/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp +++ b/tests/auto/declarative/qdeclarativeview/tst_qdeclarativeview.cpp @@ -147,7 +147,7 @@ void tst_QDeclarativeView::resizemodedeclarativeitem() declarativeItem->setHeight(80); QCOMPARE(canvas->width(), 80); QCOMPARE(canvas->height(), 100); - QCOMPARE(canvas->size(), canvas->sizeHint()); + QCOMPARE(QSize(declarativeItem->width(), declarativeItem->height()), canvas->sizeHint()); QCOMPARE(sceneResizedSpy2.count(), 2); // size update from view @@ -230,7 +230,7 @@ void tst_QDeclarativeView::resizemodegraphicswidget() canvas->setResizeMode(QDeclarativeView::SizeRootObjectToView); graphicsWidget->resize(QSizeF(60,80)); QCOMPARE(canvas->size(), QSize(80,100)); - QCOMPARE(canvas->size(), canvas->sizeHint()); + QCOMPARE(QSize(graphicsWidget->size().width(), graphicsWidget->size().height()), canvas->sizeHint()); QCOMPARE(sceneResizedSpy2.count(), 2); // size update from view diff --git a/tests/auto/declarative/qdeclarativeviewer/data/orientation.qml b/tests/auto/declarative/qdeclarativeviewer/data/orientation.qml new file mode 100644 index 0000000..687fac6 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeviewer/data/orientation.qml @@ -0,0 +1,10 @@ +import Qt 4.7 +Rectangle { + color: "black" + width: (runtime.orientation == Orientation.Landscape) ? 300 : 200 + height: (runtime.orientation == Orientation.Landscape) ? 200 : 300 + Text { + text: runtime.orientation == Orientation.Landscape ? "Landscape" : "Portrait" + color: "white" + } +}
\ No newline at end of file diff --git a/tests/auto/declarative/graphicswidgets/graphicswidgets.pro b/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro index b77b430..dc10f5b 100644 --- a/tests/auto/declarative/graphicswidgets/graphicswidgets.pro +++ b/tests/auto/declarative/qdeclarativeviewer/qdeclarativeviewer.pro @@ -2,9 +2,10 @@ load(qttest_p4) contains(QT_CONFIG,declarative): QT += declarative gui macx:CONFIG -= app_bundle -SOURCES += tst_graphicswidgets.cpp +include(../../../../tools/qml/qml.pri) + +SOURCES += tst_qdeclarativeviewer.cpp -# Define SRCDIR equal to test's source directory DEFINES += SRCDIR=\\\"$$PWD\\\" CONFIG += parallel_test diff --git a/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp new file mode 100644 index 0000000..9429dc9 --- /dev/null +++ b/tests/auto/declarative/qdeclarativeviewer/tst_qdeclarativeviewer.cpp @@ -0,0 +1,108 @@ +/**************************************************************************** +** +** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the Technology Preview License Agreement accompanying +** this package. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** If you have questions regarding the use of this file, please contact +** Nokia at qt-info@nokia.com. +** +** +** +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <qtest.h> +#include <QtDeclarative/qdeclarativeengine.h> +#include <QtDeclarative/qdeclarativeview.h> +#include <QtDeclarative/qdeclarativeitem.h> +#include "qmlruntime.h" + +class tst_QDeclarativeViewer : public QObject + +{ + Q_OBJECT +public: + tst_QDeclarativeViewer(); + +private slots: + void orientation(); + +private: + QDeclarativeEngine engine; +}; + +tst_QDeclarativeViewer::tst_QDeclarativeViewer() +{ +} + +void tst_QDeclarativeViewer::orientation() +{ + QWidget window; + QDeclarativeViewer *viewer = new QDeclarativeViewer(&window); + QVERIFY(viewer); + viewer->open(SRCDIR "/data/orientation.qml"); + QVERIFY(viewer->view()); + QVERIFY(viewer->menuBar()); + QDeclarativeItem* rootItem = qobject_cast<QDeclarativeItem*>(viewer->view()->rootObject()); + QVERIFY(rootItem); + window.show(); + + QCOMPARE(rootItem->width(), 200.0); + QCOMPARE(rootItem->height(), 300.0); + QCOMPARE(viewer->view()->size(), QSize(200, 300)); + QCOMPARE(viewer->view()->sceneRect().size(), QSizeF(200, 300)); + QCOMPARE(viewer->size(), QSize(200, 300+viewer->menuBar()->height())); + QCOMPARE(viewer->size(), viewer->sizeHint()); + + viewer->toggleOrientation(); + qApp->processEvents(); + + QCOMPARE(rootItem->width(), 300.0); + QCOMPARE(rootItem->height(), 200.0); + QCOMPARE(viewer->view()->size(), QSize(300, 200)); + QCOMPARE(viewer->view()->sceneRect().size(), QSizeF(300, 200)); + QCOMPARE(viewer->size(), QSize(300, 200+viewer->menuBar()->height())); + QCOMPARE(viewer->size(), viewer->sizeHint()); + + viewer->toggleOrientation(); + qApp->processEvents(); + + QCOMPARE(rootItem->width(), 200.0); + QCOMPARE(rootItem->height(), 300.0); + QCOMPARE(viewer->view()->size(), QSize(200, 300)); + QCOMPARE(viewer->view()->sceneRect().size(), QSizeF(200, 300)); + QCOMPARE(viewer->size(), QSize(200, 300+viewer->menuBar()->height())); + QCOMPARE(viewer->size(), viewer->sizeHint()); +} + +QTEST_MAIN(tst_QDeclarativeViewer) + +#include "tst_qdeclarativeviewer.moc" diff --git a/tests/auto/declarative/qmlvisual/qdeclarativemousearea/mousearea-flickable.qml b/tests/auto/declarative/qmlvisual/qdeclarativemousearea/mousearea-flickable.qml index a0b787f..e223f5e 100644 --- a/tests/auto/declarative/qmlvisual/qdeclarativemousearea/mousearea-flickable.qml +++ b/tests/auto/declarative/qmlvisual/qdeclarativemousearea/mousearea-flickable.qml @@ -25,7 +25,7 @@ Rectangle { MouseArea { anchors.fill: parent onPressed: blue.color = "lightsteelblue" - onReleased: blue.color = "steelblue" + onCanceled: blue.color = "steelblue" } } Rectangle { @@ -36,7 +36,7 @@ Rectangle { MouseArea { anchors.fill: parent onEntered: { red.color = "darkred"; tooltip.opacity = 1 } - onExited: { red.color = "red"; tooltip.opacity = 0 } + onCanceled: { red.color = "red"; tooltip.opacity = 0 } } Rectangle { id: tooltip diff --git a/tools/qml/qmlruntime.cpp b/tools/qml/qmlruntime.cpp index d49b0f1..06fa004 100644 --- a/tools/qml/qmlruntime.cpp +++ b/tools/qml/qmlruntime.cpp @@ -535,6 +535,8 @@ QDeclarativeViewer::QDeclarativeViewer(QWidget *parent, Qt::WindowFlags flags) connect(&autoStartTimer, SIGNAL(triggered()), this, SLOT(autoStartRecording())); connect(&autoStopTimer, SIGNAL(triggered()), this, SLOT(autoStopRecording())); connect(&recordTimer, SIGNAL(triggered()), this, SLOT(recordFrame())); + connect(DeviceOrientation::instance(), SIGNAL(orientationChanged()), + this, SLOT(orientationChanged()), Qt::QueuedConnection); autoStartTimer.setRunning(false); autoStopTimer.setRunning(false); recordTimer.setRunning(false); @@ -968,10 +970,8 @@ void QDeclarativeViewer::statusChanged() if (canvas->status() == QDeclarativeView::Ready) { initialSize = canvas->sizeHint(); if (canvas->resizeMode() == QDeclarativeView::SizeRootObjectToView) { - QSize newWindowSize = initialSize; - newWindowSize.setHeight(newWindowSize.height()+menuBarHeight()); updateSizeHints(); - resize(newWindowSize); + resize(QSize(initialSize.width(), initialSize.height()+menuBarHeight())); } } } @@ -1425,6 +1425,19 @@ void QDeclarativeViewer::recordFrame() } } +void QDeclarativeViewer::orientationChanged() +{ + if (canvas->resizeMode() == QDeclarativeView::SizeRootObjectToView) { + if (canvas->rootObject()) { + QSizeF rootObjectSize = canvas->rootObject()->boundingRect().size(); + QSize newSize(rootObjectSize.width(), rootObjectSize.height()+menuBarHeight()); + if (size() != newSize) { + resize(newSize); + } + } + } +} + void QDeclarativeViewer::setDeviceKeys(bool on) { devicemode = on; diff --git a/tools/qml/qmlruntime.h b/tools/qml/qmlruntime.h index 655feea..9551090 100644 --- a/tools/qml/qmlruntime.h +++ b/tools/qml/qmlruntime.h @@ -125,6 +125,7 @@ public slots: void showProxySettings (); void proxySettingsChanged (); void setScaleView(); + void toggleOrientation(); void statusChanged(); void setSlowMode(bool); void launch(const QString &); @@ -132,7 +133,6 @@ public slots: protected: virtual void keyPressEvent(QKeyEvent *); virtual bool event(QEvent *); - void createMenu(QMenuBar *menu, QMenu *flatmenu); private slots: @@ -144,9 +144,9 @@ private slots: void setScaleSkin(); void setPortrait(); void setLandscape(); - void toggleOrientation(); void startNetwork(); void toggleFullScreen(); + void orientationChanged(); void showWarnings(bool show); void warningsWidgetOpened(); @@ -199,7 +199,6 @@ private: QNetworkReply *wgtreply; QString wgtdir; - NetworkAccessManagerFactory *namFactory; bool useQmlFileBrowser; diff --git a/translations/qt_iw.ts b/translations/qt_he.ts index 72a6df9..72a6df9 100644 --- a/translations/qt_iw.ts +++ b/translations/qt_he.ts diff --git a/translations/translations.pri b/translations/translations.pri index 34da6b1..3c4bdd1 100644 --- a/translations/translations.pri +++ b/translations/translations.pri @@ -17,7 +17,7 @@ LUPDATE += -locations relative -no-ui-lines ###### Qt Libraries -QT_TS = ar cs da de es fr hu iw ja_JP pl pt ru sk sl sv uk zh_CN zh_TW +QT_TS = ar cs da de es fr he hu ja_JP pl pt ru sk sl sv uk zh_CN zh_TW ts-qt.commands = (cd $$QT_SOURCE_TREE/src && $$LUPDATE \ -I../include -I../include/Qt \ |