Changeset 211312 in webkit

Timestamp:

Jan 27, 2017 4:33:17 PM (7 years ago)

Author:

achristensen@apple.com

Message:

Move smartInsertDeleteEnabled to WebPageCreationParameters
​https://bugs.webkit.org/show_bug.cgi?id=167530

Reviewed by Brady Eidson.

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

(WebKit::WebPageProxy::initializeWebPage):
(WebKit::WebPageProxy::creationParameters):

• WebProcess/WebCoreSupport/WebChromeClient.cpp:

(WebKit::WebChromeClient::createWindow):

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::create):
(WebKit::WebPage::WebPage):
(WebKit::m_userInterfaceLayoutDirection):
(WebKit::WebPage::reinitializeWebPage):

• WebProcess/WebPage/WebPage.h:
• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::createWebPage):

• WebProcess/WebProcess.h:

Instead of making a WebPage then immediately sending it a message to set smartInsertDeleteEnabled,
just call setSmartInsertDeleteEnabled at the end of the WebPage creation. No change in behaviour.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/WebPageCreationParameters.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (2 diffs)
• WebProcess/WebCoreSupport/WebChromeClient.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (3 diffs)
• WebProcess/WebPage/WebPage.h (modified) (2 diffs)
• WebProcess/WebProcess.cpp (modified) (2 diffs)
• WebProcess/WebProcess.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-01-27  Alex Christensen  <achristensen@webkit.org>
+
+        Move smartInsertDeleteEnabled to WebPageCreationParameters
+        https://bugs.webkit.org/show_bug.cgi?id=167530
+
+        Reviewed by Brady Eidson.
+
+        * Shared/WebPageCreationParameters.h:
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::initializeWebPage):
+        (WebKit::WebPageProxy::creationParameters):
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::createWindow):
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::create):
+        (WebKit::WebPage::WebPage):
+        (WebKit::m_userInterfaceLayoutDirection):
+        (WebKit::WebPage::reinitializeWebPage):
+        * WebProcess/WebPage/WebPage.h:
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::createWebPage):
+        * WebProcess/WebProcess.h:
+        Instead of making a WebPage then immediately sending it a message to set smartInsertDeleteEnabled,
+        just call setSmartInsertDeleteEnabled at the end of the WebPage creation.  No change in behaviour.
+
 2017-01-27  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebKit2/Shared/WebPageCreationParameters.h

@@ -136 +136 @@
     bool ignoresViewportScaleLimits;
 #endif
+#if PLATFORM(COCOA)
+    bool smartInsertDeleteEnabled;
+#endif
     bool appleMailPaginationQuirkEnabled;
     bool shouldScaleViewToFitDocument;

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -818 +818 @@
     process().send(Messages::WebProcess::CreateWebPage(m_pageID, creationParameters()), 0);
 
-#if PLATFORM(COCOA)
-    send(Messages::WebPage::SetSmartInsertDeleteEnabled(m_isSmartInsertDeleteEnabled));
-#endif
-
     m_needsToFinishInitializingWebPageAfterProcessLaunch = true;
     finishInitializingWebPageAfterProcessLaunch();
@@ -5583 +5579 @@
     parameters.appleMailPaginationQuirkEnabled = false;
 #endif
+#if PLATFORM(COCOA)
+    parameters.smartInsertDeleteEnabled = m_isSmartInsertDeleteEnabled;
+#endif
     parameters.shouldScaleViewToFitDocument = m_shouldScaleViewToFitDocument;
     parameters.userInterfaceLayoutDirection = m_pageClient.userInterfaceLayoutDirection();

trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

@@ -258 +258 @@
         return nullptr;
 
-    webProcess.createWebPage(newPageID, parameters);
+    webProcess.createWebPage(newPageID, WTFMove(parameters));
     return webProcess.webPage(newPageID)->corePage();
 }

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

@@ -315 +315 @@
 DEFINE_DEBUG_ONLY_GLOBAL(WTF::RefCountedLeakCounter, webPageCounter, ("WebPage"));
 
-Ref<WebPage> WebPage::create(uint64_t pageID, const WebPageCreationParameters& parameters)
-{
-    Ref<WebPage> page = adoptRef(*new WebPage(pageID, parameters));
+Ref<WebPage> WebPage::create(uint64_t pageID, WebPageCreationParameters&& parameters)
+{
+    Ref<WebPage> page = adoptRef(*new WebPage(pageID, WTFMove(parameters)));
 
     if (page->pageGroup()->isVisibleToInjectedBundle() && WebProcess::singleton().injectedBundle())
@@ -325 +325 @@
 }
 
-WebPage::WebPage(uint64_t pageID, const WebPageCreationParameters& parameters)
+WebPage::WebPage(uint64_t pageID, WebPageCreationParameters&& parameters)
     : m_pageID(pageID)
     , m_viewSize(parameters.viewSize)
@@ -559 +559 @@
 #if PLATFORM(COCOA)
     m_page->settings().setContentDispositionAttachmentSandboxEnabled(true);
-#endif
-}
-
-void WebPage::reinitializeWebPage(const WebPageCreationParameters& parameters)
+    setSmartInsertDeleteEnabled(parameters.smartInsertDeleteEnabled);
+#endif
+}
+
+void WebPage::reinitializeWebPage(WebPageCreationParameters&& parameters)
 {
     if (m_activityState != parameters.activityState)

trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h

@@ -215 +215 @@
 class WebPage : public API::ObjectImpl<API::Object::Type::BundlePage>, public IPC::MessageReceiver, public IPC::MessageSender {
 public:
-    static Ref<WebPage> create(uint64_t pageID, const WebPageCreationParameters&);
+    static Ref<WebPage> create(uint64_t pageID, WebPageCreationParameters&&);
     virtual ~WebPage();
 
-    void reinitializeWebPage(const WebPageCreationParameters&);
+    void reinitializeWebPage(WebPageCreationParameters&&);
 
     void close();
@@ -978 +978 @@
 
 private:
-    WebPage(uint64_t pageID, const WebPageCreationParameters&);
+    WebPage(uint64_t pageID, WebPageCreationParameters&&);
 
     void updateThrottleState();

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -556 +556 @@
 }
 
-void WebProcess::createWebPage(uint64_t pageID, const WebPageCreationParameters& parameters)
+void WebProcess::createWebPage(uint64_t pageID, WebPageCreationParameters&& parameters)
 {
     // It is necessary to check for page existence here since during a window.open() (or targeted
@@ -563 +563 @@
     if (result.isNewEntry) {
         ASSERT(!result.iterator->value);
-        result.iterator->value = WebPage::create(pageID, parameters);
+        result.iterator->value = WebPage::create(pageID, WTFMove(parameters));
 
         // Balanced by an enableTermination in removeWebPage.
         disableTermination();
     } else
-        result.iterator->value->reinitializeWebPage(parameters);
+        result.iterator->value->reinitializeWebPage(WTFMove(parameters));
 
     ASSERT(result.iterator->value);

trunk/Source/WebKit2/WebProcess/WebProcess.h

@@ -117 +117 @@
 
     WebPage* webPage(uint64_t pageID) const;
-    void createWebPage(uint64_t pageID, const WebPageCreationParameters&);
+    void createWebPage(uint64_t pageID, WebPageCreationParameters&&);
     void removeWebPage(uint64_t pageID);
     WebPage* focusedWebPage() const;