Changeset 19501 in webkit

Timestamp:

Feb 8, 2007 10:52:29 AM (17 years ago)

Author:

brmorris

Message:

brmorris <​bradley.morrison@nokia.com>, rs'd by zalan

DESC: merge from s60/branches/3.1m to s60/trunk of r19464, r19466, r19472 & r19499

Location:

S60/trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/khtml/html/htmltokenizer.cpp (modified) (2 diffs)
• WebKit/BrowserView/inc/WebKitLoader.h (modified) (2 diffs)
• WebKit/BrowserView/src/KeyEventHandler.cpp (modified) (1 diff)
• WebKit/BrowserView/src/WebKitLoader.cpp (modified) (2 diffs)
• WebKit/BrowserView/src/webkitbridge.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (2 diffs)
• WebKit/ResourceLoader/src/UrlRequestInfo.cpp (modified) (2 diffs)

S60/trunk/WebCore/ChangeLog

@@ +1 @@
+yadavall, reviewed by zalan bujtas
+ DESC: Unclosed object tag causing content to not appear 
+ http://bugs.webkit.org/show_bug.cgi?id=12680
+
 yaharon, reviewed by zalan. merged to s60/trunk by brad.
         DESC: [S60] BrowserNG: Betsson.com crash (MLIO-6XWP2K)

S60/trunk/WebCore/khtml/html/htmltokenizer.cpp

@@ -1208 +1208 @@
                         // being bogus HTML.  They do not honor the "/" for other tags.  This behavior
                         // also deviates from WinIE, but in this case we'll just copy Moz and Opera.
+#ifdef NOKIA_CHANGES
+                        if ((currToken.id == ID_SCRIPT || currToken.id == ID_OBJECT) && curchar == '>' &&
+#else
                         if (currToken.id == ID_SCRIPT && curchar == '>' &&
+#endif
                             attrName == "/")
                             currToken.flat = true;
@@ -1539 +1543 @@
                 if (beginTag) {
 #ifdef NOKIA_CHANGES
-                    if(slashAtEndOfTag) 
-                       break;    
+                    if(slashAtEndOfTag)
+                       break;
 #endif
                     searchStopper = titleEnd;
                     searchStopperLen = 7;
-                    title = true;         
+                    title = true;
                     parseSpecial(src);
                 }

S60/trunk/WebKit/BrowserView/inc/WebKitLoader.h

@@ -282 +282 @@
 
         /**
+        * PageUrl
+        *
+        * @since 3.1
+        * @param
+        * @return
+        */
+        HBufC* PrevPageUrl() { return iPrevPageUrl; }
+        
+        /**
         * SetReferrerUrlL
         *
@@ -490 +499 @@
         //
         HBufC*                  iPageUrl;              // owned
+        //
+        HBufC*                  iPrevPageUrl;              // owned
 
         HBufC*                  iReferrerUrl;              // owned

S60/trunk/WebKit/BrowserView/src/KeyEventHandler.cpp

@@ -555 +555 @@
                 {
                 iWebKitView->LaunchToolBarL();
+                // and send the keyrelease event to webcore. otherwise, webcore gets 
+                // stuck in keypressed state
+                TPointerEvent event;
+                event.iPosition = absCursorPos;
+                event.iModifiers = 0;
+                event.iType = TPointerEvent::EButton1Up;
+                focused->WebKitBridge().WebCoreBridge().PointerEvent(event);
                 return EKeyWasConsumed;
                 }

S60/trunk/WebKit/BrowserView/src/WebKitLoader.cpp

@@ -197 +197 @@
     delete iPageUrl;
     //
+    delete iPrevPageUrl;
+    //
     delete iReferrerUrl;
     //
@@ -819 +821 @@
     const TDesC& aResponseUrl )
     {
-    delete iPageUrl;
+    delete iPrevPageUrl;
+    iPrevPageUrl = iPageUrl;
     iPageUrl = aResponseUrl.AllocL();
     }

S60/trunk/WebKit/BrowserView/src/webkitbridge.cpp

@@ -725 +725 @@
         if (formManager)
             {
-            formManager->SaveDataL(RequestedURLString(),aFormValues);
+            // closeURL is now called when receiving the response headers, not when submitting the form
+            __ASSERT_DEBUG( iLoader->PrevPageUrl(), User::Panic( _L("WebKitLoader"), KErrGeneral ) );
+            TPtrC url(iLoader->PrevPageUrl()->Des());
+            formManager->SaveDataL(url,aFormValues);
             } 
         );

S60/trunk/WebKit/ChangeLog

@@ +1 @@
+yaharon, reviewed by yongjun.
+        DESC: [S60] Daily BAT 3.2: S60NG_Login- Password field is not filled automatically.(  KDEA-6XZEDY )
+        http://bugs.webkit.org/show_bug.cgi?id=12696
+
+        * BrowserView/inc/WebKitLoader.h:
+        (CWebKitLoader::PrevPageUrl):
+        * BrowserView/src/WebKitLoader.cpp:
+        (CWebKitLoader::~CWebKitLoader):
+        (CWebKitLoader::SetPageUrlL):
+        * BrowserView/src/webkitbridge.cpp:
+        (CWebKitBridge::SaveFormData):
+
+bujtas, reviewed by yongjun, merge of r19466 to trunk by brad. 
+        DESC: Highlighting lost when browser toolbar is dismissed. Toolbar consumes
+        the keyrelease event and the webcore gets stuck in a keypressed state.
+        fix: send keyrelease event to the webcore
+        
+        http://bugs.webkit.org/show_bug.cgi?id=12642
+
+        * BrowserView/src/KeyEventHandler.cpp:
+        (CKeyEventHandler::HandleActivateKeysL):
+
+rathnasa, Reviewed by Zalan Bujtas, merge of r19464 to trunk by Brad.
+        DESC: EMGH-6XTG9Y: Browser: Bookmarks with an URL containing spaces do not work
+        http://bugs.webkit.org/show_bug.cgi?id=12635
+        
+        * ResourceLoader/src/UrlRequestInfo.cpp:
+        (CUrlRequestInfo::SetUrlL):       
+
 2007-02-05  yaharon  <yael.aharon@nokia.com>
 
@@ -42 +71 @@
         (CUrlLoader::CancelAllL):
 
+>>>>>>> .r19463
 bujtas, reviewed by Yongjun.
         DESC: PartialImage() can end up in a dialog box which starts up a nested active scheduler JELE-6XSH3P

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

@@ -43 +43 @@
 // INCLUDE FILES
 #include "UrlRequestInfo.h"
+#include <EscapeUtils.h>
 
 // EXTERNAL DATA STRUCTURES
@@ -140 +141 @@
     delete iUrl;
     iUrl = NULL;
-    //
-    iUrl = aUrl.AllocL();
+    iUrl = EscapeUtils::EscapeEncodeL( aUrl, EscapeUtils::EEscapeNormal );
     }