Unreviewed, rolling out r101337.
authortkent@chromium.org <tkent@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Dec 2011 22:17:27 +0000 (22:17 +0000)
committertkent@chromium.org <tkent@chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 Dec 2011 22:17:27 +0000 (22:17 +0000)
http://trac.webkit.org/changeset/101337
https://bugs.webkit.org/show_bug.cgi?id=73189

It's a wrong way to fix the problem

Source/WebKit/chromium:

* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::popupOpened):

LayoutTests:

* fast/forms/select-popup-crash-expected.txt: Removed.
* fast/forms/select-popup-crash.html: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@101852 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/fast/forms/select-popup-crash-expected.txt [deleted file]
LayoutTests/fast/forms/select-popup-crash.html [deleted file]
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/src/WebViewImpl.cpp

index 911acaa..ae05fb2 100644 (file)
@@ -1,3 +1,14 @@
+2011-12-02  Kent Tamura  <tkent@chromium.org>
+
+        Unreviewed, rolling out r101337.
+        http://trac.webkit.org/changeset/101337
+        https://bugs.webkit.org/show_bug.cgi?id=73189
+
+        It's a wrong way to fix the problem
+
+        * fast/forms/select-popup-crash-expected.txt: Removed.
+        * fast/forms/select-popup-crash.html: Removed.
+
 2011-12-02  Kausalya Madhusudhanan  <kmadhusu@chromium.org>
 
         Added helper method to identify whether the page has custom page size style.
diff --git a/LayoutTests/fast/forms/select-popup-crash-expected.txt b/LayoutTests/fast/forms/select-popup-crash-expected.txt
deleted file mode 100644 (file)
index f1a0edd..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-<select> test for opening two popup menus.
-
-PASS if the test didn't crash.
-
-
diff --git a/LayoutTests/fast/forms/select-popup-crash.html b/LayoutTests/fast/forms/select-popup-crash.html
deleted file mode 100644 (file)
index 7560850..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<head>
-</head>
-<body>
-<p id="description">&lt;select> test for opening two popup menus.</p>
-<div id="console"></div>
-<p id="debug">PASS if the test didn't crash.</p>
-<script>
-    if (window.layoutTestController)
-        layoutTestController.dumpAsText();
-
-    var parent = document.createElement('div');
-    parent.innerHTML = '<select id="sl1">'
-        + '<option>one</option>'
-        + '<option>two</option>'
-        + '<option>three</option>'
-        + '<option>four</option>'
-        + '<option>five</option>'
-        + '<option>six</option>'
-        + '<option>seven</option>'
-        + '<option>eight</option>'
-        + '<option>nine</option>'
-        + '<option>ten</option>'
-        + '<option>eleven</option>'
-        + '<option>twelve</option>'
-        + '<option>thirteen</option>'
-        + '<option>fourteen</option>'
-        + '<option>fifteen</option>'
-        + '<option>sixteen</option>'
-        + '<option>seventeen</option>'
-        + '</select>'
-        + '<select id="sl2">'
-        + '<option>one</option>'
-        + '<option>two</option>'
-        + '<option>three</option>'
-        + '</select>';
-    document.body.appendChild(parent);
-
-    function mouseDownOnSelect(selId)
-    {
-        var sl = document.getElementById(selId);
-        var event = document.createEvent("MouseEvent");
-        event.initMouseEvent("mousedown", true, true, document.defaultView, 1, sl.offsetLeft, sl.offsetTop, sl.offsetLeft, sl.offsetTop, false, false, false, false, 0, document);
-        sl.dispatchEvent(event);
-    }
-
-    mouseDownOnSelect("sl1");
-    mouseDownOnSelect("sl2");
-
-</script>
-</body>
-</html>
index 71e144e..f6e40b4 100644 (file)
@@ -1,3 +1,14 @@
+2011-12-02  Kent Tamura  <tkent@chromium.org>
+
+        Unreviewed, rolling out r101337.
+        http://trac.webkit.org/changeset/101337
+        https://bugs.webkit.org/show_bug.cgi?id=73189
+
+        It's a wrong way to fix the problem
+
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::popupOpened):
+
 2011-12-02  Kausalya Madhusudhanan  <kmadhusu@chromium.org>
 
         Added helper method to identify whether the page has custom page size style.
index a2df333..a8bc717 100644 (file)
@@ -968,8 +968,8 @@ bool WebViewImpl::propagateScroll(ScrollDirection scrollDirection,
 void  WebViewImpl::popupOpened(WebCore::PopupContainer* popupContainer)
 {
     if (popupContainer->popupType() == WebCore::PopupContainer::Select) {
-        if (!m_selectPopup)
-            m_selectPopup = popupContainer;
+        ASSERT(!m_selectPopup);
+        m_selectPopup = popupContainer;
     }
 }