Changeset 167610 in webkit

Timestamp:

Apr 21, 2014 12:49:00 PM (10 years ago)

Author:

mitz@apple.com

Message:

[Cocoa] Expose WebPage::setDefersLoading
​https://bugs.webkit.org/show_bug.cgi?id=131943

Reviewed by Anders Carlsson, but he doesn’t like this.

• WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:

(-[WKWebProcessPlugInBrowserContextController _defersLoading]): Added this accessor.
(-[WKWebProcessPlugInBrowserContextController _setDefersLoading:]): Ditto.

• WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h:

Declared new property _defersLoading.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::defersLoading): Added this getter.

• WebProcess/WebPage/WebPage.h:

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm (modified) (1 diff)
• WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-21  Dan Bernstein  <mitz@apple.com>
+
+        [Cocoa] Expose WebPage::setDefersLoading
+        https://bugs.webkit.org/show_bug.cgi?id=131943
+
+        Reviewed by Anders Carlsson, but he doesn’t like this.
+
+        * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm:
+        (-[WKWebProcessPlugInBrowserContextController _defersLoading]): Added this accessor.
+        (-[WKWebProcessPlugInBrowserContextController _setDefersLoading:]): Ditto.
+        * WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h:
+        Declared new property _defersLoading.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::defersLoading): Added this getter.
+        * WebProcess/WebPage/WebPage.h:
+
 2014-04-21  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm

@@ -481 +481 @@
 }
 
+- (BOOL)_defersLoading
+{
+    return _page->defersLoading();
+}
+
+- (void)_setDefersLoading:(BOOL)defersLoading
+{
+    _page->setDefersLoading(defersLoading);
+}
+
 @end
 

trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h

@@ -44 +44 @@
 @property (weak, setter=_setFormDelegate:) id <WKWebProcessPlugInFormDelegatePrivate> _formDelegate;
 
+@property (nonatomic, setter=_setDefersLoading:) BOOL _defersLoading;
+
 + (instancetype)lookUpBrowsingContextFromHandle:(WKBrowsingContextHandle *)handle;
 

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

@@ -1041 +1041 @@
 }
 
+bool WebPage::defersLoading() const
+{
+    return m_page->defersLoading();
+}
+
 void WebPage::setDefersLoading(bool defersLoading)
 {

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

@@ -376 +376 @@
     void stopLoading();
     void stopLoadingFrame(uint64_t frameID);
+    bool defersLoading() const;
     void setDefersLoading(bool deferLoading);