Title: [88585] trunk/Source/WebKit2
- Revision
- 88585
- Author
- [email protected]
- Date
- 2011-06-10 18:18:43 -0700 (Fri, 10 Jun 2011)
Log Message
2011-06-10 Sam Weinig <[email protected]>
Reviewed by Anders Carlsson.
Unresponsive cursor is shown when displaying a modal dialog
Part of <rdar://problem/9581492>
https://bugs.webkit.org/show_bug.cgi?id=62494
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::runModal):
* UIProcess/WebPageProxy.h:
Stop the responsiveness timer when calling out to show a modal dialog.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (88584 => 88585)
--- trunk/Source/WebKit2/ChangeLog 2011-06-11 01:08:09 UTC (rev 88584)
+++ trunk/Source/WebKit2/ChangeLog 2011-06-11 01:18:43 UTC (rev 88585)
@@ -1,3 +1,16 @@
+2011-06-10 Sam Weinig <[email protected]>
+
+ Reviewed by Anders Carlsson.
+
+ Unresponsive cursor is shown when displaying a modal dialog
+ Part of <rdar://problem/9581492>
+ https://bugs.webkit.org/show_bug.cgi?id=62494
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::runModal):
+ * UIProcess/WebPageProxy.h:
+ Stop the responsiveness timer when calling out to show a modal dialog.
+
2011-06-10 Tony Chang <[email protected]>
Reviewed by Ojan Vafai.
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (88584 => 88585)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-06-11 01:08:09 UTC (rev 88584)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2011-06-11 01:18:43 UTC (rev 88585)
@@ -3067,6 +3067,14 @@
m_uiClient.drawFooter(this, frame, rect);
}
+void WebPageProxy::runModal()
+{
+ // Since runModal() can (and probably will) spin a nested run loop we need to turn off the responsiveness timer.
+ process()->responsivenessTimer()->stop();
+
+ m_uiClient.runModal(this);
+}
+
void WebPageProxy::didCompleteRubberBandForMainFrame(const IntSize& initialOverhang)
{
m_uiClient.didCompleteRubberBandForMainFrame(this, initialOverhang);
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (88584 => 88585)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2011-06-11 01:08:09 UTC (rev 88584)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2011-06-11 01:18:43 UTC (rev 88585)
@@ -621,7 +621,7 @@
void printFrame(uint64_t frameID);
void exceededDatabaseQuota(uint64_t frameID, const String& originIdentifier, const String& databaseName, const String& displayName, uint64_t currentQuota, uint64_t currentOriginUsage, uint64_t currentDatabaseUsage, uint64_t expectedUsage, uint64_t& newQuota);
void requestGeolocationPermissionForFrame(uint64_t geolocationID, uint64_t frameID, String originIdentifier);
- void runModal() { m_uiClient.runModal(this); }
+ void runModal();
void didCompleteRubberBandForMainFrame(const WebCore::IntSize&);
void notifyScrollerThumbIsVisibleInRect(const WebCore::IntRect&);
void didChangeScrollbarsForMainFrame(bool hasHorizontalScrollbar, bool hasVerticalScrollbar);
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
