Changeset 83814 in webkit

Timestamp:

Apr 13, 2011 10:40:09 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-13 Jon Lee <​jonlee@apple.com>

Reviewed by Maciej Stachowiak.

REGRESSION(r81880): Paste menu is disabled for many edit fields (yahoo and google search, yahoo mail msg, forms, etc)
​https://bugs.webkit.org/show_bug.cgi?id=58284
<rdar://problem/9246149>

• WebCore.exp.in: Exporting EditingBehavior.h for use in WebKit2
• editing/EditingBehavior.h: (WebCore::EditingBehavior::shouldClearSelectionWhenLosingWebPageFocus): moving the platform-specific code out of an #ifdef and into this class for run-time instead of compile-time checking

2011-04-13 Jon Lee <​jonlee@apple.com>

Reviewed by Maciej Stachowiak.

REGRESSION(r81880): Paste menu is disabled for many edit fields (yahoo and google search, yahoo mail msg, forms, etc)
​https://bugs.webkit.org/show_bug.cgi?id=58284
<rdar://problem/9246149>

• WebProcess/WebPage/WebPage.cpp: (WebKit::WebPage::setFocused): Check for whether we are not supposed to be focused AND whether our platform behavior dictates to clear out the selection

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/editing/EditingBehavior.h (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-13  Jon Lee  <jonlee@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        REGRESSION(r81880): Paste menu is disabled for many edit fields (yahoo and google search, yahoo mail msg, forms, etc)
+        https://bugs.webkit.org/show_bug.cgi?id=58284
+        <rdar://problem/9246149>
+
+        * WebCore.exp.in: Exporting EditingBehavior.h for use in WebKit2
+        * editing/EditingBehavior.h:
+        (WebCore::EditingBehavior::shouldClearSelectionWhenLosingWebPageFocus): moving the platform-specific code out of an #ifdef and into this class for run-time instead of compile-time checking
+
 2011-04-13  Yael Aharon  <yael.aharon@nokia.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -1220 +1220 @@
 __ZNK7WebCore6Chrome12createWindowEPNS_5FrameERKNS_16FrameLoadRequestERKNS_14WindowFeaturesERKNS_16NavigationActionE
 __ZNK7WebCore6Cursor14platformCursorEv
+__ZNK7WebCore6Editor8behaviorEv
 __ZNK7WebCore6Editor12selectedTextEv
 __ZNK7WebCore6Editor13canEditRichlyEv

trunk/Source/WebCore/editing/EditingBehavior.h

@@ -60 +60 @@
     // On Mac, when processing a contextual click, the object being clicked upon should be selected.
     bool shouldSelectOnContextualMenuClick() const { return m_type == EditingMacBehavior; }
+    
+    // On Mac, when the web view loses focus, any active selection clears. On Windows, the selection
+    // should remain highlighted, just in an inactive state.
+    bool shouldClearSelectionWhenLosingWebPageFocus() const { return m_type == EditingMacBehavior; }
 
 private:

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-13  Jon Lee  <jonlee@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+
+        REGRESSION(r81880): Paste menu is disabled for many edit fields (yahoo and google search, yahoo mail msg, forms, etc)
+        https://bugs.webkit.org/show_bug.cgi?id=58284
+        <rdar://problem/9246149>
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::setFocused): Check for whether we are not supposed to be focused AND whether our platform behavior dictates to clear out the selection
+
 2011-04-13  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -80 +80 @@
 #include <WebCore/DragController.h>
 #include <WebCore/DragData.h>
+#include <WebCore/EditingBehavior.h>
 #include <WebCore/EventHandler.h>
 #include <WebCore/FocusController.h>
@@ -1146 +1147 @@
 void WebPage::setFocused(bool isFocused)
 {
-    if (!isFocused)
+    if (!isFocused && m_page->focusController()->focusedOrMainFrame()->editor()->behavior().shouldClearSelectionWhenLosingWebPageFocus())
         m_page->focusController()->focusedOrMainFrame()->selection()->clear();
+
     m_page->focusController()->setFocused(isFocused);
 }