diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index d6444eb67600ad6c7bd2c7c1a33d8b510295053e..4fb8425d13f4ed3aaf8e83d5d6b7e7a8fecfa94a 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2008-10-18  Darin Adler  <darin@apple.com>
+
+        - try to fix Windows build
+
+        * rendering/RenderThemeSafari.cpp:
+        (WebCore::RenderThemeSafari::paintCheckbox): Explicitly qualify part name with
+        SafariTheme namespace, since there is now an identically named constant in
+        the ControlPart enum.
+        (WebCore::RenderThemeSafari::paintButton): Ditto.
+        (WebCore::RenderThemeSafari::paintTextField): Ditto.
+        (WebCore::RenderThemeSafari::paintTextArea): Ditto.
+        (WebCore::RenderThemeSafari::paintSearchField): Ditto.
+        (WebCore::RenderThemeSafari::paintSearchFieldCancelButton): Ditto.
+        (WebCore::RenderThemeSafari::paintSearchFieldResultsDecoration): Ditto.
+        (WebCore::RenderThemeSafari::paintSearchFieldResultsButton): Ditto.
+
 2008-10-18  Jan Michael Alonzo  <jmalonzo@webkit.org>
 
         Reviewed by Alp Toker.
diff --git a/WebCore/rendering/RenderThemeSafari.cpp b/WebCore/rendering/RenderThemeSafari.cpp
index fee1cb600892378bc317fb1e3e5111f4da60d066..abbbf75ecdc050e991c6b32a0e490c6899c5b9d9 100644
--- a/WebCore/rendering/RenderThemeSafari.cpp
+++ b/WebCore/rendering/RenderThemeSafari.cpp
@@ -370,7 +370,7 @@ bool RenderThemeSafari::paintCheckbox(RenderObject* o, const RenderObject::Paint
     NSControlSize controlSize = controlSizeForFont(o->style());
 
     IntRect inflatedRect = inflateRect(r, checkboxSizes()[controlSize], checkboxMargins(controlSize));  
-    paintThemePart(CheckboxPart, paintInfo.context->platformContext(), inflatedRect, controlSize, determineState(o));
+    paintThemePart(SafariTheme::CheckboxPart, paintInfo.context->platformContext(), inflatedRect, controlSize, determineState(o));
 
     return false;
 }
@@ -539,7 +539,7 @@ bool RenderThemeSafari::paintButton(RenderObject* o, const RenderObject::PaintIn
     ThemePart part;
     if (r.height() <= buttonSizes()[NSRegularControlSize].height()) {
         // Push button
-        part = PushButtonPart;
+        part = SafariTheme::PushButtonPart;
 
         IntSize size = buttonSizes()[controlSize];
         size.setWidth(r.width());
@@ -553,7 +553,7 @@ bool RenderThemeSafari::paintButton(RenderObject* o, const RenderObject::PaintIn
         // Now inflate it to account for the shadow.
         inflatedRect = inflateRect(inflatedRect, size, buttonMargins(controlSize));
     } else
-        part = SquareButtonPart;
+        part = SafariTheme::SquareButtonPart;
 
     paintThemePart(part, paintInfo.context->platformContext(), inflatedRect, controlSize, determineState(o));
     return false;
@@ -563,7 +563,7 @@ bool RenderThemeSafari::paintTextField(RenderObject* o, const RenderObject::Pain
 {
     ASSERT(SafariThemeLibrary());
 
-    paintThemePart(TextFieldPart, paintInfo.context->platformContext(), r, (NSControlSize)0, determineState(o) & ~FocusedState);
+    paintThemePart(SafariTheme::TextFieldPart, paintInfo.context->platformContext(), r, (NSControlSize)0, determineState(o) & ~FocusedState);
     return false;
 }
 
@@ -591,7 +591,7 @@ bool RenderThemeSafari::paintTextArea(RenderObject* o, const RenderObject::Paint
 {
     ASSERT(SafariThemeLibrary());
 
-    paintThemePart(TextAreaPart, paintInfo.context->platformContext(), r, (NSControlSize)0, determineState(o) & ~FocusedState);
+    paintThemePart(SafariTheme::TextAreaPart, paintInfo.context->platformContext(), r, (NSControlSize)0, determineState(o) & ~FocusedState);
     return false;
 }
 
@@ -986,7 +986,7 @@ bool RenderThemeSafari::paintSearchField(RenderObject* o, const RenderObject::Pa
 {
     ASSERT(SafariThemeLibrary());
 
-    paintThemePart(SearchFieldPart, paintInfo.context->platformContext(), r, controlSizeFromRect(r, searchFieldSizes()), determineState(o));
+    paintThemePart(SafariTheme::SearchFieldPart, paintInfo.context->platformContext(), r, controlSizeFromRect(r, searchFieldSizes()), determineState(o));
     return false;
 }
 
@@ -1046,7 +1046,7 @@ bool RenderThemeSafari::paintSearchFieldCancelButton(RenderObject* o, const Rend
 
     IntRect searchRect = renderer->absoluteBoundingBoxRect();
 
-    paintThemePart(SearchFieldCancelButtonPart, paintInfo.context->platformContext(), searchRect, controlSizeFromRect(searchRect, searchFieldSizes()), determineState(o));
+    paintThemePart(SafariTheme::SearchFieldCancelButtonPart, paintInfo.context->platformContext(), searchRect, controlSizeFromRect(searchRect, searchFieldSizes()), determineState(o));
     return false;
 }
 
@@ -1100,7 +1100,7 @@ bool RenderThemeSafari::paintSearchFieldResultsDecoration(RenderObject* o, const
 
     IntRect searchRect = renderer->absoluteBoundingBoxRect();
 
-    paintThemePart(SearchFieldResultsDecorationPart, paintInfo.context->platformContext(), searchRect, controlSizeFromRect(searchRect, searchFieldSizes()), determineState(o));
+    paintThemePart(SafariTheme::SearchFieldResultsDecorationPart, paintInfo.context->platformContext(), searchRect, controlSizeFromRect(searchRect, searchFieldSizes()), determineState(o));
     return false;
 }
 
@@ -1123,7 +1123,7 @@ bool RenderThemeSafari::paintSearchFieldResultsButton(RenderObject* o, const Ren
 
     IntRect searchRect = renderer->absoluteBoundingBoxRect();
 
-    paintThemePart(SearchFieldResultsButtonPart, paintInfo.context->platformContext(), searchRect, controlSizeFromRect(searchRect, searchFieldSizes()), determineState(o));
+    paintThemePart(SafariTheme::SearchFieldResultsButtonPart, paintInfo.context->platformContext(), searchRect, controlSizeFromRect(searchRect, searchFieldSizes()), determineState(o));
     return false;
 }
 #if ENABLE(VIDEO)