Changeset 17208 in webkit

Timestamp:

Oct 22, 2006 12:31:34 AM (18 years ago)

Author:

darin

Message:

• another try at fixing Qt

• CMakeLists.txt: Added DeleteButton.cpp and DeleteButtonController.cpp.

• and fix a couple warnings while I'm at it

• platform/image-decoders/ImageDecoder.h: (WebCore::RGBA32Buffer::setRGBA): Don't do unsigned *= float.

• rendering/break_lines.cpp: (WebCore::nextBreakablePosition): Move unused variable inside #if so it's consistent.

Location:

trunk/WebCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• platform/image-decoders/ImageDecoder.h (modified) (1 diff)
• rendering/break_lines.cpp (modified) (1 diff)

trunk/WebCore/CMakeLists.txt

@@ -808 +808 @@
     ${XPATH_SOURCES}
 
+    editing/DeleteButtonController.cpp
+    editing/DeleteButton.cpp
     editing/Editor.cpp
     editing/CommandByName.cpp

trunk/WebCore/ChangeLog

@@ +1 @@
+2006-10-22  Darin Adler  <darin@apple.com>
+
+        - another try at fixing Qt
+
+        * CMakeLists.txt: Added DeleteButton.cpp and DeleteButtonController.cpp.
+
+        - and fix a couple warnings while I'm at it
+
+        * platform/image-decoders/ImageDecoder.h: (WebCore::RGBA32Buffer::setRGBA):
+        Don't do unsigned *= float.
+
+        * rendering/break_lines.cpp: (WebCore::nextBreakablePosition): Move unused variable
+        inside #if so it's consistent.
+
 2006-10-21  Darin Adler  <darin@apple.com>
 

trunk/WebCore/platform/image-decoders/ImageDecoder.h

@@ -70 +70 @@
             if (a < 255) {
                 float alphaPercent = a / 255.0f;
-                r *= alphaPercent;
-                g *= alphaPercent;
-                b *= alphaPercent;
+                r = static_cast<unsigned>(r * alphaPercent);
+                g = static_cast<unsigned>(g * alphaPercent);
+                b = static_cast<unsigned>(b * alphaPercent);
             }
             pos = (a << 24 | r << 16 | g << 8 | b);

trunk/WebCore/rendering/break_lines.cpp

@@ -37 +37 @@
     OSStatus status = 0, findStatus = -1;
     static TextBreakLocatorRef breakLocator = 0;
+    int nextUCBreak = -1;
 #endif
-    int nextUCBreak = -1;
     int i;
     unsigned short ch, lastCh;