Changeset 18159 in webkit

Timestamp:

Dec 11, 2006 1:54:43 PM (17 years ago)

Author:

yongjzha

Message:

2006-12-11 w3liu <​wei.liu@nokia.com>

Reviewed by ​yongjun.zhang@nokia.com.
DESC: add flag to remove the SDK dependency on AknSettingsCache
​http://bugzilla.opendarwin.org/show_bug.cgi?id=11806

• BrowserCore/Formcontrols/src/FControlInputSkin.cpp: (CFormInputSkin::Draw): (CFormInputSkin::SetText):

Location:

S60/branches/3.1m/WebKit

Files:

• BrowserCore/Formcontrols/src/FControlInputSkin.cpp (modified) (6 diffs)
• ChangeLog (modified) (1 diff)

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

@@ -59 +59 @@
 #include "FormDataManager.h"
 #include "WebCoreLoaderContainer.h"
+
+#ifndef __BROWSER_SDK
 #include "AknSettingCache.h"
 #include "AknUtils.h"
 #include <BidiVisual.h>
+#endif
 
 void BrCtlPanic(TInt);
@@ -220 +223 @@
     {
     CFbsBitGc* gcContext = &aPainter.Gc();
+    #ifndef __BROWSER_SDK
     CAknSettingCache& cache = CAknEnv::Static()->SettingCache();
     TLanguage lang = cache.InputLanguage();
@@ -225 +229 @@
     if ( lang == ELangHebrew || lang == ELangArabic )
         iRtl = ETrue;
-
+    #endif
     if( !iInputWidget )
         {
@@ -473 +477 @@
     iVisualText = NULL;
    // modify text if needed
-    TRAP_IGNORE(
   if (iType == ETextArea)
     {
+        TRAP_IGNORE(
         iVisualText = HBufC::NewL( iData->Length() + iDisplayHeightInChars * KAknBidiExtraSpacePerLine + 1 );
         //
@@ -486 +490 @@
         AknBidiTextUtils::ConvertToVisualAndWrapToArrayL( visualTextPtr, *iLineWidthArray,
             *iFont, *iWrappedArray,
-            0xFFFF /*no ellipsis*/);
+            0xFFFF /*no ellipsis*/););
     }
     else if (iType == EPassword )
         {
+        TRAP_IGNORE(
         // if the inputtype is password, then fill it with mask characters
         iVisualText = HBufC::NewL( iData->Length() );
@@ -496 +501 @@
         visualTextPtr.SetLength( iData->Length() );
         //'*' password mask character
-        visualTextPtr.Fill('*');
+        visualTextPtr.Fill('*'););
         }
     else
         {
+#ifdef __BROWSER_SDK
+        TRAP_IGNORE(
+        iVisualText = iData->AllocL(););
+#else
+        TRAP_IGNORE(
         TInt visualLen = iData->Length() + TBidiLogicalToVisual::KMinCharAvailable + 1;
         iVisualText = HBufC::NewL(visualLen );
         TPtr visualDes = iVisualText->Des();
-            TInt charWidth = iFont->MaxNormalCharWidthInPixels();
-
+        TInt charWidth = iFont->MaxNormalCharWidthInPixels();
         // create the visual clip for the text
         AknBidiTextUtils::ConvertToVisualAndClip(*iData, visualDes,
             *iFont, (KInputDefaultWidth - 3)* charWidth ,
              KInputMaxWidth*charWidth );
-        }
-    );
+        );
+#endif
+        }
 
     // repaint the rect

S60/branches/3.1m/WebKit/ChangeLog

@@ +1 @@
+2006-12-11  w3liu  <wei.liu@nokia.com>
+
+        Reviewed by yongjun.zhang@nokia.com.
+        DESC: add flag to remove the SDK dependency on AknSettingsCache
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=11806
+
+        * BrowserCore/Formcontrols/src/FControlInputSkin.cpp:
+        (CFormInputSkin::Draw):
+        (CFormInputSkin::SetText):
+
 2006-12-11  w3liu  <wei.liu@nokia.com>