Changeset 167861 in webkit

Timestamp:

Apr 27, 2014 1:43:52 PM (10 years ago)

Author:

weinig@apple.com

Message:

[iOS WebKit2] Add support for text autosizing
<rdar://problem/16545245>
​https://bugs.webkit.org/show_bug.cgi?id=132237

Reviewed by Tim Horton.

../WebCore:
Move text autosizing width from Frame to Page, as it is a Page level concept.

• WebCore.exp.in:
• page/Frame.cpp:

(WebCore::Frame::textAutosizingWidth): Deleted.
(WebCore::Frame::setTextAutosizingWidth): Deleted.

• page/Frame.h:
• page/FrameView.cpp:

(WebCore::FrameView::layout):

• page/Page.cpp:

(WebCore::Page::Page):

• page/Page.h:

(WebCore::Page::textAutosizingWidth):
(WebCore::Page::setTextAutosizingWidth):

../WebKit/mac:

• WebView/WebFrame.mm:

(-[WebFrame _setTextAutosizingWidth:]):
Forward setting of the text autosizing width to the Page.

../WebKit2:

• Shared/WebPageCreationParameters.cpp:

(WebKit::WebPageCreationParameters::encode):
(WebKit::WebPageCreationParameters::decode):

• Shared/WebPageCreationParameters.h:
• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::creationParameters):

• UIProcess/WebPageProxy.h:
• UIProcess/ios/WebPageProxyIOS.mm:

(WebKit::WebPageProxy::textAutosizingWidth):

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::WebPage):
Pass the text autosizing width from the UIProcess to WebProcess.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (1 diff)
• WebCore/page/Frame.cpp (modified) (1 diff)
• WebCore/page/Frame.h (modified) (2 diffs)
• WebCore/page/FrameView.cpp (modified) (1 diff)
• WebCore/page/Page.cpp (modified) (2 diffs)
• WebCore/page/Page.h (modified) (2 diffs)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/WebView/WebFrame.mm (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/Shared/WebPageCreationParameters.cpp (modified) (2 diffs)
• WebKit2/Shared/WebPageCreationParameters.h (modified) (1 diff)
• WebKit2/UIProcess/WebPageProxy.cpp (modified) (1 diff)
• WebKit2/UIProcess/WebPageProxy.h (modified) (1 diff)
• WebKit2/UIProcess/ios/WebPageProxyIOS.mm (modified) (1 diff)
• WebKit2/WebProcess/WebPage/WebPage.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-27  Sam Weinig  <sam@webkit.org>
+
+        [iOS WebKit2] Add support for text autosizing
+        <rdar://problem/16545245>
+        https://bugs.webkit.org/show_bug.cgi?id=132237
+
+        Reviewed by Tim Horton.
+
+        Move text autosizing width from Frame to Page, as it is a Page level concept.
+
+        * WebCore.exp.in:
+        * page/Frame.cpp:
+        (WebCore::Frame::textAutosizingWidth): Deleted.
+        (WebCore::Frame::setTextAutosizingWidth): Deleted.
+        * page/Frame.h:
+        * page/FrameView.cpp:
+        (WebCore::FrameView::layout):
+        * page/Page.cpp:
+        (WebCore::Page::Page):
+        * page/Page.h:
+        (WebCore::Page::textAutosizingWidth):
+        (WebCore::Page::setTextAutosizingWidth):
+
 2014-04-27  Zan Dobersek  <zdobersek@igalia.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -3114 +3114 @@
 #if ENABLE(IOS_TEXT_AUTOSIZING)
 __ZN7WebCore12RenderObject19resetTextAutosizingEv
-__ZN7WebCore5Frame22setTextAutosizingWidthEf
 #endif
 

trunk/Source/WebCore/page/Frame.cpp

@@ -486 +486 @@
 }
 
-#if ENABLE(IOS_TEXT_AUTOSIZING)
-float Frame::textAutosizingWidth() const
-{
-    return m_textAutosizingWidth;
-}
-
-void Frame::setTextAutosizingWidth(float width)
-{
-    m_textAutosizingWidth = width;
-}
-#endif
-
 #if PLATFORM(IOS)
 void Frame::scrollOverflowLayer(RenderLayer* layer, const IntRect& visibleRect, const IntRect& exposeRect)

trunk/Source/WebCore/page/Frame.h

@@ -241 +241 @@
         String matchLabelsAgainstElement(const Vector<String>& labels, Element*);
 
-#if ENABLE(IOS_TEXT_AUTOSIZING)
-        void setTextAutosizingWidth(float);
-        float textAutosizingWidth() const;
-#endif
-
 #if PLATFORM(IOS)
         // Scroll the selection in an overflow layer on iOS.
@@ -326 +321 @@
 #endif
 
-#if ENABLE(IOS_TEXT_AUTOSIZING)
-        float m_textAutosizingWidth;
-#endif
-
         float m_pageZoomFactor;
         float m_textZoomFactor;

trunk/Source/WebCore/page/FrameView.cpp

@@ -1286 +1286 @@
 #if ENABLE(IOS_TEXT_AUTOSIZING)
         float minZoomFontSize = frame().settings().minimumZoomFontSize();
-        float visWidth = frame().page()->mainFrame().textAutosizingWidth();
+        float visWidth = frame().page()->textAutosizingWidth();
         if (minZoomFontSize && visWidth && !root->view().printing()) {
             root->adjustComputedFontSizesOnBlocks(minZoomFontSize, visWidth);    

trunk/Source/WebCore/page/Page.cpp

@@ -163 +163 @@
     , m_deviceScaleFactor(1)
     , m_topContentInset(0)
+#if ENABLE(IOS_TEXT_AUTOSIZING)
+    , m_textAutosizingWidth(0)
+#endif
     , m_suppressScrollbarAnimations(false)
     , m_verticalScrollElasticity(ScrollElasticityAllowed)
@@ -784 +787 @@
         view->topContentInsetDidChange();
 }
-    
+
 void Page::setShouldSuppressScrollbarAnimations(bool suppressAnimations)
 {

trunk/Source/WebCore/page/Page.h

@@ -283 +283 @@
     float topContentInset() const { return m_topContentInset; }
     void setTopContentInset(float);
-
+    
+#if ENABLE(IOS_TEXT_AUTOSIZING)
+    float textAutosizingWidth() const { return m_textAutosizingWidth; }
+    void setTextAutosizingWidth(float textAutosizingWidth) { m_textAutosizingWidth = textAutosizingWidth; }
+#endif
+    
     bool shouldSuppressScrollbarAnimations() const { return m_suppressScrollbarAnimations; }
     void setShouldSuppressScrollbarAnimations(bool suppressAnimations);
@@ -505 +510 @@
 
     float m_topContentInset;
-
+    
+#if ENABLE(IOS_TEXT_AUTOSIZING)
+    float m_textAutosizingWidth;
+#endif
+    
     bool m_suppressScrollbarAnimations;
     

trunk/Source/WebKit/mac/ChangeLog

@@ +1 @@
+2014-04-27  Sam Weinig  <sam@webkit.org>
+
+        [iOS WebKit2] Add support for text autosizing
+        <rdar://problem/16545245>
+        https://bugs.webkit.org/show_bug.cgi?id=132237
+
+        Reviewed by Tim Horton.
+
+        * WebView/WebFrame.mm:
+        (-[WebFrame _setTextAutosizingWidth:]):
+        Forward setting of the text autosizing width to the Page.
+
 2014-04-25  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebKit/mac/WebView/WebFrame.mm

@@ -1916 +1916 @@
 - (void)_setTextAutosizingWidth:(CGFloat)width
 {
-    WebCore::Frame *frame = core(self);
-    frame->setTextAutosizingWidth(width);
+    WebCore::Frame* frame = core(self);
+    Page* page = frame->page();
+    if (!page)
+        return;
+
+    page->setTextAutosizingWidth(width);
 }
 #else

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-27  Sam Weinig  <sam@webkit.org>
+
+        [iOS WebKit2] Add support for text autosizing
+        <rdar://problem/16545245>
+        https://bugs.webkit.org/show_bug.cgi?id=132237
+
+        Reviewed by Tim Horton.
+
+        * Shared/WebPageCreationParameters.cpp:
+        (WebKit::WebPageCreationParameters::encode):
+        (WebKit::WebPageCreationParameters::decode):
+        * Shared/WebPageCreationParameters.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::creationParameters):
+        * UIProcess/WebPageProxy.h:
+        * UIProcess/ios/WebPageProxyIOS.mm:
+        (WebKit::WebPageProxy::textAutosizingWidth):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::WebPage):
+        Pass the text autosizing width from the UIProcess to WebProcess.
+
 2014-04-27  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/Shared/WebPageCreationParameters.cpp

@@ -74 +74 @@
     encoder << screenSize;
     encoder << availableScreenSize;
+    encoder << textAutosizingWidth;
 #endif
 }
@@ -155 +156 @@
     if (!decoder.decode(parameters.availableScreenSize))
         return false;
+    if (!decoder.decode(parameters.textAutosizingWidth))
+        return false;
 #endif
 

trunk/Source/WebKit2/Shared/WebPageCreationParameters.h

@@ -116 +116 @@
     WebCore::FloatSize screenSize;
     WebCore::FloatSize availableScreenSize;
+    float textAutosizingWidth;
 #endif
 };

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -4248 +4248 @@
     parameters.screenSize = screenSize();
     parameters.availableScreenSize = availableScreenSize();
+    parameters.textAutosizingWidth = textAutosizingWidth();
 #endif
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.h

@@ -1351 +1351 @@
     WebCore::FloatSize screenSize();
     WebCore::FloatSize availableScreenSize();
-
+    float textAutosizingWidth();
 
     void dynamicViewportUpdateChangedTarget(double newTargetScale, const WebCore::FloatPoint& newScrollPosition);

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

@@ -478 +478 @@
     return FloatSize(WKGetAvailableScreenSize());
 }
-
+    
+float WebPageProxy::textAutosizingWidth()
+{
+    return WKGetScreenSize().width;
+}
+    
 void WebPageProxy::dynamicViewportUpdateChangedTarget(double newScale, const WebCore::FloatPoint& newScrollPosition)
 {

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

@@ -381 +381 @@
     m_page->setGroupName(m_pageGroup->identifier());
     m_page->setDeviceScaleFactor(parameters.deviceScaleFactor);
+#if PLATFORM(IOS)
+    m_page->setTextAutosizingWidth(parameters.textAutosizingWidth);
+#endif
 
     updatePreferences(parameters.store);