REGRESSION: svg/custom/use-instanceRoot-event-listeners.xhtml & svg/custom/pointer...

https://bugs.webkit.org/show_bug.cgi?id=76254

Reviewed by Anders Carlsson.

Source/WebCore:

* css/CSSFontSelector.cpp:
(WebCore::CSSFontSelector::beginLoadTimerFired): Added a call to
CachedResourceLoader::loadDone() after decrementing the request count. This allows the
frame loader to see that the request count is zero and dispatch didFinishLoad.

LayoutTests:

* svg/custom/pointer-events-invalid-fill.svg: Force layout before sending a mouse event.
Otherwise, the WebHTMLView may have zero size, causing the hit test in
-[EventSendingController mouseMoveToX:Y:] to yield the clip view and the event to go nowhere.
* svg/custom/resources/use-instanceRoot-event-listeners.js: Ditto.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 5439614..6eabcb3 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2012-01-13  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION: svg/custom/use-instanceRoot-event-listeners.xhtml & svg/custom/pointer-events-invalid-fill.svg broken on the Bots
+        https://bugs.webkit.org/show_bug.cgi?id=76254
+
+        Reviewed by Anders Carlsson.
+
+        * svg/custom/pointer-events-invalid-fill.svg: Force layout before sending a mouse event.
+        Otherwise, the WebHTMLView may have zero size, causing the hit test in
+        -[EventSendingController mouseMoveToX:Y:] to yield the clip view and the event to go nowhere.
+        * svg/custom/resources/use-instanceRoot-event-listeners.js: Ditto.
+
 2012-01-13  Nate Chapin  <japhet@chromium.org>
 
         http/tests/multipart/invalid-image-data.html should no longer

diff --git a/LayoutTests/svg/custom/pointer-events-invalid-fill.svg b/LayoutTests/svg/custom/pointer-events-invalid-fill.svg
index c805d7a..2dac01f 100644 (file)
--- a/LayoutTests/svg/custom/pointer-events-invalid-fill.svg
+++ b/LayoutTests/svg/custom/pointer-events-invalid-fill.svg
@@ -64,6 +64,7 @@
       }
       function runTest() {
         if (window.eventSender) {
+          document.documentElement.offsetLeft;
           eventSender.mouseMoveTo(30, 100);
         }
       }

diff --git a/LayoutTests/svg/custom/resources/use-instanceRoot-event-listeners.js b/LayoutTests/svg/custom/resources/use-instanceRoot-event-listeners.js
index 08b204a..7ff59e4 100644 (file)
--- a/LayoutTests/svg/custom/resources/use-instanceRoot-event-listeners.js
+++ b/LayoutTests/svg/custom/resources/use-instanceRoot-event-listeners.js
@@ -171,6 +171,7 @@ function driveTests()
 
 // Start tests
 if (window.eventSender) {
+    document.documentElement.offsetLeft;
     eventSender.mouseMoveTo(115, 55);
     driveTests();
 } else

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 68ef476..16eabe6 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2012-01-13  Dan Bernstein  <mitz@apple.com>
+
+        REGRESSION: svg/custom/use-instanceRoot-event-listeners.xhtml & svg/custom/pointer-events-invalid-fill.svg broken on the Bots
+        https://bugs.webkit.org/show_bug.cgi?id=76254
+
+        Reviewed by Anders Carlsson.
+
+        * css/CSSFontSelector.cpp:
+        (WebCore::CSSFontSelector::beginLoadTimerFired): Added a call to
+        CachedResourceLoader::loadDone() after decrementing the request count. This allows the
+        frame loader to see that the request count is zero and dispatch didFinishLoad. 
+
 2012-01-13  Jer Noble  <jer.noble@apple.com>
 
         WebAudio: Optimize calculateNormalizationScale().

diff --git a/Source/WebCore/css/CSSFontSelector.cpp b/Source/WebCore/css/CSSFontSelector.cpp
index 4c90ae3..58a551f 100644 (file)
--- a/Source/WebCore/css/CSSFontSelector.cpp
+++ b/Source/WebCore/css/CSSFontSelector.cpp
@@ -615,6 +615,8 @@ void CSSFontSelector::beginLoadTimerFired(Timer<WebCore::CSSFontSelector>*)
         // Balances incrementRequestCount() in beginLoadingFontSoon().
         cachedResourceLoader->decrementRequestCount(fontsToBeginLoading[i].get());
     }
+    // Ensure that if the request count reaches zero, the frame loader will know about it.
+    cachedResourceLoader->loadDone();
 }
 
 }