<!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>[19982] S60/trunk/WebKit</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/19982">19982</a></dd>
<dt>Author</dt> <dd>brmorris</dd>
<dt>Date</dt> <dd>2007-03-06 08:17:47 -0800 (Tue, 06 Mar 2007)</dd>
</dl>
<h3>Log Message</h3>
<pre>yinxcai, reviewed by <Sachin>
DESC: ASOG-6YTLNA -- Remove __BROWSER_OSS_ENGINE flag from webkit.iby and webkitresources.iby
http://bugs.webkit.org/show_bug.cgi?id=12935</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#S60trunkWebKitChangeLog">S60/trunk/WebKit/ChangeLog</a></li>
<li><a href="#S60trunkWebKitromwebkitiby">S60/trunk/WebKit/rom/webkit.iby</a></li>
<li><a href="#S60trunkWebKitromwebkitResourcesiby">S60/trunk/WebKit/rom/webkitResources.iby</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="S60trunkWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: S60/trunk/WebKit/ChangeLog (19981 => 19982)</h4>
<pre class="diff"><span>
<span class="info">--- S60/trunk/WebKit/ChangeLog 2007-03-06 10:27:05 UTC (rev 19981)
+++ S60/trunk/WebKit/ChangeLog 2007-03-06 16:17:47 UTC (rev 19982)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+yinxcai, reviewed by <Sachin>
+ DESC: ASOG-6YTLNA -- Remove __BROWSER_OSS_ENGINE flag from webkit.iby and webkitresources.iby
+ http://bugs.webkit.org/show_bug.cgi?id=12935
+
+ * rom/webkit.iby:
+ * rom/webkitResources.iby:
+
</ins><span class="cx"> yinxcai, reviewed by <Yongjun>
</span><span class="cx"> DESC: TMCN-6Y9Q7A --Browser ask permission for unsecure item load repeatedly
</span><span class="cx"> http://bugs.webkit.org/show_bug.cgi?id=12901
</span></span></pre></div>
<a id="S60trunkWebKitromwebkitiby"></a>
<div class="modfile"><h4>Modified: S60/trunk/WebKit/rom/webkit.iby (19981 => 19982)</h4>
<pre class="diff"><span>
<span class="info">--- S60/trunk/WebKit/rom/webkit.iby 2007-03-06 10:27:05 UTC (rev 19981)
+++ S60/trunk/WebKit/rom/webkit.iby 2007-03-06 16:17:47 UTC (rev 19982)
</span><span class="lines">@@ -42,7 +42,6 @@
</span><span class="cx"> #ifndef __WEBKIT_IBY__
</span><span class="cx"> #define __WEBKIT_IBY__
</span><span class="cx">
</span><del>-#ifdef __BROWSER_OSS_ENGINE
</del><span class="cx"> // bitmaps
</span><span class="cx"> S60_APP_BITMAP2(Browser,webkit)
</span><span class="cx">
</span><span class="lines">@@ -75,5 +74,5 @@
</span><span class="cx"> data=DATAZ_\RESOURCE_FILES_DIR\html4.css RESOURCE_FILES_DIR\html4.css
</span><span class="cx"> data=DATAZ_\RESOURCE_FILES_DIR\quirks.css RESOURCE_FILES_DIR\quirks.css
</span><span class="cx">
</span><del>-#endif //__BROWSER_OSS_ENGINE
</del><ins>+
</ins><span class="cx"> #endif
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="S60trunkWebKitromwebkitResourcesiby"></a>
<div class="modfile"><h4>Modified: S60/trunk/WebKit/rom/webkitResources.iby (19981 => 19982)</h4>
<pre class="diff"><span>
<span class="info">--- S60/trunk/WebKit/rom/webkitResources.iby 2007-03-06 10:27:05 UTC (rev 19981)
+++ S60/trunk/WebKit/rom/webkitResources.iby 2007-03-06 16:17:47 UTC (rev 19982)
</span><span class="lines">@@ -8,9 +8,9 @@
</span><span class="cx"> // Copyright (c) 2006, Nokia Corporation
</span><span class="cx"> // All rights reserved.
</span><span class="cx"> //
</span><del>-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
</del><ins>+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions
+// are met:
</ins><span class="cx"> //
</span><span class="cx"> // * Redistributions of source code must retain the above copyright
</span><span class="cx"> // notice, this list of conditions and the following disclaimer.
</span><span class="lines">@@ -22,18 +22,18 @@
</span><span class="cx"> // contributors may be used to endorse or promote products derived
</span><span class="cx"> // from this software without specific prior written permission.
</span><span class="cx"> //
</span><del>-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-// DAMAGE.
</del><ins>+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+// USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+// DAMAGE.
</ins><span class="cx"> //
</span><span class="cx"> // Please see file patentlicense.txt for further grants.
</span><span class="cx"> // ==============================================================================
</span><span class="lines">@@ -42,11 +42,9 @@
</span><span class="cx"> #ifndef __WEBKITRESOURCES_IBY__
</span><span class="cx"> #define __WEBKITRESOURCES_IBY__
</span><span class="cx">
</span><del>-#ifdef __BROWSER_OSS_ENGINE
</del><span class="cx">
</span><span class="cx"> // resources
</span><del>-data=DATAZ_\RESOURCE_FILES_DIR\WebKit.rsc RESOURCE_FILES_DIR\WebKit.rsc
-data=DATAZ_\RESOURCE_FILES_DIR\ToolBar.rsc RESOURCE_FILES_DIR\ToolBar.rsc
</del><ins>+data=DATAZ_\RESOURCE_FILES_DIR\WebKit.rsc RESOURCE_FILES_DIR\WebKit.rsc
+data=DATAZ_\RESOURCE_FILES_DIR\ToolBar.rsc RESOURCE_FILES_DIR\ToolBar.rsc
</ins><span class="cx">
</span><del>-#endif //__BROWSER_OSS_ENGINE
</del><span class="cx"> #endif //__WEBKITRESOURCES_IBY__
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>