This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
[Desktop Entry] | |
Encoding=UTF-8 | |
Version=1.0 | |
Type=Application | |
Terminal=false | |
Name=animationtest | |
Exec=/opt/usr/bin/animationtest | |
Icon=animationtest | |
X-Window-Icon= | |
X-HildonDesk-ShowInToolbar=true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp | |
index 6152660..a29d417 100644 | |
--- a/WebKit/qt/Api/qwebpage.cpp | |
+++ b/WebKit/qt/Api/qwebpage.cpp | |
@@ -2123,7 +2123,7 @@ void QWebPage::setUserPermission(QWebFrame* frame, PermissionDomain domain, Perm | |
case NotificationsPermissionDomain: | |
#if ENABLE(NOTIFICATIONS) | |
if (policy == PermissionGranted) | |
- NotificationPresenterClientQt::notificationPresenter()->allowNotificationForFrame(frame); | |
+ NotificationPresenterClientQt::notificationPresenter()->allowNotificationForFrame(frame->d->frame); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/WebKit/qt/Api/qwebpage.cpp b/WebKit/qt/Api/qwebpage.cpp | |
index 6152660..a29d417 100644 | |
--- a/WebKit/qt/Api/qwebpage.cpp | |
+++ b/WebKit/qt/Api/qwebpage.cpp | |
@@ -2123,7 +2123,7 @@ void QWebPage::setUserPermission(QWebFrame* frame, PermissionDomain domain, Perm | |
case NotificationsPermissionDomain: | |
#if ENABLE(NOTIFICATIONS) | |
if (policy == PermissionGranted) | |
- NotificationPresenterClientQt::notificationPresenter()->allowNotificationForFrame(frame); | |
+ NotificationPresenterClientQt::notificationPresenter()->allowNotificationForFrame(frame->d->frame); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/WebKit/qt/Api/qwebsettings.cpp b/WebKit/qt/Api/qwebsettings.cpp | |
index 0d73ff9..08b1100 100644 | |
--- a/WebKit/qt/Api/qwebsettings.cpp | |
+++ b/WebKit/qt/Api/qwebsettings.cpp | |
@@ -167,12 +167,6 @@ void QWebSettingsPrivate::apply() | |
settings->setAcceleratedCompositingEnabled(value); | |
#endif | |
-#if ENABLE(3D_CANVAS) | |
- value = attributes.value(QWebSettings::WebGLEnabled, |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
bool QGraphicsScene::event(QEvent *event) | |
{ | |
Q_D(QGraphicsScene); | |
switch (event->type()) { | |
... | |
case QEvent::WindowActivate: | |
if (!d->activationRefCount++) { | |
if (d->lastActivePanel) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
void QGraphicsScene::focusInEvent(QFocusEvent *focusEvent) | |
{ | |
Q_D(QGraphicsScene); | |
d->hasFocus = true; | |
switch (focusEvent->reason()) { | |
case Qt::TabFocusReason: | |
if (!focusNextPrevChild(true)) | |
focusEvent->ignore(); | |
break; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
if (classId == QLatin1String("QProgressBar")) | |
return new QProgressBar(view()); | |
else if (classId == QLatin1String("QLabel")) | |
return new QLabel(view()); | |
An else if statement should be written as an if statement when the prior "if" concludes with a return, break, continue or goto statement. [readability/control_flow] [4] | |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Starting program: /home/shausman/src/webkit/trunk/WebKitBuild/Debug/bin/WebKitTestRunner LayoutTests/editing/deleting/smart-delete-004.html | |
[Thread debugging using libthread_db enabled] | |
[New Thread 0x7fffa570b700 (LWP 1410)] | |
[New Thread 0x7fffa4ee2700 (LWP 1411)] | |
[New Thread 0x7fff9ffff700 (LWP 1412)] | |
[New Thread 0x7fff9f7fe700 (LWP 1413)] | |
[New Thread 0x7fff9effd700 (LWP 1415)] | |
ASSERTION FAILED: m_start != m_end | |
../../../../Source/JavaScriptCore/wtf/Deque.h(77) : T& WTF::Deque<T, inlineCapacity>::first() [with T = WebKit::WebGestureEvent, long unsigned int inlineCapacity = 0ul] | |
1 0x7ffff79bbc52 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
WebView.qml: | |
import QtQuick 2.0 | |
import QtWebKit 3.0 | |
WebViewInternal { | |
// stuff here | |
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git i/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp w/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp | |
index 6723558..42927da 100644 | |
--- i/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp | |
+++ w/Source/WebKit2/UIProcess/API/qt/qquickwebview.cpp | |
@@ -495,47 +495,36 @@ void QQuickWebViewPrivate::_q_onReceivedResponseFromDownload(QWebDownloadItem* d | |
void QQuickWebViewPrivate::runJavaScriptAlert(const QString& alertText) | |
{ | |
- if (!alertDialog) | |
- return; |
OlderNewer