Changeset 171320 in webkit

Timestamp:

Jul 21, 2014 4:44:33 PM (10 years ago)

Author:

Simon Fraser

Message:

[iOS WK2] Turn off position:fixed behavior when the keyboard is up
​https://bugs.webkit.org/show_bug.cgi?id=132537

Reviewed by Benjamin Poulain.

Source/WebCore:

Export RenderObject::localToContainerPoint().

• WebCore.exp.in:

Source/WebKit2:

Make interaction with form elements inside position:fixed less terrible by re-laying out
fixed elements relative to the document while we have an assisted node. This ensures
that all parts of a position:fixed are accessible (e.g. inputs on the right side
of a fixed-width top bar).

• Shared/AssistedNodeInformation.cpp: Add a flag for being inside postion:fixed,

and encode/decode it.
(WebKit::AssistedNodeInformation::encode):
(WebKit::AssistedNodeInformation::decode):

• Shared/AssistedNodeInformation.h:

(WebKit::AssistedNodeInformation::AssistedNodeInformation):

• UIProcess/PageClient.h: Add isAssistingNode().
• UIProcess/ios/PageClientImplIOS.h:
• UIProcess/ios/PageClientImplIOS.mm:

(WebKit::PageClientImpl::isAssistingNode):

• UIProcess/ios/WebPageProxyIOS.mm:

(WebKit::WebPageProxy::computeCustomFixedPositionRect): If we have an assisted
node, just use the document rect as the custom fixed position rect.

• WebProcess/WebPage/ios/WebPageIOS.mm:

(WebKit::WebPage::getAssistedNodeInformation): Get the selection rect first,
since we have to fix it up for position:fixed. If the element is inside fixed
position in the main frame, re-set the fixed position rect to the document rect
(which forces a layout), re-fetch elementRect, then set it back. This ensures
that the UI process gets an elementRect which it can zoom to correctly.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/AssistedNodeInformation.cpp (modified) (2 diffs)
• WebKit2/Shared/AssistedNodeInformation.h (modified) (2 diffs)
• WebKit2/UIProcess/PageClient.h (modified) (1 diff)
• WebKit2/UIProcess/ios/PageClientImplIOS.h (modified) (1 diff)
• WebKit2/UIProcess/ios/PageClientImplIOS.mm (modified) (1 diff)
• WebKit2/UIProcess/ios/WKContentViewInteraction.mm (modified) (2 diffs)
• WebKit2/UIProcess/ios/WebPageProxyIOS.mm (modified) (1 diff)
• WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-07-21  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS WK2] Turn off position:fixed behavior when the keyboard is up
+        https://bugs.webkit.org/show_bug.cgi?id=132537
+
+        Reviewed by Benjamin Poulain.
+
+        Export RenderObject::localToContainerPoint().
+
+        * WebCore.exp.in:
+
 2014-07-21  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -1614 +1614 @@
 __ZNK7WebCore12RenderObject16repaintRectangleERKNS_10LayoutRectEb
 __ZNK7WebCore12RenderObject20localToContainerQuadERKNS_9FloatQuadEPKNS_22RenderLayerModelObjectEjPb
+__ZNK7WebCore12RenderObject21localToContainerPointERKNS_10FloatPointEPKNS_22RenderLayerModelObjectEjPb
 __ZNK7WebCore12RenderObject23absoluteBoundingBoxRectEb
 __ZNK7WebCore12RenderObject39pixelSnappedAbsoluteClippedOverflowRectEv

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-07-21  Simon Fraser  <simon.fraser@apple.com>
+
+        [iOS WK2] Turn off position:fixed behavior when the keyboard is up
+        https://bugs.webkit.org/show_bug.cgi?id=132537
+
+        Reviewed by Benjamin Poulain.
+        
+        Make interaction with form elements inside position:fixed less terrible by re-laying out
+        fixed elements relative to the document while we have an assisted node. This ensures
+        that all parts of a position:fixed are accessible (e.g. inputs on the right side
+        of a fixed-width top bar).
+        
+        * Shared/AssistedNodeInformation.cpp: Add a flag for being inside postion:fixed,
+        and encode/decode it.
+        (WebKit::AssistedNodeInformation::encode):
+        (WebKit::AssistedNodeInformation::decode):
+        * Shared/AssistedNodeInformation.h:
+        (WebKit::AssistedNodeInformation::AssistedNodeInformation):
+        * UIProcess/PageClient.h: Add isAssistingNode().
+        * UIProcess/ios/PageClientImplIOS.h:
+        * UIProcess/ios/PageClientImplIOS.mm:
+        (WebKit::PageClientImpl::isAssistingNode):
+        * UIProcess/ios/WebPageProxyIOS.mm:
+        (WebKit::WebPageProxy::computeCustomFixedPositionRect): If we have an assisted
+        node, just use the document rect as the custom fixed position rect.
+        * WebProcess/WebPage/ios/WebPageIOS.mm:
+        (WebKit::WebPage::getAssistedNodeInformation): Get the selection rect first,
+        since we have to fix it up for position:fixed. If the element is inside fixed
+        position in the main frame, re-set the fixed position rect to the document rect
+        (which forces a layout), re-fetch elementRect, then set it back. This ensures
+        that the UI process gets an elementRect which it can zoom to correctly.
+
 2014-07-21  Timothy Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/Shared/AssistedNodeInformation.cpp

@@ -80 +80 @@
     encoder << isReadOnly;
     encoder << allowsUserScaling;
+    encoder << insideFixedPosition;
     encoder << value;
     encoder << valueAsNumber;
@@ -135 +136 @@
         return false;
 
+    if (!decoder.decode(result.insideFixedPosition))
+        return false;
+
     if (!decoder.decode(result.value))
         return false;

trunk/Source/WebKit2/Shared/AssistedNodeInformation.h

@@ -103 +103 @@
         , isReadOnly(false)
         , allowsUserScaling(false)
+        , insideFixedPosition(false)
         , autocapitalizeType(WebAutocapitalizeTypeDefault)
         , elementType(InputType::None)
@@ -121 +122 @@
     bool isReadOnly;
     bool allowsUserScaling;
+    bool insideFixedPosition;
     WebAutocapitalizeType autocapitalizeType;
     InputType elementType;

trunk/Source/WebKit2/UIProcess/PageClient.h

@@ -260 +260 @@
     virtual void startAssistingNode(const AssistedNodeInformation&, bool userIsInteracting, bool blurPreviousNode, API::Object* userData) = 0;
     virtual void stopAssistingNode() = 0;
+    virtual bool isAssistingNode() = 0;
     virtual void selectionDidChange() = 0;
     virtual bool interpretKeyEvent(const NativeWebKeyboardEvent&, bool isCharEvent) = 0;

trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h

@@ -120 +120 @@
     virtual void startAssistingNode(const AssistedNodeInformation&, bool userIsInteracting, bool blurPreviousNode, API::Object* userData) override;
     virtual void stopAssistingNode() override;
+    virtual bool isAssistingNode() override;
     virtual void selectionDidChange() override;
     virtual bool interpretKeyEvent(const NativeWebKeyboardEvent&, bool isCharEvent) override;

trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm

@@ -531 +531 @@
 }
 
+bool PageClientImpl::isAssistingNode()
+{
+    return [m_contentView isAssistingNode];
+}
+
 void PageClientImpl::stopAssistingNode()
 {

trunk/Source/WebKit2/UIProcess/ios/WKContentViewInteraction.mm

@@ -38 +38 @@
 #import "WKInspectorNodeSearchGestureRecognizer.h"
 #import "WKWebViewConfiguration.h"
+#import "WKWebViewInternal.h"
 #import "WKWebViewPrivate.h"
 #import "WebEvent.h"
@@ -2549 +2550 @@
         break;
     }
+    
+    if (information.insideFixedPosition)
+        [_webView _updateVisibleContentRects];
+
     [self reloadInputViews];
     [self _displayFormNodeInputView];

trunk/Source/WebKit2/UIProcess/ios/WebPageProxyIOS.mm

@@ -221 +221 @@
     FloatRect documentRect = FloatRect(FloatPoint(), contentsSize);
 
+    if (m_pageClient.isAssistingNode())
+        return documentRect;
+
     if (constraint == UnobscuredRectConstraint::ConstrainedToDocumentRect)
         constrainedUnobscuredRect.intersect(documentRect);

trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm

@@ -1990 +1990 @@
     layoutIfNeeded();
 
+    // FIXME: This should return the selection rect, but when this is called at focus time
+    // we don't have a selection yet. Using the last interaction location is a reasonable approximation for now.
+    // FIXME: should the selection rect always be inside the elementRect?
+    information.selectionRect = IntRect(m_lastInteractionLocation, IntSize(1, 1));
+
     if (RenderObject* renderer = m_assistedNode->renderer()) {
-        information.elementRect = m_page->focusController().focusedOrMainFrame().view()->contentsToRootView(renderer->absoluteBoundingBoxRect());
+        Frame& elementFrame = m_page->focusController().focusedOrMainFrame();
+        information.elementRect = elementFrame.view()->contentsToRootView(renderer->absoluteBoundingBoxRect());
         information.nodeFontSize = renderer->style().fontDescription().computedSize();
+
+        bool inFixed = false;
+        renderer->localToContainerPoint(FloatPoint(), nullptr, 0, &inFixed);
+        information.insideFixedPosition = inFixed;
+        
+        if (inFixed && elementFrame.isMainFrame()) {
+            FrameView* frameView = elementFrame.view();
+            IntRect currentFixedPositionRect = frameView->customFixedPositionLayoutRect();
+            frameView->setCustomFixedPositionLayoutRect(frameView->renderView()->documentRect());
+            information.elementRect = frameView->contentsToRootView(renderer->absoluteBoundingBoxRect());
+            frameView->setCustomFixedPositionLayoutRect(currentFixedPositionRect);
+            
+            if (!information.elementRect.contains(information.selectionRect))
+                information.selectionRect.setLocation(information.elementRect.location());
+        }
     } else
         information.elementRect = IntRect();
-    // FIXME: This should return the selection rect, but when this is called at focus time
-    // we don't have a selection yet. Using the last interaction location is a reasonable approximation for now.
-    information.selectionRect = IntRect(m_lastInteractionLocation, IntSize(1, 1));
+
     information.minimumScaleFactor = m_viewportConfiguration.minimumScale();
     information.maximumScaleFactor = m_viewportConfiguration.maximumScale();