Changeset 12786 in webkit

Timestamp:

Feb 13, 2006, 3:13:47 PM (20 years ago)

Author:

hyatt

Message:

Fix Win32 WebCore bustage.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.vcproj/WebCore/WebCore.vcproj (modified) (9 diffs)
• platform/Timer.cpp (modified) (3 diffs)
• platform/image-decoders/png/PNGImageDecoder.cpp (modified) (1 diff)
• platform/win/SharedTimerWin.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-02-13  Dave Hyatt <hyatt@apple.com>
+
+        Fix Win32 bustage in WebCore.
+
+        Reviewed by darin
+
+        * WebCore.vcproj/WebCore/WebCore.vcproj:
+        * platform/Timer.cpp:
+        (WebCore::operator==):
+        (WebCore::operator!=):
+        (WebCore::TimerBase::heapPop):
+
+        HUGE_VAL can be used on both Windows and Mac, so replace 1e500 with
+        that.
+
+        Add == and != operators for the TimerHeapIterator.
+
+        * platform/image-decoders/png/PNGImageDecoder.cpp:
+        (WebCore::PNGImageDecoder::rowAvailable):
+
+        Fix my bustage in the PNG decoder where I left off a stray
+        parenthesis.
+
+        * platform/win/SharedTimerWin.cpp:
+        (WebCore::timerFired):
+        (WebCore::setSharedTimerFireTime):
+        (WebCore::stopSharedTimer):
+
+        KillTimer should take 2 arguments.  Add some missing includes.
+
 2006-02-12  Alexander Kellett  <lypanov@kde.org>
 

trunk/WebCore/WebCore.vcproj/WebCore/WebCore.vcproj

@@ -1348 +1348 @@
                         </File>
                         <File
-                                RelativePath="..\..\page\FrameTreeNode.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\page\FrameTreeNode.h"
+                                RelativePath="..\..\page\FrameTree.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\page\FrameTree.h"
                                 >
                         </File>
@@ -1662 +1662 @@
                         </File>
                         <File
+                                RelativePath="..\..\platform\SharedTimer.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\platform\String.cpp"
                                 >
@@ -1678 +1682 @@
                         </File>
                         <File
+                                RelativePath="..\..\platform\Timer.cpp"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\platform\Timer.h"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\platform\Timer.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\platform\SharedTimer.h"
                                 >
                         </File>
@@ -1701 +1701 @@
                                 >
                                 <File
+                                        RelativePath="..\..\platform\win\SharedTimerWin.cpp"
+                                        >
+                                </File>
+                                <File
                                         RelativePath="..\..\platform\win\SystemTimeWin.cpp"
-                                        >
-                                </File>
-                                <File
-                                        RelativePath="..\..\platform\win\SharedTimerWin.cpp"
                                         >
                                 </File>
@@ -2904 +2904 @@
                         >
                         <File
+                                RelativePath="..\..\dom\CDATASectionImpl.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\dom\CDATASectionImpl.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\dom\CharacterDataImpl.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\dom\CharacterDataImpl.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\dom\ChildNodeListImpl.cpp"
                                 >
@@ -2912 +2928 @@
                         </File>
                         <File
+                                RelativePath="..\..\dom\CommentImpl.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\dom\CommentImpl.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\dom\ContainerNodeImpl.cpp"
                                 >
@@ -3008 +3032 @@
                         </File>
                         <File
-                                RelativePath="..\..\dom\dom_textimpl.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\dom\dom_textimpl.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\..\dom\dom_xmlimpl.cpp"
                                 >
@@ -3032 +3048 @@
                         </File>
                         <File
+                                RelativePath="..\..\dom\EditingTextImpl.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\dom\EditingTextImpl.h"
+                                >
+                        </File>
+                        <File
                                 RelativePath="..\..\dom\EventNames.cpp"
                                 >
@@ -3065 +3089 @@
                         <File
                                 RelativePath="..\..\dom\NodeListImpl.h"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\dom\TextImpl.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\dom\TextImpl.h"
                                 >
                         </File>

trunk/WebCore/platform/Timer.cpp

@@ -30 +30 @@
 #include "SystemTime.h"
 #include <algorithm>
+#include <math.h>
 #include <kxmlcore/Assertions.h>
 #include <kxmlcore/HashSet.h>
@@ -131 +132 @@
 };
 
+inline bool operator==(TimerHeapIterator a, TimerHeapIterator b) { return a.index() == b.index(); }
+inline bool operator!=(TimerHeapIterator a, TimerHeapIterator b) { return a.index() != b.index(); }
 inline bool operator<(TimerHeapIterator a, TimerHeapIterator b) { return a.index() < b.index(); }
 
@@ -254 +257 @@
     // Temporarily force this timer to have the minimum key so we can pop it.
     double fireTime = m_nextFireTime;
-    m_nextFireTime = -1e500;
+    m_nextFireTime = -HUGE_VAL;
     heapDecreaseKey();
     heapPopMin();

trunk/WebCore/platform/image-decoders/png/PNGImageDecoder.cpp

@@ -315 +315 @@
 
         // For PNGs, the frame always fills the entire image.
-        buffer.setRect(IntRect(0, 0, m_size.width(), m_size.height());
+        buffer.setRect(IntRect(0, 0, m_size.width(), m_size.height()));
 
         if (reader()->pngPtr()->interlaced)

trunk/WebCore/platform/win/SharedTimerWin.cpp

@@ -27 +27 @@
 #include "SharedTimer.h"
 
+#include "SystemTime.h"
+#include <kxmlcore/Assertions.h>
 #include <windows.h>
 
@@ -39 +41 @@
 }
 
-static CALLBACK timerFired(HWND, UINT, UINT_PTR, DWORD)
+static void CALLBACK timerFired(HWND, UINT, UINT_PTR, DWORD)
 {
     sharedTimerFiredFunction();
@@ -61 +63 @@
 
     if (timerID)
-        KillTimer(timerID);
+        KillTimer(0, timerID);
     timerID = SetTimer(0, 0, intervalInMS, timerFired);
 }
@@ -68 +70 @@
 {
     if (timerID) {
-        KillTimer(timerID);
+        KillTimer(0, timerID);
         timerID = 0;
     }