Changeset 151403 in webkit

Timestamp:

Jun 10, 2013 2:32:35 PM (11 years ago)

Author:

andersca@apple.com

Message:

-[WKView _updateWindowAndViewFrames] should avoid updating the view frame in window coordinates if we don't have plugins
​https://bugs.webkit.org/show_bug.cgi?id=117420
<rdar://problem/14073034>

Reviewed by Tim Horton.

If plug-ins are disabled there's no need for the web process to know about the view frame in window coordinates so only
send it when plug-ins are enabled. In addition, if accessibility is disabled we don't need to send a message at all.

• UIProcess/API/mac/PageClientImpl.h:
• UIProcess/API/mac/PageClientImpl.mm:

(WebKit::PageClientImpl::preferencesDidChange):
Call through to -[WKView _preferencesDidChange].

• UIProcess/API/mac/WKView.mm:

(-[WKView _updateWindowAndViewFrames]):
Don't compute viewFrameInWindowCoordinates or accessibilityPosition unless they're required. If neither are required,
don't even send a message to the web process.

(-[WKView _preferencesDidChange]):
Update _needsViewFrameInWindowCoordinates and call -[WKView _updateWindowAndViewFrames] if needed.

(-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]):
Set _needsViewFrameInWindowCoordinates based on whether plug-ins are enabled or not.

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::preferencesDidChange):
Call the page client.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/PageClientImpl.h (modified) (1 diff)
• UIProcess/API/mac/PageClientImpl.mm (modified) (1 diff)
• UIProcess/API/mac/WKView.mm (modified) (5 diffs)
• UIProcess/API/mac/WKViewInternal.h (modified) (1 diff)
• UIProcess/PageClient.h (modified) (1 diff)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-06-10  Anders Carlsson  <andersca@apple.com>
+
+        -[WKView _updateWindowAndViewFrames] should avoid updating the view frame in window coordinates if we don't have plugins
+        https://bugs.webkit.org/show_bug.cgi?id=117420
+        <rdar://problem/14073034>
+
+        Reviewed by Tim Horton.
+
+        If plug-ins are disabled there's no need for the web process to know about the view frame in window coordinates so only
+        send it when plug-ins are enabled. In addition, if accessibility is disabled we don't need to send a message at all.
+
+        * UIProcess/API/mac/PageClientImpl.h:
+        * UIProcess/API/mac/PageClientImpl.mm:
+        (WebKit::PageClientImpl::preferencesDidChange):
+        Call through to -[WKView _preferencesDidChange].
+
+        * UIProcess/API/mac/WKView.mm:
+        (-[WKView _updateWindowAndViewFrames]):
+        Don't compute viewFrameInWindowCoordinates or accessibilityPosition unless they're required. If neither are required,
+        don't even send a message to the web process.
+
+        (-[WKView _preferencesDidChange]):
+        Update _needsViewFrameInWindowCoordinates and call -[WKView _updateWindowAndViewFrames] if needed.
+
+        (-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]):
+        Set _needsViewFrameInWindowCoordinates based on whether plug-ins are enabled or not.
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::preferencesDidChange):
+        Call the page client.
+
 2013-06-10  Bear Travis  <betravis@adobe.com>
 

trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.h

@@ -69 +69 @@
     virtual void pageClosed();
     virtual void didRelaunchProcess();
+    virtual void preferencesDidChange() OVERRIDE;
     virtual void toolTipChanged(const String& oldToolTip, const String& newToolTip);
     virtual void setCursor(const WebCore::Cursor&);

trunk/Source/WebKit2/UIProcess/API/mac/PageClientImpl.mm

@@ -259 +259 @@
 }
 
+void PageClientImpl::preferencesDidChange()
+{
+    [m_wkView _preferencesDidChange];
+}
+
 void PageClientImpl::toolTipChanged(const String& oldToolTip, const String& newToolTip)
 {

trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm

@@ -63 +63 @@
 #import "WebFullScreenManagerProxy.h"
 #import "WebPage.h"
+#import "WebPageGroup.h"
 #import "WebPageProxy.h"
+#import "WebPreferences.h"
 #import "WebProcessProxy.h"
 #import "WebSystemInterface.h"
@@ -217 +219 @@
     BOOL _viewInWindowChangeWasDeferred;
 
+    BOOL _needsViewFrameInWindowCoordinates;
     BOOL _didScheduleWindowAndViewFrameUpdate;
 
@@ -467 +470 @@
 
     dispatch_async(dispatch_get_main_queue(), ^{
-        NSRect viewFrameInWindowCoordinates = [self convertRect:[self frame] toView:nil];
-        NSPoint accessibilityPosition = NSMakePoint(0, 0);
+        _data->_didScheduleWindowAndViewFrameUpdate = NO;
+
+        if (!_data->_needsViewFrameInWindowCoordinates && !WebCore::AXObjectCache::accessibilityEnabled())
+            return;
+
+        NSRect viewFrameInWindowCoordinates = NSZeroRect;
+        NSPoint accessibilityPosition = NSZeroPoint;
+
+        if (_data->_needsViewFrameInWindowCoordinates)
+            viewFrameInWindowCoordinates = [self convertRect:self.frame toView:nil];
+
         if (WebCore::AXObjectCache::accessibilityEnabled())
             accessibilityPosition = [[self accessibilityAttributeValue:NSAccessibilityPositionAttribute] pointValue];
 
         _data->_page->windowAndViewFramesChanged(viewFrameInWindowCoordinates, accessibilityPosition);
-        _data->_didScheduleWindowAndViewFrameUpdate = NO;
     });
 }
@@ -2425 +2436 @@
 }
 
+- (void)_preferencesDidChange
+{
+    BOOL needsViewFrameInWindowCoordinates = _data->_page->pageGroup()->preferences()->pluginsEnabled();
+
+    if (!!needsViewFrameInWindowCoordinates == !!_data->_needsViewFrameInWindowCoordinates)
+        return;
+
+    _data->_needsViewFrameInWindowCoordinates = needsViewFrameInWindowCoordinates;
+    if ([self window])
+        [self _updateWindowAndViewFrames];
+}
+
 - (void)_setCursor:(NSCursor *)cursor
 {
@@ -3128 +3151 @@
 #endif
 
+    _data->_needsViewFrameInWindowCoordinates = _data->_page->pageGroup()->preferences()->pluginsEnabled();
     _data->_frameOrigin = NSZeroPoint;
     _data->_contentAnchor = WKContentAnchorTopLeft;

trunk/Source/WebKit2/UIProcess/API/mac/WKViewInternal.h

@@ -56 +56 @@
 - (void)_pageClosed;
 - (void)_didRelaunchProcess;
+- (void)_preferencesDidChange;
 - (void)_toolTipChangedFrom:(NSString *)oldToolTip to:(NSString *)newToolTip;
 - (void)_setCursor:(NSCursor *)cursor;

trunk/Source/WebKit2/UIProcess/PageClient.h

@@ -113 +113 @@
     virtual void pageClosed() = 0;
 
+    virtual void preferencesDidChange() = 0;
+
     virtual void toolTipChanged(const String&, const String&) = 0;
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -2146 +2146 @@
     m_process->pagePreferencesChanged(this);
 
+    m_pageClient->preferencesDidChange();
+
     // FIXME: It probably makes more sense to send individual preference changes.
     // However, WebKitTestRunner depends on getting a preference change notification