Changeset 19594

Timestamp:

01/31/12 18:19:36 (4 months ago)

Author:

sam

Message:

scenari-release.patch compat avec Geko 10.0

File:

• trunk/Lib_XulRunner/bui/patches/scenari-release.patch (modified) (11 diffs)

trunk/Lib_XulRunner/bui/patches/scenari-release.patch

@@ -13 +13 @@
 +nsAutoString nsHTMLEditor::GetUserSelectStyle(nsIDOMNode *aNode)  
 +{
-+       nsAutoString mozUserSelectValue;
-+       mHTMLCSSUtils->GetComputedProperty(aNode, nsEditProperty::cssMozUserSelect, mozUserSelectValue);
-+       return mozUserSelectValue;
++  nsAutoString mozUserSelectValue;
++  mHTMLCSSUtils->GetComputedProperty(aNode, nsEditProperty::cssMozUserSelect, mozUserSelectValue);
++  return mozUserSelectValue;
 +}
 +
- NS_IMETHODIMP_(PRBool)
+ NS_IMETHODIMP_(bool)
  nsHTMLEditor::IsModifiableNode(nsIDOMNode *aNode)
  {
@@ -43 +43 @@
  }
  
- PRBool 
+ bool 
  nsHTMLEditor::IsContainer(nsIDOMNode *aNode)
  {
@@ -57 +57 @@
                                nsCOMPtr<nsIDOMNode> *ioParent, 
                                PRInt32 *ioOffset, 
-                               PRBool aNoEmptyNodes);
+                               bool aNoEmptyNodes);
    already_AddRefed<nsIDOMNode> FindUserSelectAllNode(nsIDOMNode* aNode);
 +  nsAutoString GetUserSelectStyle(nsIDOMNode *aNode);
@@ -71 +71 @@
 --- a/editor/libeditor/html/nsHTMLEditorEventListener.cpp
 +++ b/editor/libeditor/html/nsHTMLEditorEventListener.cpp
-@@ -235,17 +235,25 @@ nsHTMLEditorEventListener::MouseDown(nsI
+@@ -228,17 +228,25 @@ nsHTMLEditorEventListener::MouseDown(nsI
          }
  
@@ -124 +124 @@
 --- a/extensions/spellcheck/src/mozInlineSpellChecker.cpp
 +++ b/extensions/spellcheck/src/mozInlineSpellChecker.cpp
-@@ -632,18 +632,18 @@ mozInlineSpellChecker::CanEnableInlineSp
+@@ -640,18 +640,18 @@ mozInlineSpellChecker::UpdateCanEnableIn
  nsresult
  mozInlineSpellChecker::RegisterEventListeners()
@@ -143 +143 @@
  
    piTarget->AddEventListener(NS_LITERAL_STRING("blur"), this,
-                              PR_TRUE, PR_FALSE);
+                              true, false);
    piTarget->AddEventListener(NS_LITERAL_STRING("click"), this,
-@@ -658,18 +658,18 @@ mozInlineSpellChecker::RegisterEventList
+@@ -666,18 +666,18 @@ mozInlineSpellChecker::RegisterEventList
  nsresult
  mozInlineSpellChecker::UnregisterEventListeners()
@@ -163 +163 @@
    NS_ENSURE_TRUE(piTarget, NS_ERROR_NULL_POINTER);
  
-   piTarget->RemoveEventListener(NS_LITERAL_STRING("blur"), this, PR_TRUE);
-   piTarget->RemoveEventListener(NS_LITERAL_STRING("click"), this, PR_FALSE);
-   piTarget->RemoveEventListener(NS_LITERAL_STRING("keypress"), this, PR_FALSE);
-@@ -1684,30 +1684,30 @@ NS_IMETHODIMP mozInlineSpellChecker::Han
+   piTarget->RemoveEventListener(NS_LITERAL_STRING("blur"), this, true);
+   piTarget->RemoveEventListener(NS_LITERAL_STRING("click"), this, false);
+   piTarget->RemoveEventListener(NS_LITERAL_STRING("keypress"), this, false);
+@@ -1747,30 +1747,30 @@ NS_IMETHODIMP mozInlineSpellChecker::Han
    }
  
@@ -175 +175 @@
  {
    // force spellcheck on blur, for instance when tabbing out of a textbox
--  HandleNavigationEvent(PR_TRUE);
-+  HandleNavigationEvent(PR_TRUE, 0);
+-  HandleNavigationEvent(true);
++  HandleNavigationEvent(true, 0);
    return NS_OK;
  }
@@ -199 +199 @@
    NS_ENSURE_TRUE(keyEvent, NS_OK);
  
-@@ -1722,14 +1722,14 @@ nsresult mozInlineSpellChecker::KeyPress
-       HandleNavigationEvent(PR_FALSE, keyCode == nsIDOMKeyEvent::DOM_VK_RIGHT ? 1 : -1);
+@@ -1785,17 +1785,17 @@ nsresult mozInlineSpellChecker::KeyPress
+       HandleNavigationEvent(false, keyCode == nsIDOMKeyEvent::DOM_VK_RIGHT ? 1 : -1);
        break;
      case nsIDOMKeyEvent::DOM_VK_UP:
@@ -208 +208 @@
      case nsIDOMKeyEvent::DOM_VK_PAGE_UP:
      case nsIDOMKeyEvent::DOM_VK_PAGE_DOWN:
--      HandleNavigationEvent(PR_TRUE /* force a spelling correction */);
-+      HandleNavigationEvent(PR_TRUE /* force a spelling correction */, 0);
+-      HandleNavigationEvent(true /* force a spelling correction */);
++      HandleNavigationEvent(true /* force a spelling correction */, 0);
        break;
    }
@@ -215 +215 @@
    return NS_OK;
  }
+ 
+ NS_IMETHODIMP mozInlineSpellChecker::UpdateCurrentDictionary()
+ {
 diff --git a/extensions/spellcheck/src/mozInlineSpellChecker.h b/extensions/spellcheck/src/mozInlineSpellChecker.h
 --- a/extensions/spellcheck/src/mozInlineSpellChecker.h
 +++ b/extensions/spellcheck/src/mozInlineSpellChecker.h
-@@ -281,17 +281,18 @@ public:
+@@ -292,17 +292,18 @@ public:
  
    nsresult MakeSpellCheckRange(nsIDOMNode* aStartNode, PRInt32 aStartOffset,
                                 nsIDOMNode* aEndNode, PRInt32 aEndOffset,
-                                nsIDOMRange** aRange);
+                                nsIRange** aRange);
  
    // DOM and editor event registration helper routines
    nsresult RegisterEventListeners();
    nsresult UnregisterEventListeners();
--  nsresult HandleNavigationEvent(PRBool aForceWordSpellCheck, PRInt32 aNewPositionOffset = 0);
+-  nsresult HandleNavigationEvent(bool aForceWordSpellCheck, PRInt32 aNewPositionOffset = 0);
 +  //Added to IDL
-+  //nsresult HandleNavigationEvent(PRBool aForceWordSpellCheck, PRInt32 aNewPositionOffset = 0);
++  //nsresult HandleNavigationEvent(bool aForceWordSpellCheck, PRInt32 aNewPositionOffset = 0);
  
    nsresult GetSpellCheckSelection(nsISelection ** aSpellCheckSelection);