Changeset 19801 in webkit

Timestamp:

Feb 22, 2007 1:16:53 PM (17 years ago)

Author:

brmorris

Message:

sareen by yongjun

DESC: Merge of r19655 to s60/3.1m. Selection list not shown correctly in www.elisa.fi HMNN-6XQJMX
​http://bugs.webkit.org/show_bug.cgi?id=12719

Location:

S60/branches/3.1m/WebKit

Files:

• BrowserCore/Formcontrols/src/FControlSelectSkin.cpp (modified) (2 diffs)
• ChangeLog (modified) (1 diff)

S60/branches/3.1m/WebKit/BrowserCore/Formcontrols/src/FControlSelectSkin.cpp

@@ -141 +141 @@
 
     // clear content area
-    gcContext->SetBrushColor( iWebCorePalette.BackGround() );
-    gcContext->DrawRect( innerRect );
+    
+    TUint32 backGround = iWebCorePalette.BackGround().Internal() & (0x00ffffff);
+    TUint32 foreGround = iWebCorePalette.ForeGround().Internal() & (0x00ffffff);
+    TBool   foreGroundBlack = EFalse;
+    if( backGround==foreGround  && 
+        textDisplayRect.iTl.iX<textDisplayRect.iBr.iX )
+        {
+        //Nothing will be displayed on the screen.
+        //This case only happens in case of malformed HTML contents
+        //and have been found on few sites.
+        //Safe to change to white so any text can be pained on this.
+        TRgb newBackGround( 0x00ffffff );
+        gcContext->SetBrushColor( newBackGround );
+        //If Foreground is also white, then penColor will be changed to black
+        if( foreGround==0x00ffffff )
+            foreGroundBlack = ETrue;
+            
+        }
+    else
+        {
+        gcContext->SetBrushColor( iWebCorePalette.BackGround() );
+        }
+   gcContext->DrawRect( innerRect );
 
     // draw text
@@ -148 +169 @@
         {
         gcContext->UseFontNoDuplicate( static_cast<CFbsBitGcFont*>(iFont) );
-        gcContext->SetPenColor(iWebCorePalette.ForeGround());
+        if( foreGroundBlack )
+            {
+            gcContext->SetPenColor( 0x0 ); //Set to black
+            }  
+        else
+            {   
+            gcContext->SetPenColor(iWebCorePalette.ForeGround());
+            }
         // if the text is NULL then display empty string
         TPtrC data = iVisualClipText ? iVisualClipText->Des() : KNullDesC();

S60/branches/3.1m/WebKit/ChangeLog

@@ +1 @@
+sareen by yongjun
+        DESC: Selection list not shown correctly in www.elisa.fi HMNN-6XQJMX
+        http://bugs.webkit.org/show_bug.cgi?id=12719
+
+        * BrowserCore/Formcontrols/src/FControlSelectSkin.cpp:
+        (CFormSelectSkin::Draw):
+
 brmorris, reviewed by Sachin.
         DESC:  r19404 caused some regresion, so I'm reverting it. TMCN-6XYSLY