Title: [167610] trunk/Source/WebKit2
- Revision
- 167610
- Author
- [email protected]
- Date
- 2014-04-21 12:49:00 -0700 (Mon, 21 Apr 2014)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (167609 => 167610)
--- trunk/Source/WebKit2/ChangeLog 2014-04-21 19:48:12 UTC (rev 167609)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-21 19:49:00 UTC (rev 167610)
@@ -1,3 +1,20 @@
+2014-04-21 Dan Bernstein <[email protected]>
+
+ [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 <[email protected]>
Remove unused WebKitSystemInterface functions
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm (167609 => 167610)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2014-04-21 19:48:12 UTC (rev 167609)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextController.mm 2014-04-21 19:49:00 UTC (rev 167610)
@@ -480,6 +480,16 @@
_page->setInjectedBundleFormClient(nullptr);
}
+- (BOOL)_defersLoading
+{
+ return _page->defersLoading();
+}
+
+- (void)_setDefersLoading:(BOOL)defersLoading
+{
+ _page->setDefersLoading(defersLoading);
+}
+
@end
#endif // WK_API_ENABLED
Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h (167609 => 167610)
--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h 2014-04-21 19:48:12 UTC (rev 167609)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/mac/WKWebProcessPlugInBrowserContextControllerPrivate.h 2014-04-21 19:49:00 UTC (rev 167610)
@@ -43,6 +43,8 @@
@property (weak, setter=_setFormDelegate:) id <WKWebProcessPlugInFormDelegatePrivate> _formDelegate;
+@property (nonatomic, setter=_setDefersLoading:) BOOL _defersLoading;
+
+ (instancetype)lookUpBrowsingContextFromHandle:(WKBrowsingContextHandle *)handle;
@end
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (167609 => 167610)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-21 19:48:12 UTC (rev 167609)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-04-21 19:49:00 UTC (rev 167610)
@@ -1040,6 +1040,11 @@
corePage()->userInputBridge().stopLoadingFrame(m_mainFrame->coreFrame());
}
+bool WebPage::defersLoading() const
+{
+ return m_page->defersLoading();
+}
+
void WebPage::setDefersLoading(bool defersLoading)
{
m_page->setDefersLoading(defersLoading);
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (167609 => 167610)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-04-21 19:48:12 UTC (rev 167609)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-04-21 19:49:00 UTC (rev 167610)
@@ -375,6 +375,7 @@
void stopLoading();
void stopLoadingFrame(uint64_t frameID);
+ bool defersLoading() const;
void setDefersLoading(bool deferLoading);
void enterAcceleratedCompositingMode(WebCore::GraphicsLayer*);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
