git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16295 268f45cc-cd09-0410...
authorbeidson <beidson@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 11 Sep 2006 06:16:32 +0000 (06:16 +0000)
committerbeidson <beidson@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 11 Sep 2006 06:16:32 +0000 (06:16 +0000)
WebCore/ChangeLog
WebCore/loader/icon/IconDatabase.cpp
WebCore/platform/Image.h

index fa18b5f3292d350c1dc04129dd04ecfe0b7ff49c..fc3a10da9a6733954c023ce48faf2355f274f7f3 100644 (file)
@@ -1,3 +1,13 @@
+2006-09-10  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Maciej
+
+        Small cleanups + future plans
+
+        * loader/icon/IconDatabase.cpp:
+        (WebCore::IconDatabase::open): path seperator cleanup
+        * platform/Image.h: 
+     
 2006-09-10  Brady Eidson  <beidson@apple.com>
 
         Reviewed by Maciej
index 044b35cca973cb47e613262d062c20e19242fbd1..7e856784d8392cdeb78510d61658398caca7ea24 100644 (file)
@@ -99,10 +99,17 @@ bool IconDatabase::open(const String& databasePath)
     
     // First we'll formulate the full path for the database file
     String dbFilename;
+#if PLATFORM(WIN)
+    if (databasePath[databasePath.length()] == '\\')
+        dbFilename = databasePath + defaultDatabaseFilename();
+    else
+        dbFilename = databasePath + "\\" + defaultDatabaseFilename();
+#else
     if (databasePath[databasePath.length()] == '/')
         dbFilename = databasePath + defaultDatabaseFilename();
     else
         dbFilename = databasePath + "/" + defaultDatabaseFilename();
+#endif
 
     // <rdar://problem/4707718> - If user's Icon directory is unwritable, Safari will crash at startup
     // Now, we'll see if we can open the on-disk database.  And, if we can't, we'll return false.  
index 0d1a3d09696e1165921212a02c57da7a9fa4f047..507b3302b6f8c1c5e03c9bfd7aec4cba37f31db2 100644 (file)
@@ -41,6 +41,10 @@ class NSImage;
 #endif
 #endif
 
+#if PLATFORM(WIN)
+typedef struct HBITMAP__ *HBITMAP;
+#endif
+
 namespace WebCore {
     struct FrameData;
 }
@@ -141,6 +145,10 @@ public:
     CGImageRef getCGImageRef();
 #endif
 
+#if PLATFORM(WIN)
+    bool getHBITMAP(HBITMAP bmp);
+#endif
+
 private:
     void draw(GraphicsContext*, const FloatRect& dstRect, const FloatRect& srcRect, CompositeOperator);
     void drawTiled(GraphicsContext*, const FloatRect& dstRect, const FloatPoint& srcPoint, const FloatSize& tileSize,