Changeset 86179 in webkit

Timestamp:

May 10, 2011 1:26:09 PM (13 years ago)

Author:

beidson@apple.com

Message:

<rdar://problem/9343191> and ​https://bugs.webkit.org/show_bug.cgi?id=60572

Reviewed by Alice Liu.

No new tests - There's no way to reproduce the truly bizarre things Canon does in their app
that would reasonably fit in to our testing infrastructure.

Add a timer to Settings and instead of calling setLoadsImagesAutomaticallyInAllFrames right
away when this pref changes, call it on a 0-delay:

• page/Settings.cpp:

(WebCore::Settings::Settings):
(WebCore::Settings::setLoadsImagesAutomatically):
(WebCore::Settings::loadsImagesAutomaticallyTimerFired):

• page/Settings.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/Settings.cpp (modified) (3 diffs)
• page/Settings.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-10  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Alice Liu.
+
+        <rdar://problem/9343191> and https://bugs.webkit.org/show_bug.cgi?id=60572
+
+        No new tests - There's no way to reproduce the truly bizarre things Canon does in their app
+        that would reasonably fit in to our testing infrastructure.
+
+        Add a timer to Settings and instead of calling setLoadsImagesAutomaticallyInAllFrames right
+        away when this pref changes, call it on a 0-delay:
+        * page/Settings.cpp:
+        (WebCore::Settings::Settings):
+        (WebCore::Settings::setLoadsImagesAutomatically):
+        (WebCore::Settings::loadsImagesAutomaticallyTimerFired):
+        * page/Settings.h:
+
 2011-05-10  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebCore/page/Settings.cpp

@@ -183 +183 @@
     , m_allowDisplayOfInsecureContent(true)
     , m_allowRunningOfInsecureContent(true)
+    , m_loadsImagesAutomaticallyTimer(this, &Settings::loadsImagesAutomaticallyTimerFired)
 {
     // A Frame may not have been created yet, so we initialize the AtomicString 
@@ -282 +283 @@
 {
     m_loadsImagesAutomatically = loadsImagesAutomatically;
-    setLoadsImagesAutomaticallyInAllFrames(m_page);
+    m_loadsImagesAutomaticallyTimer.startOneShot(0);
 }
 
@@ -743 +744 @@
 }
 
+void Settings::loadsImagesAutomaticallyTimerFired(Timer<Settings>*)
+{
+    setLoadsImagesAutomaticallyInAllFrames(m_page);
+}
+
 } // namespace WebCore

trunk/Source/WebCore/page/Settings.h

@@ -31 +31 @@
 #include "FontRenderingMode.h"
 #include "KURL.h"
+#include "Timer.h"
 #include <wtf/text/AtomicString.h>
 
@@ -515 +516 @@
         bool m_allowRunningOfInsecureContent : 1;
 
+        Timer<Settings> m_loadsImagesAutomaticallyTimer;
+        void loadsImagesAutomaticallyTimerFired(Timer<Settings>*);
+
 #if USE(AVFOUNDATION)
         static bool gAVFoundationEnabled;