Changeset 19669 in webkit

Timestamp:

Feb 16, 2007 3:21:34 PM (17 years ago)

Author:

brmorris

Message:

wei, reviewed by zalan. reverted and re-merged by mbradley

DESC: Reverts r19963 and re-applies with and updated patch. PNIO-6YFCUT conversion problem w/ google search
​http://bugs.webkit.org/show_bug.cgi?id=12792

Location:

S60/trunk/WebKit

Files:

• BrowserControl/src/BrCtl.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• ResourceLoader/src/UrlRequestInfo.cpp (modified) (1 diff)

S60/trunk/WebKit/BrowserControl/src/BrCtl.cpp

@@ -1050 +1050 @@
     CleanupStack::PushL(escapedUrl);
     iWebKitControl->LoadUrlL( *escapedUrl, aBrCtlCacheMode );
-    CleanupStack::Pop();
-    delete escapedUrl;
+    CleanupStack::PopAndDestroy();
     }
 

S60/trunk/WebKit/ChangeLog

@@ +1 @@
+brmorris, reviewed by zalan
+ DESC: Reverts r19963 and re-applies with the updated patch. PNIO-6YFCUT:  Strange conversion problem (in get " changed to %2522 instead of %22) with for example google search.
+ http://bugs.webkit.org/show_bug.cgi?id=12792
+
+        * BrowserControl/src/BrCtl.cpp:
+        (CBrCtl::LoadUrlL):
+        * ResourceLoader/src/UrlRequestInfo.cpp:
+        (CUrlRequestInfo::SetUrlL):
+
 w3liu, reviewed by zalan
  DESC: PNIO-6YFCUT:  Strange conversion problem (in get " changed to %2522 instead of %22) with for example google search.

S60/trunk/WebKit/ResourceLoader/src/UrlRequestInfo.cpp

@@ -139 +139 @@
     {
     delete iUrl;
+    iUrl = NULL;
     iUrl = aUrl.AllocL();
     }