Title: [90518] trunk
- Revision
- 90518
- Author
- [email protected]
- Date
- 2011-07-06 17:09:35 -0700 (Wed, 06 Jul 2011)
Log Message
2011-07-06 Johnny Ding <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=63857
Remove some crash expectation after implementing "createPopupMenu"
Reviewed by Tony Chang.
* platform/chromium/test_expectations.txt:
2011-07-06 Johnny Ding <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=63857
Check WebWidgetClient before calling it to close widget.
Reviewed by Tony Chang.
* src/WebPopupMenuImpl.cpp:
(WebKit::WebPopupMenuImpl::popupClosed):
2011-07-06 Johnny Ding <[email protected]>
https://bugs.webkit.org/show_bug.cgi?id=63857
Implement createPopupMenu for Chromium DRT.
Reviewed by Tony Chang.
* DumpRenderTree/chromium/WebViewHost.cpp:
(WebViewHost::createPopupMenu):
(WebViewHost::~WebViewHost):
* DumpRenderTree/chromium/WebViewHost.h:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (90517 => 90518)
--- trunk/LayoutTests/ChangeLog 2011-07-06 23:55:06 UTC (rev 90517)
+++ trunk/LayoutTests/ChangeLog 2011-07-07 00:09:35 UTC (rev 90518)
@@ -1,3 +1,12 @@
+2011-07-06 Johnny Ding <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=63857
+ Remove some crash expectation after implementing "createPopupMenu"
+
+ Reviewed by Tony Chang.
+
+ * platform/chromium/test_expectations.txt:
+
2011-07-06 Mihai Parparita <[email protected]>
Update Chromium GPU expectations with downstream changes
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (90517 => 90518)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-07-06 23:55:06 UTC (rev 90517)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2011-07-07 00:09:35 UTC (rev 90518)
@@ -2564,13 +2564,12 @@
BUG_DRT MAC : fast/dom/Window/alert-undefined.html = TIMEOUT PASS
BUG_DRT MAC : fast/dom/beforeload/script-before-load-dynamic.html = TIMEOUT PASS
BUG_DRT : fast/dynamic/window-resize-scrollbars-test.html = IMAGE+TEXT
-BUG_DRT LINUX : fast/events/select-onchange-crash.html = CRASH
BUG_DRT DEBUG : fast/frames/calculate-round.html = TIMEOUT PASS
BUG_DRT BUGCR43890 WIN DEBUG SLOW : fast/forms/implicit-submission.html = PASS TEXT
BUG_DRT BUGCR43890 LINUX : fast/forms/implicit-submission.html = CRASH
BUG_DRT BUGCR43890 MAC DEBUG SLOW : fast/forms/implicit-submission.html = PASS TEXT
-BUG_DRT BUGCR21141 LINUX : fast/forms/select-double-onchange.html = CRASH FAIL
-BUG_DRT BUGCR21141 LINUX : fast/forms/select-script-onchange.html = CRASH FAIL
+BUG_DRT BUGCR21141 LINUX : fast/forms/select-double-onchange.html = FAIL
+BUG_DRT BUGCR21141 LINUX : fast/forms/select-script-onchange.html = FAIL
BUG_DRT MAC : fast/images/extra-image-in-image-document.html = TIMEOUT PASS
BUG_DRT MAC : fast/loader/font-face-empty.html = TIMEOUT PASS
BUG_DRT MAC : fast/loader/for-window-event-onload-scripts.html = TIMEOUT PASS
Modified: trunk/Source/WebKit/chromium/ChangeLog (90517 => 90518)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-07-06 23:55:06 UTC (rev 90517)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-07-07 00:09:35 UTC (rev 90518)
@@ -1,3 +1,13 @@
+2011-07-06 Johnny Ding <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=63857
+ Check WebWidgetClient before calling it to close widget.
+
+ Reviewed by Tony Chang.
+
+ * src/WebPopupMenuImpl.cpp:
+ (WebKit::WebPopupMenuImpl::popupClosed):
+
2011-07-06 Adrienne Walker <[email protected]>
[chromium] Add compositor texture manager soft limits and lost focus reclaiming
Modified: trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp (90517 => 90518)
--- trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp 2011-07-06 23:55:06 UTC (rev 90517)
+++ trunk/Source/WebKit/chromium/src/WebPopupMenuImpl.cpp 2011-07-07 00:09:35 UTC (rev 90518)
@@ -375,7 +375,8 @@
m_widget->setClient(0);
m_widget = 0;
}
- m_client->closeWidgetSoon();
+ if (m_client)
+ m_client->closeWidgetSoon();
}
} // namespace WebKit
Modified: trunk/Tools/ChangeLog (90517 => 90518)
--- trunk/Tools/ChangeLog 2011-07-06 23:55:06 UTC (rev 90517)
+++ trunk/Tools/ChangeLog 2011-07-07 00:09:35 UTC (rev 90518)
@@ -1,3 +1,15 @@
+2011-07-06 Johnny Ding <[email protected]>
+
+ https://bugs.webkit.org/show_bug.cgi?id=63857
+ Implement createPopupMenu for Chromium DRT.
+
+ Reviewed by Tony Chang.
+
+ * DumpRenderTree/chromium/WebViewHost.cpp:
+ (WebViewHost::createPopupMenu):
+ (WebViewHost::~WebViewHost):
+ * DumpRenderTree/chromium/WebViewHost.h:
+
2011-07-06 Mihai Parparita <[email protected]>
Unreviewed, rolling out r90503.
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp (90517 => 90518)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2011-07-06 23:55:06 UTC (rev 90517)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp 2011-07-07 00:09:35 UTC (rev 90518)
@@ -46,6 +46,8 @@
#include "WebGeolocationClientMock.h"
#include "WebHistoryItem.h"
#include "WebNode.h"
+#include "WebPopupMenu.h"
+#include "WebPopupType.h"
#include "WebRange.h"
#include "WebRect.h"
#include "WebScreenInfo.h"
@@ -236,13 +238,23 @@
return m_shell->createNewWindow(WebURL())->webView();
}
-WebWidget* WebViewHost::createPopupMenu(WebPopupType)
+WebWidget* WebViewHost::createPopupMenu(WebPopupType type)
{
+ switch (type) {
+ case WebKit::WebPopupTypeNone:
+ break;
+ case WebKit::WebPopupTypeSelect:
+ case WebKit::WebPopupTypeSuggestion:
+ m_popupmenus.append(WebPopupMenu::create(0));
+ return m_popupmenus.last();
+ }
return 0;
}
WebWidget* WebViewHost::createPopupMenu(const WebPopupMenuInfo&)
{
+ // Do not use this method. It's been replaced by createExternalPopupMenu.
+ ASSERT_NOT_REACHED();
return 0;
}
@@ -1154,8 +1166,11 @@
loadURLForFrame(GURL("about:blank"), WebString());
}
+ for (Vector<WebKit::WebWidget*>::iterator it = m_popupmenus.begin();
+ it < m_popupmenus.end(); ++it)
+ (*it)->close();
+
webWidget()->close();
-
if (m_inModalLoop)
webkit_support::QuitMessageLoop();
}
Modified: trunk/Tools/DumpRenderTree/chromium/WebViewHost.h (90517 => 90518)
--- trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2011-07-06 23:55:06 UTC (rev 90517)
+++ trunk/Tools/DumpRenderTree/chromium/WebViewHost.h 2011-07-07 00:09:35 UTC (rev 90518)
@@ -350,6 +350,7 @@
WebKit::WebTextCheckingCompletion* m_lastRequestedTextCheckingCompletion;
TaskList m_taskList;
+ Vector<WebKit::WebWidget*> m_popupmenus;
};
#endif // WebViewHost_h
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
