<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[20034] S60/trunk/WebKit</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/20034">20034</a></dd>
<dt>Author</dt> <dd>brmorris</dd>
<dt>Date</dt> <dd>2007-03-07 15:08:49 -0800 (Wed, 07 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>yaharon, reviewed by sachin, brad (for sdk build)
DESC: Take new graphics into use when displaying the url
http://bugs.webkit.org/show_bug.cgi?id=12977</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#S60trunkWebKitBrowserCoreMiscincCannedImagesh">S60/trunk/WebKit/BrowserCore/Misc/inc/CannedImages.h</a></li>
<li><a href="#S60trunkWebKitBrowserCoreMiscsrcCannedImagescpp">S60/trunk/WebKit/BrowserCore/Misc/src/CannedImages.cpp</a></li>
<li><a href="#S60trunkWebKitBrowserViewsrcPopupDrawercpp">S60/trunk/WebKit/BrowserView/src/PopupDrawer.cpp</a></li>
<li><a href="#S60trunkWebKitChangeLog">S60/trunk/WebKit/ChangeLog</a></li>
<li><a href="#S60trunkWebKitgroupiconsmk">S60/trunk/WebKit/group/icons.mk</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="S60trunkWebKitBrowserCoreMiscincCannedImagesh"></a>
<div class="modfile"><h4>Modified: S60/trunk/WebKit/BrowserCore/Misc/inc/CannedImages.h (20033 => 20034)</h4>
<pre class="diff"><span>
<span class="info">--- S60/trunk/WebKit/BrowserCore/Misc/inc/CannedImages.h 2007-03-07 23:05:42 UTC (rev 20033)
+++ S60/trunk/WebKit/BrowserCore/Misc/inc/CannedImages.h 2007-03-07 23:08:49 UTC (rev 20034)
</span><span class="lines">@@ -165,6 +165,12 @@
</span><span class="cx"> EImageWaitArrowBitmap,
</span><span class="cx"> EImageSmartLinkPhone,
</span><span class="cx"> EImageSmartLinkEmail,
</span><ins>+ EImageUrlCall,
+ EImageUrlEmail,
+ EImageUrlMm,
+ EImageUrlMms,
+ EImageUrlPage,
+ EImageUrlVideo,
</ins><span class="cx"> KNumberOfCannedImages
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="S60trunkWebKitBrowserCoreMiscsrcCannedImagescpp"></a>
<div class="modfile"><h4>Modified: S60/trunk/WebKit/BrowserCore/Misc/src/CannedImages.cpp (20033 => 20034)</h4>
<pre class="diff"><span>
<span class="info">--- S60/trunk/WebKit/BrowserCore/Misc/src/CannedImages.cpp 2007-03-07 23:05:42 UTC (rev 20033)
+++ S60/trunk/WebKit/BrowserCore/Misc/src/CannedImages.cpp 2007-03-07 23:08:49 UTC (rev 20034)
</span><span class="lines">@@ -214,6 +214,30 @@
</span><span class="cx"> LoadSvg(EMbmWebkiticons_sdkQgn_indi_ai_nt_message,
</span><span class="cx"> KAknsIIDDefault, *iSvgMbmFile, img);
</span><span class="cx"> break;
</span><ins>+ case EImageUrlCall:
+ LoadSvg(EMbmWebkiticons_sdkQgn_indi_browser_url_call,
+ KAknsIIDDefault, *iSvgMbmFile, img);
+ break;
+ case EImageUrlEmail:
+ LoadSvg(EMbmWebkiticons_sdkQgn_indi_browser_url_email,
+ KAknsIIDDefault, *iSvgMbmFile, img);
+ break;
+ case EImageUrlMm:
+ LoadSvg(EMbmWebkiticons_sdkQgn_indi_browser_url_mm,
+ KAknsIIDDefault, *iSvgMbmFile, img);
+ break;
+ case EImageUrlMms:
+ LoadSvg(EMbmWebkiticons_sdkQgn_indi_browser_url_mms,
+ KAknsIIDDefault, *iSvgMbmFile, img);
+ break;
+ case EImageUrlPage:
+ LoadSvg(EMbmWebkiticons_sdkQgn_indi_browser_url_page,
+ KAknsIIDDefault, *iSvgMbmFile, img);
+ break;
+ case EImageUrlVideo:
+ LoadSvg(EMbmWebkiticons_sdkQgn_indi_browser_url_video,
+ KAknsIIDDefault, *iSvgMbmFile, img);
+ break;
</ins><span class="cx"> #else
</span><span class="cx"> case EImageMissing:
</span><span class="cx"> LoadSvg(EMbmWebkiticonsQgn_indi_wml_image_not_shown,
</span><span class="lines">@@ -267,6 +291,30 @@
</span><span class="cx"> LoadSvg(EMbmWebkiticonsQgn_indi_ai_nt_message,
</span><span class="cx"> KAknsIIDDefault, *iSvgMbmFile, img);
</span><span class="cx"> break;
</span><ins>+ case EImageUrlCall:
+ LoadSvg(EMbmWebkiticonsQgn_indi_browser_url_call,
+ KAknsIIDDefault, *iSvgMbmFile, img);
+ break;
+ case EImageUrlEmail:
+ LoadSvg(EMbmWebkiticonsQgn_indi_browser_url_email,
+ KAknsIIDDefault, *iSvgMbmFile, img);
+ break;
+ case EImageUrlMm:
+ LoadSvg(EMbmWebkiticonsQgn_indi_browser_url_mm,
+ KAknsIIDDefault, *iSvgMbmFile, img);
+ break;
+ case EImageUrlMms:
+ LoadSvg(EMbmWebkiticonsQgn_indi_browser_url_mms,
+ KAknsIIDDefault, *iSvgMbmFile, img);
+ break;
+ case EImageUrlPage:
+ LoadSvg(EMbmWebkiticonsQgn_indi_browser_url_page,
+ KAknsIIDDefault, *iSvgMbmFile, img);
+ break;
+ case EImageUrlVideo:
+ LoadSvg(EMbmWebkiticonsQgn_indi_browser_url_video,
+ KAknsIIDDefault, *iSvgMbmFile, img);
+ break;
</ins><span class="cx"> #endif
</span><span class="cx"> default:
</span><span class="cx"> TRAP_IGNORE(LoadCannedImageDirL(aImageId, *iMbmFile, img));
</span></span></pre></div>
<a id="S60trunkWebKitBrowserViewsrcPopupDrawercpp"></a>
<div class="modfile"><h4>Modified: S60/trunk/WebKit/BrowserView/src/PopupDrawer.cpp (20033 => 20034)</h4>
<pre class="diff"><span>
<span class="info">--- S60/trunk/WebKit/BrowserView/src/PopupDrawer.cpp 2007-03-07 23:05:42 UTC (rev 20033)
+++ S60/trunk/WebKit/BrowserView/src/PopupDrawer.cpp 2007-03-07 23:08:49 UTC (rev 20034)
</span><span class="lines">@@ -333,6 +333,8 @@
</span><span class="cx"> _LIT(KMailToScheme, "mailto");
</span><span class="cx"> _LIT(KTelScheme, "tel");
</span><span class="cx"> _LIT(KRtspScheme, "rtsp");
</span><ins>+ _LIT(KMmstoScheme, "mmsto");
+ _LIT(KSmsScheme, "sms");
</ins><span class="cx"> CCannedImages::TCannedImageNames imageType = CCannedImages::EImageSmartLinkPhone;
</span><span class="cx"> TInt i = iTextToDraw->Locate(':');
</span><span class="cx"> if (i != KErrNotFound)
</span><span class="lines">@@ -340,28 +342,36 @@
</span><span class="cx"> TPtrC schemePtr(iTextToDraw->Ptr(), i);
</span><span class="cx"> if (KHttpScheme().CompareF(schemePtr) == 0)
</span><span class="cx"> {
</span><del>- imageType = CCannedImages::EImageSmartLinkPhone;
</del><ins>+ imageType = CCannedImages::EImageUrlPage;
</ins><span class="cx"> }
</span><span class="cx"> else if (KHttpsScheme().CompareF(schemePtr) == 0)
</span><span class="cx"> {
</span><del>- imageType = CCannedImages::EImageSmartLinkPhone;
</del><ins>+ imageType = CCannedImages::EImageUrlPage;
</ins><span class="cx"> }
</span><span class="cx"> else if (KFileScheme().CompareF(schemePtr) == 0)
</span><span class="cx"> {
</span><del>- imageType = CCannedImages::EImageSmartLinkPhone;
</del><ins>+ imageType = CCannedImages::EImageUrlPage;
</ins><span class="cx"> }
</span><span class="cx"> else if (KMailToScheme().CompareF(schemePtr) == 0)
</span><span class="cx"> {
</span><del>- imageType = CCannedImages::EImageSmartLinkEmail;
</del><ins>+ imageType = CCannedImages::EImageUrlEmail;
</ins><span class="cx"> }
</span><span class="cx"> else if (KTelScheme().CompareF(schemePtr) == 0)
</span><span class="cx"> {
</span><del>- imageType = CCannedImages::EImageSmartLinkPhone;
</del><ins>+ imageType = CCannedImages::EImageUrlCall;
</ins><span class="cx"> }
</span><span class="cx"> else if (KRtspScheme().CompareF(schemePtr) == 0)
</span><span class="cx"> {
</span><del>- imageType = CCannedImages::EImageSmartLinkPhone;
</del><ins>+ imageType = CCannedImages::EImageUrlMm;
</ins><span class="cx"> }
</span><ins>+ else if (KMmstoScheme().CompareF(schemePtr) == 0)
+ {
+ imageType = CCannedImages::EImageUrlMms;
+ }
+ else if (KSmsScheme().CompareF(schemePtr) == 0)
+ {
+ imageType = CCannedImages::EImageUrlEmail;
+ }
</ins><span class="cx"> }
</span><span class="cx"> TCannedImageData cannedImage = CStaticObjectContainer::Instance().CannedImagesL().GetImage(imageType);
</span><span class="cx"> if (cannedImage.iMask)
</span></span></pre></div>
<a id="S60trunkWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: S60/trunk/WebKit/ChangeLog (20033 => 20034)</h4>
<pre class="diff"><span>
<span class="info">--- S60/trunk/WebKit/ChangeLog 2007-03-07 23:05:42 UTC (rev 20033)
+++ S60/trunk/WebKit/ChangeLog 2007-03-07 23:08:49 UTC (rev 20034)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+yaharon, reviewed by sachin, brad (for sdk build)
+ DESC: Take new graphics into use when displaying the url
+ http://bugs.webkit.org/show_bug.cgi?id=12977
+
+ * BrowserCore/Misc/inc/CannedImages.h:
+ (CCannedImages::):
+ * BrowserCore/Misc/src/CannedImages.cpp:
+ (CCannedImages::GetImage):
+ * BrowserView/src/PopupDrawer.cpp:
+ (CPopupDrawer::CreateIconIfNeededL):
+ * group/icons.mk:
+
</ins><span class="cx"> vbradley, reviewed by Sachin
</span><span class="cx"> DESC: merge r20032 to s60/trunk. SLON-6VZ8Vu - Web Browser crashes when attempting to view a local file
</span><span class="cx"> http://bugs.webkit.org/show_bug.cgi?id=12927
</span></span></pre></div>
<a id="S60trunkWebKitgroupiconsmk"></a>
<div class="modfile"><h4>Modified: S60/trunk/WebKit/group/icons.mk (20033 => 20034)</h4>
<pre class="diff"><span>
<span class="info">--- S60/trunk/WebKit/group/icons.mk 2007-03-07 23:05:42 UTC (rev 20033)
+++ S60/trunk/WebKit/group/icons.mk 2007-03-07 23:08:49 UTC (rev 20034)
</span><span class="lines">@@ -97,7 +97,13 @@
</span><span class="cx"> /c8,8 qgn_indi_viewer_pointer_hand.svg\
</span><span class="cx"> /c8,8 qgn_indi_viewer_pointer_wait.svg\
</span><span class="cx"> /c8,8 qgn_prop_nrtyp_phone.svg\
</span><del>-/c8,8 qgn_indi_ai_nt_message.svg
</del><ins>+/c8,8 qgn_indi_ai_nt_message.svg\
+/c8,8 qgn_indi_browser_url_call.svg\
+/c8,8 qgn_indi_browser_url_email.svg\
+/c8,8 qgn_indi_browser_url_mm.svg\
+/c8,8 qgn_indi_browser_url_mms.svg\
+/c8,8 qgn_indi_browser_url_page.svg\
+/c8,8 qgn_indi_browser_url_video.svg
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> FREEZE : do_nothing
</span></span></pre>
</div>
</div>
</body>
</html>