JavaScriptCore:

        Reviewed by Anders.

        - Fixed Windows build

        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
        * wtf/MathExtras.h: Implement inline versions of these functions
        (nextafter):
        (nextafterf):

WebCore:
        Reviewed by Anders.

        - Fixed Windows build.

        * platform/Color.cpp:
        (WebCore::makeRGBAFromHSLA): Whitespace change
        * platform/win/TemporaryLinkStubs.cpp: Add new method stubs
        (PlatformScrollBar::PlatformScrollBar):
        (PlatformScrollBar::~PlatformScrollBar):
        (PlatformScrollBar::width):
        (PlatformScrollBar::height):
        (PlatformScrollBar::setEnabled):
        (PlatformScrollBar::paint):
        (PlatformScrollBar::setScrollBarValue):
        (PlatformScrollBar::setKnobProportion):
        (PlatformScrollBar::setRect):
        (ScrollBar::ScrollBar):
        (ScrollBar::scroll):
        (ScrollBar::setValue):

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

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index d347e02f6899168c60c1e7d83b0ca631cd8b8bb3..17c1132898199fd1e50202d8a7ee5c13ed0adcca 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,14 @@
+2006-08-03  Adam Roben  <aroben@apple.com>
+
+        Reviewed by Anders.
+
+        - Fixed Windows build
+
+        * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
+        * wtf/MathExtras.h: Implement inline versions of these functions
+        (nextafter):
+        (nextafterf):
+
 2006-08-02  Adam Roben  <aroben@apple.com>
 
         Reviewed by Darin.

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
index 00723b19b8702bf142a4c01c24485c7d84d32098..116a012fbb3e90d195a666a38fe3515b6525b818 100644 (file)
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj
@@ -86,7 +86,7 @@
                        />
                        <Tool
                                Name="VCPostBuildEventTool"
-                               CommandLine="mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\Vector.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\Assertions.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\VectorTraits.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\RefPtr.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\Platform.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\FastMalloc.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;copy /y &quot;$(TargetPath)&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF\WTF.lib&quot;&#x0D;&#x0A;"
+                CommandLine="mkdir 2&gt;NUL &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\Vector.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\Assertions.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\VectorTraits.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\RefPtr.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\Platform.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\FastMalloc.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;xcopy /y &quot;$(ProjectDir)\..\..\..\JavaScriptCore\wtf\MathExtras.h&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF&quot;&#x0D;&#x0A;copy /y &quot;$(TargetPath)&quot; &quot;$(WebKitOutputDir)\$(ConfigurationName)\WTF\WTF.lib&quot;&#x0D;&#x0A;"
                        />
                </Configuration>
                <Configuration
@@ -548,6 +548,10 @@
                                RelativePath="..\..\wtf\HashTraits.h"
                                >
                        </File>
+                       <File
+                               RelativePath="..\..\wtf\MathExtras.h"
+                               >
+                       </File>
                        <File
                                RelativePath="..\..\wtf\PassRefPtr.h"
                                >

diff --git a/JavaScriptCore/wtf/MathExtras.h b/JavaScriptCore/wtf/MathExtras.h
index 0c0bd59bdf7c77789937fca0e1bbf8c7208b36b6..f3264f638b05c71839fccfe28106de6c6cdfa346 100644 (file)
--- a/JavaScriptCore/wtf/MathExtras.h
+++ b/JavaScriptCore/wtf/MathExtras.h
@@ -41,6 +41,9 @@ inline double round(double num) { return num > 0 ? floor(num + 0.5) : ceil(num -
 inline float roundf(float num) { return num > 0 ? floorf(num + 0.5f) : ceilf(num - 0.5f); }
 inline bool signbit(double num) { return _copysign(1.0, num) < 0; }
 
+inline double nextafter(double x, double y) { return _nextafter(x, y); }
+inline float nextafterf(float x, float y) { return x > y ? x - FLT_EPSILON : x + FLT_EPSILON; }
+
 #if COMPILER(MSVC)
 
 // Work around a bug in the Microsoft CRT, where fmod(x, +-infinity) yields NaN instead of x.

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index c14b6e25ce52bfab5998556d63ad411e530c29aa..f1c438101f4f98da76f3cb7335989afda35ccc7f 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2006-08-03  Adam Roben  <aroben@apple.com>
+
+        Reviewed by Anders.
+
+        - Fixed Windows build.
+
+        * platform/Color.cpp:
+        (WebCore::makeRGBAFromHSLA): Whitespace change
+        * platform/win/TemporaryLinkStubs.cpp: Add new method stubs
+        (PlatformScrollBar::PlatformScrollBar):
+        (PlatformScrollBar::~PlatformScrollBar):
+        (PlatformScrollBar::width):
+        (PlatformScrollBar::height):
+        (PlatformScrollBar::setEnabled):
+        (PlatformScrollBar::paint):
+        (PlatformScrollBar::setScrollBarValue):
+        (PlatformScrollBar::setKnobProportion):
+        (PlatformScrollBar::setRect):
+        (ScrollBar::ScrollBar):
+        (ScrollBar::scroll):
+        (ScrollBar::setValue):
+
 2006-08-02  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by mjs

diff --git a/WebCore/platform/Color.cpp b/WebCore/platform/Color.cpp
index 7dddff7ed71c548d859723844d684616d16d73cf..222737b142f7f4bdb78c443e68395cd82a101556 100644 (file)
--- a/WebCore/platform/Color.cpp
+++ b/WebCore/platform/Color.cpp
@@ -30,6 +30,7 @@
 #include "PlatformString.h"
 #include <math.h>
 #include <wtf/Assertions.h>
+#include <wtf/MathExtras.h>
 
 #include "ColorData.c"
 
@@ -70,7 +71,7 @@ double calcHue(double temp1, double temp2, double hueVal)
 RGBA32 makeRGBAFromHSLA(double hue, double saturation, double lightness, double alpha)
 {
     const double scaleFactor = nextafter(256.0, 0.0);
-    
+
     if (!saturation) {
         int greyValue = static_cast<int>(lightness * scaleFactor);
         return makeRGBA(greyValue, greyValue, greyValue, static_cast<int>(alpha * scaleFactor));

diff --git a/WebCore/platform/win/TemporaryLinkStubs.cpp b/WebCore/platform/win/TemporaryLinkStubs.cpp
index 878710a16781060f74ac2e112ec2cb9a087ab2c0..0802540856d4c012a9ff001712c0882df3821947 100644 (file)
--- a/WebCore/platform/win/TemporaryLinkStubs.cpp
+++ b/WebCore/platform/win/TemporaryLinkStubs.cpp
@@ -43,9 +43,9 @@
 #include "loader.h"
 #include "FrameView.h"
 #include "KURL.h"
+#include "PlatformScrollBar.h"
 #include "ScrollBar.h"
 #include "JavaAppletWidget.h"
-#include "ScrollBar.h"
 #include "Path.h"
 #include "PlatformMouseEvent.h"
 #include "CookieJar.h"
@@ -349,11 +349,20 @@ IntSize PopUpButton::sizeHint() const { return IntSize(); }
 IntRect PopUpButton::frameGeometry() const { return IntRect(); }
 void PopUpButton::setFrameGeometry(IntRect const&) { }
 
-ScrollBar::ScrollBar(ScrollBarOrientation) { }
-ScrollBar::~ScrollBar() { }
+PlatformScrollBar::PlatformScrollBar(ScrollBarClient* client, ScrollBarOrientation orientation) : ScrollBar(client, orientation) { }
+PlatformScrollBar::~PlatformScrollBar() { }
+int PlatformScrollBar::width() const { return 0; }
+int PlatformScrollBar::height() const { return 0; }
+void PlatformScrollBar::setEnabled(bool) { }
+void PlatformScrollBar::paint(GraphicsContext*, const IntRect& damageRect) { }
+void PlatformScrollBar::setScrollBarValue(int v) { }
+void PlatformScrollBar::setKnobProportion(int visibleSize, int totalSize) { }
+void PlatformScrollBar::setRect(const IntRect&) { }
+
+ScrollBar::ScrollBar(ScrollBarClient*, ScrollBarOrientation) { }
 void ScrollBar::setSteps(int, int) { }
-bool ScrollBar::scroll(ScrollDirection, ScrollGranularity, float) { return 0; }
-bool ScrollBar::setValue(int) { return 0; }
+bool ScrollBar::scroll(ScrollDirection, ScrollGranularity, float) { return false; }
+bool ScrollBar::setValue(int) { return false; }
 void ScrollBar::setKnobProportion(int, int) { }
 
 ListBox::ListBox() { }