Changeset 20 for trunk/llmozlib2/llembeddedbrowserwindow.cpp

Timestamp:

09/26/08 02:06:12 (1 year ago)

Author:

callum.linden

Message:

Fix for DEV-21419 (Caret doesn't always appear in edit fields on Windows)
Reviewed by: Andrew Cheah

Files:

• trunk/llmozlib2/llembeddedbrowserwindow.cpp (modified) (6 diffs)

trunk/llmozlib2/llembeddedbrowserwindow.cpp

@@ -116 +116 @@
-        mBkgGreen( 0xff ),
-        mBkgBlue( 0xff ),
-
-
-
+0
+0
+0
-        m404RedirectUrl( "" ),
-        mFlipBitmap( false )
@@ -683 +683 @@
-{
-        nsCOMPtr< nsIWebBrowserFocus > focus = do_QueryInterface( mWebBrowser );
+        if ( ! focus )
+                return NS_ERROR_FAILURE;
-
-        nsCOMPtr< nsIDOMElement > focusedElement;
@@ -690 +692 @@
-
-        nsCOMPtr<nsIContent> focusedContent = do_QueryInterface( focusedElement );
-
-
-
-
+
-                return NS_ERROR_FAILURE;
-
-
-
-
-
-
-
-
-
-
-
+
-        if ( ! presShell )
-                return NS_ERROR_FAILURE;
@@ -711 +701 @@
-        nsCOMPtr< nsICaret > caret;
-        presShell->GetCaret( getter_AddRefs( caret ) );
+        if ( ! caret )
+                return NS_ERROR_FAILURE;
-
-        nsIFrame* frame = nsnull;
@@ -719 +711 @@
-        nsCOMPtr<nsISelectionController> selCtrl;
-        frame->GetSelectionController( presShell->GetPresContext(), getter_AddRefs( selCtrl ) );
+        if ( ! selCtrl )
+                return NS_ERROR_FAILURE;
-
-        nsCOMPtr<nsISelection> selection;
-        selCtrl->GetSelection( nsISelectionController::SELECTION_NORMAL, getter_AddRefs( selection ) );
+        if ( ! selection )
+                return NS_ERROR_FAILURE;
-
-        PRBool collapsed;
@@ -727 +723 @@
-        nsIView* caretView;
-        caret->GetCaretCoordinates( nsICaret::eTopLevelWindowCoordinates, selection, &coords, &collapsed, &caretView );
+        if ( ! caretView )
+                return NS_ERROR_FAILURE;
-
-        float twips2Pixls = presShell->GetPresContext()->TwipsToPixels();