1
=== added file 'qt/tests/qmltests/crash/tst_bug1427828.html'
2
--- qt/tests/qmltests/crash/tst_bug1427828.html	1970-01-01 00:00:00 +0000
3
+++ qt/tests/qmltests/crash/tst_bug1427828.html	2015-03-03 20:04:33 +0000
4
@@ -0,0 +1,5 @@
5
1
<html>
6
2
<body>
7
3
  <iframe src="about:blank"></iframe>
8
4
</body>
9
5
</html>
10
0
6
11
=== added file 'qt/tests/qmltests/crash/tst_bug1427828.qml'
12
--- qt/tests/qmltests/crash/tst_bug1427828.qml	1970-01-01 00:00:00 +0000
13
+++ qt/tests/qmltests/crash/tst_bug1427828.qml	2015-03-03 20:04:33 +0000
14
@@ -0,0 +1,33 @@
15
1
import QtQuick 2.0
16
2
import QtTest 1.0
17
3
import com.canonical.Oxide 1.0
18
4
import com.canonical.Oxide.Testing 1.0
19
5
20
6
TestWebView {
21
7
  id: webView
22
8
  focus: true
23
9
  width: 200
24
10
  height: 200
25
11
26
12
  TestCase {
27
13
    id: test
28
14
    name: "bug1427828"
29
15
    when: windowShown
30
16
31
17
    function test_bug1427828() {
32
18
      webView.url = "http://testsuite/tst_bug1427828.html";
33
19
      verify(webView.waitForLoadSucceeded(),
34
20
             "Timed out waiting for successful load");
35
21
36
22
      webView.rootFrame.childFrames[0].sendMessageNoReply(
37
23
        "oxide://testutils/", "DONT-RESPOND", {});
38
24
39
25
      webView.rootFrame.sendMessageNoReply(
40
26
        "oxide://testutils/", "DONT-RESPOND", {});
41
27
42
28
      webView.url = "about:blank";
43
29
      verify(webView.waitForLoadSucceeded(),
44
30
             "Timed out waiting for successful load");
45
31
    }
46
32
  }
47
33
}
48
0
34
49
=== modified file 'shared/browser/oxide_web_frame.cc'
50
--- shared/browser/oxide_web_frame.cc	2015-01-16 22:46:17 +0000
51
+++ shared/browser/oxide_web_frame.cc	2015-03-03 20:04:33 +0000
52
@@ -218,7 +218,10 @@
53
218
      std::find(current_script_message_requests_.begin(),
218
      std::find(current_script_message_requests_.begin(),
54
219
                current_script_message_requests_.end(),
219
                current_script_message_requests_.end(),
55
220
                req);
220
                req);
57
221
  DCHECK(it != current_script_message_requests_.end());
221
  if (it == current_script_message_requests_.end()) {
58
222
    // can happen for non "persisted" requests e.g. SendMessageNoReply
59
223
    return;
60
224
  }
61
222
225
62
223
  if (!destroyed_) {
226
  if (!destroyed_) {
63
224
    current_script_message_requests_.erase(it);
227
    current_script_message_requests_.erase(it);
Reviewer	Review Type	Date Requested	Status
Chris Coulson		2015-03-03	Approve on 2015-03-03
Review via email: mp+251648@code.launchpad.net