Changeset 102652 in webkit
- Timestamp:
- Dec 12, 2011 7:08:19 PM (12 years ago)
- Location:
- trunk/Source
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r102651 r102652 1 2011-12-12 Andreas Kling <kling@webkit.org> 2 3 Resizing Cappuccino is very laggy on WebKit since Safari 5.1 4 <http://webkit.org/b/71354> and <rdar://problem/10565998> 5 6 Reviewed by Anders Carlsson. 7 8 * WebCore.exp.in: Export FloatPoint(const NSPoint&) 9 1 10 2011-12-12 Jarred Nicholls <jarred@sencha.com> 2 11 -
trunk/Source/WebCore/WebCore.exp.in
r102627 r102652 141 141 __ZN7WebCore10CredentialC1ERKN3WTF6StringES4_NS_21CredentialPersistenceE 142 142 __ZN7WebCore10CredentialC1Ev 143 __ZN7WebCore10FloatPointC1ERK8_NSPoint 143 144 __ZN7WebCore10FloatPointC1ERKNS_8IntPointE 144 145 __ZN7WebCore10JSDocument6s_infoE -
trunk/Source/WebKit2/ChangeLog
r102640 r102652 1 2011-12-12 Andreas Kling <kling@webkit.org> 2 3 Resizing Cappuccino is very laggy on WebKit since Safari 5.1 4 <http://webkit.org/b/71354> and <rdar://problem/10565998> 5 6 Reviewed by Anders Carlsson. 7 8 On Mac, we already cache the window rect through the WindowAndViewFramesChanged 9 message, so simply return that in WebChromeClient::windowRect() instead of 10 sending a synchronous query to the UIProcess. 11 12 Changed WindowAndViewFramesChanged to pass FloatRect/FloatPoint rather than 13 IntRect/IntPoint to match the ChromeClient::windowRect() return type. 14 15 * UIProcess/API/mac/WKView.mm: 16 (-[WKView _updateWindowAndViewFrames]): 17 * UIProcess/WebPageProxy.cpp: 18 (WebKit::WebPageProxy::setWindowFrame): 19 * UIProcess/WebPageProxy.h: 20 * UIProcess/mac/WebPageProxyMac.mm: 21 (WebKit::WebPageProxy::windowAndViewFramesChanged): 22 * WebProcess/Plugins/PluginView.cpp: 23 (WebKit::PluginView::windowAndViewFramesChanged): 24 * WebProcess/Plugins/PluginView.h: 25 * WebProcess/WebCoreSupport/WebChromeClient.cpp: 26 (WebKit::WebChromeClient::windowRect): 27 * WebProcess/WebPage/WebPage.cpp: 28 (WebKit::WebPage::windowAndViewFramesChanged): 29 * WebProcess/WebPage/WebPage.h: 30 (WebKit::WebPage::windowFrameInScreenCoordinates): 31 (WebKit::WebPage::viewFrameInWindowCoordinates): 32 (WebKit::WebPage::accessibilityPosition): 33 * WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm: 34 (-[WKAccessibilityWebPageObject accessibilityAttributeValue:]): 35 1 36 2011-12-12 Anders Carlsson <andersca@apple.com> 2 37 -
trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm
r102633 r102652 338 338 NSPoint accessibilityPosition = [[self accessibilityAttributeValue:NSAccessibilityPositionAttribute] pointValue]; 339 339 340 _data->_page->windowAndViewFramesChanged( enclosingIntRect(windowFrameInScreenCoordinates), enclosingIntRect(viewFrameInWindowCoordinates), IntPoint(accessibilityPosition));340 _data->_page->windowAndViewFramesChanged(windowFrameInScreenCoordinates, viewFrameInWindowCoordinates, accessibilityPosition); 341 341 } 342 342 -
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
r102352 r102652 307 307 #if PLATFORM(MAC) 308 308 void updateWindowIsVisible(bool windowIsVisible); 309 void windowAndViewFramesChanged(const WebCore:: IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates, const WebCore::IntPoint& accessibilityViewCoordinates);309 void windowAndViewFramesChanged(const WebCore::FloatRect& windowFrameInScreenCoordinates, const WebCore::FloatRect& viewFrameInWindowCoordinates, const WebCore::FloatPoint& accessibilityViewCoordinates); 310 310 311 311 void setComposition(const String& text, Vector<WebCore::CompositionUnderline> underlines, uint64_t selectionStart, uint64_t selectionEnd, uint64_t replacementRangeStart, uint64_t replacementRangeEnd); -
trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm
r101215 r102652 152 152 } 153 153 154 void WebPageProxy::windowAndViewFramesChanged(const IntRect& windowFrameInScreenCoordinates, const IntRect& viewFrameInWindowCoordinates, const IntPoint& accessibilityViewCoordinates)154 void WebPageProxy::windowAndViewFramesChanged(const FloatRect& windowFrameInScreenCoordinates, const FloatRect& viewFrameInWindowCoordinates, const FloatPoint& accessibilityViewCoordinates) 155 155 { 156 156 if (!isValid()) -
trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp
r102540 r102652 415 415 } 416 416 417 void PluginView::windowAndViewFramesChanged(const IntRect& windowFrameInScreenCoordinates, const IntRect& viewFrameInWindowCoordinates)417 void PluginView::windowAndViewFramesChanged(const FloatRect& windowFrameInScreenCoordinates, const FloatRect& viewFrameInWindowCoordinates) 418 418 { 419 419 if (!m_isInitialized || !m_plugin) 420 420 return; 421 421 422 m_plugin->windowAndViewFramesChanged( windowFrameInScreenCoordinates, viewFrameInWindowCoordinates);422 m_plugin->windowAndViewFramesChanged(enclosingIntRect(windowFrameInScreenCoordinates), enclosingIntRect(viewFrameInWindowCoordinates)); 423 423 } 424 424 -
trunk/Source/WebKit2/WebProcess/Plugins/PluginView.h
r99097 r102652 65 65 void setWindowIsFocused(bool); 66 66 void setDeviceScaleFactor(float); 67 void windowAndViewFramesChanged(const WebCore:: IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates);67 void windowAndViewFramesChanged(const WebCore::FloatRect& windowFrameInScreenCoordinates, const WebCore::FloatRect& viewFrameInWindowCoordinates); 68 68 bool sendComplexTextInput(uint64_t pluginComplexTextInputIdentifier, const String& textInput); 69 69 #endif -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
r101763 r102652 106 106 FloatRect WebChromeClient::windowRect() 107 107 { 108 #if PLATFORM(MAC) 109 return m_page->windowFrameInScreenCoordinates(); 110 #else 108 111 FloatRect newWindowFrame; 109 112 … … 112 115 113 116 return newWindowFrame; 117 #endif 114 118 } 115 119 -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp
r102627 r102652 2313 2313 } 2314 2314 2315 void WebPage::windowAndViewFramesChanged(const WebCore:: IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates, const WebCore::IntPoint& accessibilityViewCoordinates)2315 void WebPage::windowAndViewFramesChanged(const WebCore::FloatRect& windowFrameInScreenCoordinates, const WebCore::FloatRect& viewFrameInWindowCoordinates, const WebCore::FloatPoint& accessibilityViewCoordinates) 2316 2316 { 2317 2317 m_windowFrameInScreenCoordinates = windowFrameInScreenCoordinates; … … 2321 2321 // Tell all our plug-in views that the window and view frames have changed. 2322 2322 for (HashSet<PluginView*>::const_iterator it = m_pluginViews.begin(), end = m_pluginViews.end(); it != end; ++it) 2323 (*it)->windowAndViewFramesChanged( windowFrameInScreenCoordinates, viewFrameInWindowCoordinates);2323 (*it)->windowAndViewFramesChanged(enclosingIntRect(windowFrameInScreenCoordinates), enclosingIntRect(viewFrameInWindowCoordinates)); 2324 2324 } 2325 2325 -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h
r102352 r102652 290 290 291 291 bool windowIsVisible() const { return m_windowIsVisible; } 292 const WebCore:: IntRect& windowFrameInScreenCoordinates() const { return m_windowFrameInScreenCoordinates; }293 const WebCore:: IntRect& viewFrameInWindowCoordinates() const { return m_viewFrameInWindowCoordinates; }292 const WebCore::FloatRect& windowFrameInScreenCoordinates() const { return m_windowFrameInScreenCoordinates; } 293 const WebCore::FloatRect& viewFrameInWindowCoordinates() const { return m_viewFrameInWindowCoordinates; } 294 294 #elif PLATFORM(WIN) 295 295 HWND nativeWindow() const { return m_nativeWindow; } … … 357 357 void registerUIProcessAccessibilityTokens(const CoreIPC::DataReference& elemenToken, const CoreIPC::DataReference& windowToken); 358 358 WKAccessibilityWebPageObject* accessibilityRemoteObject(); 359 WebCore::IntPoint accessibilityPosition() const { return m_accessibilityPosition; }360 359 const WebCore::FloatPoint& accessibilityPosition() const { return m_accessibilityPosition; } 360 361 361 void sendComplexTextInputToPlugin(uint64_t pluginComplexTextInputIdentifier, const String& textInput); 362 362 … … 561 561 562 562 void setWindowIsVisible(bool windowIsVisible); 563 void windowAndViewFramesChanged(const WebCore:: IntRect& windowFrameInScreenCoordinates, const WebCore::IntRect& viewFrameInWindowCoordinates, const WebCore::IntPoint& accessibilityViewCoordinates);563 void windowAndViewFramesChanged(const WebCore::FloatRect& windowFrameInScreenCoordinates, const WebCore::FloatRect& viewFrameInWindowCoordinates, const WebCore::FloatPoint& accessibilityViewCoordinates); 564 564 #endif 565 565 … … 638 638 639 639 // The frame of the containing window in screen coordinates. 640 WebCore:: IntRect m_windowFrameInScreenCoordinates;640 WebCore::FloatRect m_windowFrameInScreenCoordinates; 641 641 642 642 // The frame of the view in window coordinates. 643 WebCore:: IntRect m_viewFrameInWindowCoordinates;643 WebCore::FloatRect m_viewFrameInWindowCoordinates; 644 644 645 645 // The accessibility position of the view. 646 WebCore:: IntPoint m_accessibilityPosition;647 646 WebCore::FloatPoint m_accessibilityPosition; 647 648 648 // All plug-in views on this web page. 649 649 HashSet<PluginView*> m_pluginViews; -
trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in
r102352 r102652 202 202 203 203 SetWindowIsVisible(bool windowIsVisible) 204 WindowAndViewFramesChanged(WebCore:: IntRect windowFrameInScreenCoordinates, WebCore::IntRect viewFrameInWindowCoordinates, WebCore::IntPoint accessibilityViewCoordinates)204 WindowAndViewFramesChanged(WebCore::FloatRect windowFrameInScreenCoordinates, WebCore::FloatRect viewFrameInWindowCoordinates, WebCore::FloatPoint accessibilityViewCoordinates) 205 205 RegisterUIProcessAccessibilityTokens(CoreIPC::DataReference elemenToken, CoreIPC::DataReference windowToken) 206 206 WriteSelectionToPasteboard(WTF::String pasteboardName, WTF::Vector<WTF::String> pasteboardTypes) -> (bool result) -
trunk/Source/WebKit2/WebProcess/WebPage/mac/WKAccessibilityWebPageObject.mm
r100323 r102652 143 143 144 144 if ([attribute isEqualToString:NSAccessibilityPositionAttribute]) { 145 WebCore::IntPointpoint = m_page->accessibilityPosition();145 const WebCore::FloatPoint& point = m_page->accessibilityPosition(); 146 146 return [NSValue valueWithPoint:NSMakePoint(point.x(), point.y())]; 147 147 }
Note: See TracChangeset
for help on using the changeset viewer.