35877 2010-03-08 14:02:40 -0800 [Qt] [ rubberstamp!] Fix if statement in Qt Launcher 2010-03-13 03:00:29 -0800 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED Qt P2 Normal --- 0 robert webkit-unassigned kenneth oldest_to_newest 197306 0 robert 2010-03-08 14:02:40 -0800 Whew, had no luck in getting this rubberstamped, people are busy! From fbee4aa7f643ba7ddb9729b82ea33ba1c47f1195 Mon Sep 17 00:00:00 2001 From: Robert Hogan <robert@webkit.org> Date: Sun, 7 Mar 2010 12:44:44 +0000 Subject: [PATCH] 2010-03-07 Robert Hogan <robert@webkit.org> Reviewed by NOBODY (OOPS!). QtLauncher: Fix typo in conditional statement in WebViewGraphicsBased::setFrameRateMeasurementEnabled. Reviewed by: '=' should be '=='! * QtLauncher/webview.cpp: (WebViewGraphicsBased::setFrameRateMeasurementEnabled): --- WebKitTools/ChangeLog | 14 ++++++++++++++ WebKitTools/QtLauncher/webview.cpp | 2 +- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog index 6efbd72..befeab7 100644 --- a/WebKitTools/ChangeLog +++ b/WebKitTools/ChangeLog @@ -1,3 +1,17 @@ +2010-03-07 Robert Hogan <robert@webkit.org> + + Reviewed by NOBODY (OOPS!). + + QtLauncher: Fix typo in conditional statement in + WebViewGraphicsBased::setFrameRateMeasurementEnabled. + + Reviewed by: + + '=' should be '=='! + + * QtLauncher/webview.cpp: + (WebViewGraphicsBased::setFrameRateMeasurementEnabled): + 2010-03-08 Brady Eidson <beidson@apple.com> Reviewed by NOBODY (but suggested by Steve Falkenburg and fixing a boneheaded mistake on my part last week) diff --git a/WebKitTools/QtLauncher/webview.cpp b/WebKitTools/QtLauncher/webview.cpp index 9252c89..ba1c9b8 100644 --- a/WebKitTools/QtLauncher/webview.cpp +++ b/WebKitTools/QtLauncher/webview.cpp @@ -87,7 +87,7 @@ void WebViewGraphicsBased::resizeEvent(QResizeEvent* event) void WebViewGraphicsBased::setFrameRateMeasurementEnabled(bool enabled) { - if (m_measureFps = enabled) { + if (m_measureFps == enabled) { m_lastConsultTime = m_startTime = QTime::currentTime(); m_updateTimer->start(); } else -- 1.6.3.3 197308 1 50245 robert 2010-03-08 14:04:36 -0800 Created attachment 50245 Patch 198069 2 vestbo 2010-03-10 06:33:46 -0800 Please follow the QtWebKit bug reporting guidelines when reporting bugs. See http://trac.webkit.org/wiki/QtWebKitBugs Specifically: - The 'QtWebKit' component should only be used for bugs/features in the public QtWebKit API layer, not to signify that the bug is specific to the Qt port of WebKit http://trac.webkit.org/wiki/QtWebKitBugs#Component - Add the keyword 'Qt' to signal that it's a Qt-related bug http://trac.webkit.org/wiki/QtWebKitBugs#Keywords 198240 3 robert 2010-03-10 11:29:31 -0800 Landed as http://trac.webkit.org/changeset/55791. 199123 4 kenneth 2010-03-12 10:28:23 -0800 void WebViewGraphicsBased::setFrameRateMeasurementEnabled(bool enabled) { - if (m_measureFps = enabled) { + if (m_measureFps == enabled) { m_lastConsultTime = m_startTime = QTime::currentTime(); m_updateTimer->start(); } else This patch is wrong and broke the feature of the launcher. It attributes enabled to m_messureFpt and then does the if check. This is the same as m_measureFps = enabled; if (m_measureFps)... Please revert this patch. 199182 5 50624 robert 2010-03-12 13:03:16 -0800 Created attachment 50624 Updated Patch Patch was incorrect as Kenneth pointed out. Make it more obvious that it's already right! 199334 6 50245 abarth 2010-03-13 01:49:14 -0800 Comment on attachment 50245 Patch Looks like this patch is obsolete. 199355 7 robert 2010-03-13 03:00:29 -0800 Manually committed as: http://trac.webkit.org/changeset/55961 50245 2010-03-08 14:04:36 -0800 2010-03-13 01:49:14 -0800 Patch 0001-2010-03-07-Robert-Hogan-robert-webkit.org.patch text/plain 2067 robert RnJvbSAxNWNmZGZmODFlODRhODZkZTUwODQ5MDVkMGRmNWQyY2EyZmU1NTU3IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSb2JlcnQgSG9nYW4gPHJvYmVydEB3ZWJraXQub3JnPgpEYXRl OiBTdW4sIDcgTWFyIDIwMTAgMTI6NDQ6NDQgKzAwMDAKU3ViamVjdDogW1BBVENIXSAyMDEwLTAz LTA3ICBSb2JlcnQgSG9nYW4gIDxyb2JlcnRAd2Via2l0Lm9yZz4KCiAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIFF0TGF1bmNoZXI6IEZpeCB0eXBvIGluIGNvbmRp dGlvbmFsIHN0YXRlbWVudCBpbgogICAgICAgICAgICAgICAgICAgIFdlYlZpZXdHcmFwaGljc0Jh c2VkOjpzZXRGcmFtZVJhdGVNZWFzdXJlbWVudEVuYWJsZWQuCgogICAgICAgIFJldmlld2VkIGJ5 OgoKICAgICAgICAnPScgc2hvdWxkIGJlICc9PSchCgogICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNTg3NwoKICAgICAgICAqIFF0TGF1bmNoZXIvd2Vidmll dy5jcHA6CiAgICAgICAgKFdlYlZpZXdHcmFwaGljc0Jhc2VkOjpzZXRGcmFtZVJhdGVNZWFzdXJl bWVudEVuYWJsZWQpOgotLS0KIFdlYktpdFRvb2xzL0NoYW5nZUxvZyAgICAgICAgICAgICAgfCAg IDE2ICsrKysrKysrKysrKysrKysKIFdlYktpdFRvb2xzL1F0TGF1bmNoZXIvd2Vidmlldy5jcHAg fCAgICAyICstCiAyIGZpbGVzIGNoYW5nZWQsIDE3IGluc2VydGlvbnMoKyksIDEgZGVsZXRpb25z KC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hh bmdlTG9nCmluZGV4IDZlZmJkNzIuLmIwMjBiMjcgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0No YW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAx MC0wMy0wOCAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUXRMYXVuY2hlcjogRml4IHR5cG8g aW4gY29uZGl0aW9uYWwgc3RhdGVtZW50IGluCisgICAgICAgICAgICAgICAgICAgIFdlYlZpZXdH cmFwaGljc0Jhc2VkOjpzZXRGcmFtZVJhdGVNZWFzdXJlbWVudEVuYWJsZWQuCisKKyAgICAgICAg UmV2aWV3ZWQgYnk6CisgICAgICAgIAorICAgICAgICAnPScgc2hvdWxkIGJlICc9PSchCisKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTM1ODc3CisKKyAg ICAgICAgKiBRdExhdW5jaGVyL3dlYnZpZXcuY3BwOgorICAgICAgICAoV2ViVmlld0dyYXBoaWNz QmFzZWQ6OnNldEZyYW1lUmF0ZU1lYXN1cmVtZW50RW5hYmxlZCk6CisKIDIwMTAtMDMtMDggIEJy YWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoYnV0IHN1Z2dlc3RlZCBieSBTdGV2ZSBGYWxrZW5idXJnIGFuZCBmaXhpbmcgYSBib25l aGVhZGVkIG1pc3Rha2Ugb24gbXkgcGFydCBsYXN0IHdlZWspCmRpZmYgLS1naXQgYS9XZWJLaXRU b29scy9RdExhdW5jaGVyL3dlYnZpZXcuY3BwIGIvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci93ZWJ2 aWV3LmNwcAppbmRleCA5MjUyYzg5Li5iYTFjOWI4IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9R dExhdW5jaGVyL3dlYnZpZXcuY3BwCisrKyBiL1dlYktpdFRvb2xzL1F0TGF1bmNoZXIvd2Vidmll dy5jcHAKQEAgLTg3LDcgKzg3LDcgQEAgdm9pZCBXZWJWaWV3R3JhcGhpY3NCYXNlZDo6cmVzaXpl RXZlbnQoUVJlc2l6ZUV2ZW50KiBldmVudCkKIAogdm9pZCBXZWJWaWV3R3JhcGhpY3NCYXNlZDo6 c2V0RnJhbWVSYXRlTWVhc3VyZW1lbnRFbmFibGVkKGJvb2wgZW5hYmxlZCkKIHsKLSAgICBpZiAo bV9tZWFzdXJlRnBzID0gZW5hYmxlZCkgeworICAgIGlmIChtX21lYXN1cmVGcHMgPT0gZW5hYmxl ZCkgewogICAgICAgICBtX2xhc3RDb25zdWx0VGltZSA9IG1fc3RhcnRUaW1lID0gUVRpbWU6OmN1 cnJlbnRUaW1lKCk7CiAgICAgICAgIG1fdXBkYXRlVGltZXItPnN0YXJ0KCk7CiAgICAgfSBlbHNl IAotLSAKMS42LjMuMwoK 50624 2010-03-12 13:03:16 -0800 2010-03-13 01:49:29 -0800 Updated Patch 0001-2010-03-12-Robert-Hogan-robert-webkit.org.patch text/plain 1817 robert RnJvbSBkMmRkZTIzNWRlMWIwNmJjM2VkNTg4Yjc3OWI4MmI1MDE2M2I3Y2VmIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBSb2JlcnQgSG9nYW4gPHJvYmVydEB3ZWJraXQub3JnPgpEYXRl OiBGcmksIDEyIE1hciAyMDEwIDIwOjU5OjE4ICswMDAwClN1YmplY3Q6IFtQQVRDSF0gMjAxMC0w My0xMiAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+CgogICAgICAgIFJ1YmJlci1z dGFtcGVkIGJ5IEtlbm5ldGggUm9oZGUgQ2hyaXN0aWFuc2VuLgoKICAgICAgICBBbWVuZCBpbmNv cnJlY3QgdHlwbyBwYXRjaCBmb3IgUXRMYXVuY2hlcgoKICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU4NzcKCiAgICAgICAgKiBRdExhdW5jaGVyL3dlYnZp ZXcuY3BwOgogICAgICAgIChXZWJWaWV3R3JhcGhpY3NCYXNlZDo6c2V0RnJhbWVSYXRlTWVhc3Vy ZW1lbnRFbmFibGVkKToKLS0tCiBXZWJLaXRUb29scy9DaGFuZ2VMb2cgICAgICAgICAgICAgIHwg ICAxMSArKysrKysrKysrKwogV2ViS2l0VG9vbHMvUXRMYXVuY2hlci93ZWJ2aWV3LmNwcCB8ICAg IDMgKystCiAyIGZpbGVzIGNoYW5nZWQsIDEzIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdl TG9nCmluZGV4IGZiNWRhNzkuLjM2OTMxMDIgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5n ZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0w My0xMiAgUm9iZXJ0IEhvZ2FuICA8cm9iZXJ0QHdlYmtpdC5vcmc+CisKKyAgICAgICAgUnViYmVy LXN0YW1wZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCisKKyAgICAgICAgQW1lbmQg aW5jb3JyZWN0IHR5cG8gcGF0Y2ggZm9yIFF0TGF1bmNoZXIKKworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzU4NzcKKworICAgICAgICAqIFF0TGF1bmNo ZXIvd2Vidmlldy5jcHA6CisgICAgICAgIChXZWJWaWV3R3JhcGhpY3NCYXNlZDo6c2V0RnJhbWVS YXRlTWVhc3VyZW1lbnRFbmFibGVkKToKKwogMjAxMC0wMy0xMiAgR3VzdGF2byBOb3JvbmhhIFNp bHZhICA8Z3VzdGF2by5ub3JvbmhhQGNvbGxhYm9yYS5jby51az4KIAogICAgICAgICBGaXggY3Jp dGljYWwgYmVpbmcgcHJpbnRlZCB0byBzdGRlcnIgb24gZXZlcnkgdGVzdC4gVGhpcyBpcwpkaWZm IC0tZ2l0IGEvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci93ZWJ2aWV3LmNwcCBiL1dlYktpdFRvb2xz L1F0TGF1bmNoZXIvd2Vidmlldy5jcHAKaW5kZXggYmExYzliOC4uZGMyZmE3YiAxMDA2NDQKLS0t IGEvV2ViS2l0VG9vbHMvUXRMYXVuY2hlci93ZWJ2aWV3LmNwcAorKysgYi9XZWJLaXRUb29scy9R dExhdW5jaGVyL3dlYnZpZXcuY3BwCkBAIC04Nyw3ICs4Nyw4IEBAIHZvaWQgV2ViVmlld0dyYXBo aWNzQmFzZWQ6OnJlc2l6ZUV2ZW50KFFSZXNpemVFdmVudCogZXZlbnQpCiAKIHZvaWQgV2ViVmll d0dyYXBoaWNzQmFzZWQ6OnNldEZyYW1lUmF0ZU1lYXN1cmVtZW50RW5hYmxlZChib29sIGVuYWJs ZWQpCiB7Ci0gICAgaWYgKG1fbWVhc3VyZUZwcyA9PSBlbmFibGVkKSB7CisgICAgbV9tZWFzdXJl RnBzID0gZW5hYmxlZDsKKyAgICBpZiAobV9tZWFzdXJlRnBzKSB7CiAgICAgICAgIG1fbGFzdENv bnN1bHRUaW1lID0gbV9zdGFydFRpbWUgPSBRVGltZTo6Y3VycmVudFRpbWUoKTsKICAgICAgICAg bV91cGRhdGVUaW1lci0+c3RhcnQoKTsKICAgICB9IGVsc2UgCi0tIAoxLjYuMy4zCgo=