Changeset 70790 in webkit
- Timestamp:
- Oct 28, 2010 11:21:48 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 13 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKit2/ChangeLog
r70787 r70790 1 2010-10-28 Sam Weinig <sam@webkit.org> 2 3 Reviewed by Anders Carlsson. 4 5 Add WebKit2 API for window feature getter/setters 6 <rdar://problem/8590373> 7 https://bugs.webkit.org/show_bug.cgi?id=48496 8 9 * UIProcess/API/C/WKPage.h: 10 * UIProcess/WebPageProxy.cpp: 11 (WebKit::WebPageProxy::setToolbarsAreVisible): 12 (WebKit::WebPageProxy::getToolbarsAreVisible): 13 (WebKit::WebPageProxy::setMenuBarIsVisible): 14 (WebKit::WebPageProxy::getMenuBarIsVisible): 15 (WebKit::WebPageProxy::setStatusBarIsVisible): 16 (WebKit::WebPageProxy::getStatusBarIsVisible): 17 (WebKit::WebPageProxy::setIsResizable): 18 (WebKit::WebPageProxy::getIsResizable): 19 * UIProcess/WebPageProxy.h: 20 * UIProcess/WebPageProxy.messages.in: 21 * UIProcess/WebUIClient.cpp: 22 (WebKit::WebUIClient::toolbarsAreVisible): 23 (WebKit::WebUIClient::setToolbarsAreVisible): 24 (WebKit::WebUIClient::menuBarIsVisible): 25 (WebKit::WebUIClient::setMenuBarIsVisible): 26 (WebKit::WebUIClient::statusBarIsVisible): 27 (WebKit::WebUIClient::setStatusBarIsVisible): 28 (WebKit::WebUIClient::isResizable): 29 (WebKit::WebUIClient::setIsResizable): 30 * UIProcess/WebUIClient.h: 31 * WebProcess/WebCoreSupport/WebChromeClient.cpp: 32 (WebKit::WebChromeClient::setToolbarsVisible): 33 (WebKit::WebChromeClient::toolbarsVisible): 34 (WebKit::WebChromeClient::setStatusbarVisible): 35 (WebKit::WebChromeClient::statusbarVisible): 36 (WebKit::WebChromeClient::setMenubarVisible): 37 (WebKit::WebChromeClient::menubarVisible): 38 (WebKit::WebChromeClient::setResizable): 39 Plumb through the calls. 40 1 41 2010-10-28 Dan Bernstein <mitz@apple.com> 2 42 -
trunk/WebKit2/UIProcess/API/C/WKPage.h
r70716 r70790 143 143 typedef void (*WKPageMouseDidMoveOverElementCallback)(WKPageRef page, WKEventModifiers modifiers, WKTypeRef userData, const void *clientInfo); 144 144 typedef void (*WKPageDidNotHandleKeyEventCallback)(WKPageRef page, WKNativeEventPtr event, const void *clientInfo); 145 typedef bool (*WKPageGetToolbarsAreVisibleCallback)(WKPageRef page, const void *clientInfo); 146 typedef void (*WKPageSetToolbarsAreVisibleCallback)(WKPageRef page, bool toolbarsVisible, const void *clientInfo); 147 typedef bool (*WKPageGetMenuBarIsVisibleCallback)(WKPageRef page, const void *clientInfo); 148 typedef void (*WKPageSetMenuBarIsVisibleCallback)(WKPageRef page, bool menuBarVisible, const void *clientInfo); 149 typedef bool (*WKPageGetStatusBarIsVisibleCallback)(WKPageRef page, const void *clientInfo); 150 typedef void (*WKPageSetStatusBarIsVisibleCallback)(WKPageRef page, bool statusBarVisible, const void *clientInfo); 151 typedef bool (*WKPageGetIsResizableCallback)(WKPageRef page, const void *clientInfo); 152 typedef void (*WKPageSetIsResizableCallback)(WKPageRef page, bool resizable, const void *clientInfo); 145 153 typedef WKRect (*WKPageGetWindowFrameCallback)(WKPageRef page, const void *clientInfo); 146 154 typedef void (*WKPageSetWindowFrameCallback)(WKPageRef page, WKRect frame, const void *clientInfo); … … 162 170 WKPageMouseDidMoveOverElementCallback mouseDidMoveOverElement; 163 171 WKPageDidNotHandleKeyEventCallback didNotHandleKeyEvent; 172 WKPageGetToolbarsAreVisibleCallback toolbarsAreVisible; 173 WKPageSetToolbarsAreVisibleCallback setToolbarsAreVisible; 174 WKPageGetMenuBarIsVisibleCallback menuBarIsVisible; 175 WKPageSetMenuBarIsVisibleCallback setMenuBarIsVisible; 176 WKPageGetStatusBarIsVisibleCallback statusBarIsVisible; 177 WKPageSetStatusBarIsVisibleCallback setStatusBarIsVisible; 178 WKPageGetIsResizableCallback isResizable; 179 WKPageSetIsResizableCallback setIsResizable; 164 180 WKPageGetWindowFrameCallback getWindowFrame; 165 181 WKPageSetWindowFrameCallback setWindowFrame; -
trunk/WebKit2/UIProcess/API/qt/qwkpage.cpp
r70777 r70790 320 320 0, /* mouseDidMoveOverElement */ 321 321 0, /* didNotHandleKeyEvent */ 322 0, /* toolbarsAreVisible */ 323 0, /* setToolbarsAreVisible */ 324 0, /* menuBarIsVisible */ 325 0, /* setMenuBarIsVisible */ 326 0, /* statusBarIsVisible */ 327 0, /* setStatusBarIsVisible */ 328 0, /* isResizable */ 329 0, /* setIsResizable */ 322 330 0, /* getWindowFrame */ 323 331 0, /* setWindowFrame */ -
trunk/WebKit2/UIProcess/WebPageProxy.cpp
r70730 r70790 942 942 } 943 943 944 void WebPageProxy::setToolbarsAreVisible(bool toolbarsAreVisible) 945 { 946 m_uiClient.setToolbarsAreVisible(this, toolbarsAreVisible); 947 } 948 949 void WebPageProxy::getToolbarsAreVisible(bool& toolbarsAreVisible) 950 { 951 toolbarsAreVisible = m_uiClient.toolbarsAreVisible(this); 952 } 953 954 void WebPageProxy::setMenuBarIsVisible(bool menuBarIsVisible) 955 { 956 m_uiClient.setMenuBarIsVisible(this, menuBarIsVisible); 957 } 958 959 void WebPageProxy::getMenuBarIsVisible(bool& menuBarIsVisible) 960 { 961 menuBarIsVisible = m_uiClient.menuBarIsVisible(this); 962 } 963 964 void WebPageProxy::setStatusBarIsVisible(bool statusBarIsVisible) 965 { 966 m_uiClient.setStatusBarIsVisible(this, statusBarIsVisible); 967 } 968 969 void WebPageProxy::getStatusBarIsVisible(bool& statusBarIsVisible) 970 { 971 statusBarIsVisible = m_uiClient.statusBarIsVisible(this); 972 } 973 974 void WebPageProxy::setIsResizable(bool isResizable) 975 { 976 m_uiClient.setIsResizable(this, isResizable); 977 } 978 979 void WebPageProxy::getIsResizable(bool& isResizable) 980 { 981 isResizable = m_uiClient.isResizable(this); 982 } 983 944 984 void WebPageProxy::setWindowFrame(const FloatRect& newWindowFrame) 945 985 { -
trunk/WebKit2/UIProcess/WebPageProxy.h
r70730 r70790 276 276 void setStatusText(const String&); 277 277 void mouseDidMoveOverElement(uint32_t modifiers, CoreIPC::ArgumentDecoder*); 278 void setToolbarsAreVisible(bool toolbarsAreVisible); 279 void getToolbarsAreVisible(bool& toolbarsAreVisible); 280 void setMenuBarIsVisible(bool menuBarIsVisible); 281 void getMenuBarIsVisible(bool& menuBarIsVisible); 282 void setStatusBarIsVisible(bool statusBarIsVisible); 283 void getStatusBarIsVisible(bool& statusBarIsVisible); 284 void setIsResizable(bool isResizable); 285 void getIsResizable(bool& isResizable); 278 286 void setWindowFrame(const WebCore::FloatRect&); 279 287 void getWindowFrame(WebCore::FloatRect&); -
trunk/WebKit2/UIProcess/WebPageProxy.messages.in
r70730 r70790 37 37 SetToolTip(WTF::String toolTip) 38 38 TakeFocus(bool direction) 39 SetToolbarsAreVisible(bool toolbarsAreVisible) 40 GetToolbarsAreVisible() -> (bool toolbarsAreVisible) 41 SetMenuBarIsVisible(bool menuBarIsVisible); 42 GetMenuBarIsVisible() -> (bool menuBarIsVisible); 43 SetStatusBarIsVisible(bool statusBarIsVisible) 44 GetStatusBarIsVisible() -> (bool statusBarIsVisible) 45 SetIsResizable(bool isResizable) 46 GetIsResizable() -> (bool isResizable) 39 47 SetWindowFrame(WebCore::FloatRect windowFrame) 40 48 GetWindowFrame() -> (WebCore::FloatRect windowFrame) -
trunk/WebKit2/UIProcess/WebUIClient.cpp
r70676 r70790 149 149 } 150 150 151 bool WebUIClient::toolbarsAreVisible(WebPageProxy* page) 152 { 153 if (!m_pageUIClient.toolbarsAreVisible) 154 return true; 155 return m_pageUIClient.toolbarsAreVisible(toAPI(page), m_pageUIClient.clientInfo); 156 157 } 158 void WebUIClient::setToolbarsAreVisible(WebPageProxy* page, bool visible) 159 { 160 if (!m_pageUIClient.setToolbarsAreVisible) 161 return; 162 m_pageUIClient.setToolbarsAreVisible(toAPI(page), visible, m_pageUIClient.clientInfo); 163 } 164 165 bool WebUIClient::menuBarIsVisible(WebPageProxy* page) 166 { 167 if (!m_pageUIClient.menuBarIsVisible) 168 return true; 169 return m_pageUIClient.menuBarIsVisible(toAPI(page), m_pageUIClient.clientInfo); 170 } 171 172 void WebUIClient::setMenuBarIsVisible(WebPageProxy* page, bool visible) 173 { 174 if (!m_pageUIClient.setMenuBarIsVisible) 175 return; 176 m_pageUIClient.setMenuBarIsVisible(toAPI(page), visible, m_pageUIClient.clientInfo); 177 } 178 179 bool WebUIClient::statusBarIsVisible(WebPageProxy* page) 180 { 181 if (!m_pageUIClient.statusBarIsVisible) 182 return true; 183 return m_pageUIClient.statusBarIsVisible(toAPI(page), m_pageUIClient.clientInfo); 184 } 185 186 void WebUIClient::setStatusBarIsVisible(WebPageProxy* page, bool visible) 187 { 188 if (!m_pageUIClient.setStatusBarIsVisible) 189 return; 190 m_pageUIClient.setStatusBarIsVisible(toAPI(page), visible, m_pageUIClient.clientInfo); 191 } 192 193 bool WebUIClient::isResizable(WebPageProxy* page) 194 { 195 if (!m_pageUIClient.isResizable) 196 return true; 197 return m_pageUIClient.isResizable(toAPI(page), m_pageUIClient.clientInfo); 198 } 199 200 void WebUIClient::setIsResizable(WebPageProxy* page, bool resizable) 201 { 202 if (!m_pageUIClient.setIsResizable) 203 return; 204 m_pageUIClient.setIsResizable(toAPI(page), resizable, m_pageUIClient.clientInfo); 205 } 206 151 207 void WebUIClient::setWindowFrame(WebPageProxy* page, const FloatRect& frame) 152 208 { -
trunk/WebKit2/UIProcess/WebUIClient.h
r70564 r70790 60 60 void mouseDidMoveOverElement(WebPageProxy*, WebEvent::Modifiers, APIObject*); 61 61 62 void contentsSizeChanged(WebPageProxy*, const WebCore::IntSize&, WebFrameProxy*);63 62 void didNotHandleKeyEvent(WebPageProxy*, const NativeWebKeyboardEvent&); 63 64 bool toolbarsAreVisible(WebPageProxy*); 65 void setToolbarsAreVisible(WebPageProxy*, bool); 66 bool menuBarIsVisible(WebPageProxy*); 67 void setMenuBarIsVisible(WebPageProxy*, bool); 68 bool statusBarIsVisible(WebPageProxy*); 69 void setStatusBarIsVisible(WebPageProxy*, bool); 70 bool isResizable(WebPageProxy*); 71 void setIsResizable(WebPageProxy*, bool); 64 72 65 73 void setWindowFrame(WebPageProxy*, const WebCore::FloatRect&); -
trunk/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp
r70676 r70790 149 149 } 150 150 151 void WebChromeClient::setToolbarsVisible(bool )152 { 153 notImplemented();151 void WebChromeClient::setToolbarsVisible(bool toolbarsAreVisible) 152 { 153 WebProcess::shared().connection()->send(Messages::WebPageProxy::SetToolbarsAreVisible(toolbarsAreVisible), m_page->pageID()); 154 154 } 155 155 156 156 bool WebChromeClient::toolbarsVisible() 157 157 { 158 bool toolbarsAreVisible = true; 159 if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::GetToolbarsAreVisible(), 160 Messages::WebPageProxy::GetToolbarsAreVisible::Reply(toolbarsAreVisible), 161 m_page->pageID(), CoreIPC::Connection::NoTimeout)) 162 return true; 163 164 return toolbarsAreVisible; 165 } 166 167 void WebChromeClient::setStatusbarVisible(bool statusBarIsVisible) 168 { 169 WebProcess::shared().connection()->send(Messages::WebPageProxy::SetStatusBarIsVisible(statusBarIsVisible), m_page->pageID()); 170 } 171 172 bool WebChromeClient::statusbarVisible() 173 { 174 bool statusBarIsVisible = true; 175 if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::GetStatusBarIsVisible(), 176 Messages::WebPageProxy::GetStatusBarIsVisible::Reply(statusBarIsVisible), 177 m_page->pageID(), CoreIPC::Connection::NoTimeout)) 178 return true; 179 180 return statusBarIsVisible; 181 } 182 183 void WebChromeClient::setScrollbarsVisible(bool) 184 { 185 notImplemented(); 186 } 187 188 bool WebChromeClient::scrollbarsVisible() 189 { 158 190 notImplemented(); 159 191 return true; 160 192 } 161 193 162 void WebChromeClient::setStatusbarVisible(bool) 163 { 164 notImplemented(); 165 } 166 167 bool WebChromeClient::statusbarVisible() 168 { 169 notImplemented(); 170 return true; 171 } 172 173 void WebChromeClient::setScrollbarsVisible(bool) 174 { 175 notImplemented(); 176 } 177 178 bool WebChromeClient::scrollbarsVisible() 179 { 180 notImplemented(); 181 return true; 182 } 183 184 void WebChromeClient::setMenubarVisible(bool) 185 { 186 notImplemented(); 194 void WebChromeClient::setMenubarVisible(bool menuBarVisible) 195 { 196 WebProcess::shared().connection()->send(Messages::WebPageProxy::SetMenuBarIsVisible(menuBarVisible), m_page->pageID()); 187 197 } 188 198 189 199 bool WebChromeClient::menubarVisible() 190 200 { 191 notImplemented(); 192 return true; 193 } 194 195 void WebChromeClient::setResizable(bool) 196 { 197 notImplemented(); 201 bool menuBarIsVisible = true; 202 if (!WebProcess::shared().connection()->sendSync(Messages::WebPageProxy::GetMenuBarIsVisible(), 203 Messages::WebPageProxy::GetMenuBarIsVisible::Reply(menuBarIsVisible), 204 m_page->pageID(), CoreIPC::Connection::NoTimeout)) 205 return true; 206 207 return menuBarIsVisible; 208 } 209 210 void WebChromeClient::setResizable(bool resizable) 211 { 212 WebProcess::shared().connection()->send(Messages::WebPageProxy::SetIsResizable(resizable), m_page->pageID()); 198 213 } 199 214 -
trunk/WebKitTools/ChangeLog
r70789 r70790 1 2010-10-27 Sam Weinig <sam@webkit.org> 2 3 Reviewed by Anders Carlsson. 4 5 Add WebKit2 API for window feature getter/setters 6 <rdar://problem/8590373> 7 https://bugs.webkit.org/show_bug.cgi?id=48496 8 9 * MiniBrowser/mac/BrowserWindowController.m: 10 (-[BrowserWindowController awakeFromNib]): 11 * MiniBrowser/win/BrowserView.cpp: 12 (BrowserView::create): 13 * WebKitTestRunner/TestController.cpp: 14 (WTR::createOtherPage): 15 (WTR::TestController::initialize): 16 1 17 2010-10-28 Søren Gjesse <sgjesse@chromium.org> 2 18 -
trunk/WebKitTools/MiniBrowser/mac/BrowserWindowController.m
r70676 r70790 586 586 mouseDidMoveOverElement, 587 587 0, /* didNotHandleKeyEvent */ 588 0, /* toolbarsAreVisible */ 589 0, /* setToolbarsAreVisible */ 590 0, /* menuBarIsVisible */ 591 0, /* setMenuBarIsVisible */ 592 0, /* statusBarIsVisible */ 593 0, /* setStatusBarIsVisible */ 594 0, /* isResizable */ 595 0, /* setIsResizable */ 588 596 getWindowFrame, 589 597 setWindowFrame, -
trunk/WebKitTools/MiniBrowser/win/BrowserView.cpp
r70676 r70790 106 106 setStatusText, 107 107 mouseDidMoveOverElement, 108 0 /* didNotHandleKeyEvent */ 108 0, /* didNotHandleKeyEvent */ 109 0, /* toolbarsAreVisible */ 110 0, /* setToolbarsAreVisible */ 111 0, /* menuBarIsVisible */ 112 0, /* setMenuBarIsVisible */ 113 0, /* statusBarIsVisible */ 114 0, /* setStatusBarIsVisible */ 115 0, /* isResizable */ 116 0, /* setIsResizable */ 117 0, /* getWindowFrame */ 118 0, /* setWindowFrame */ 119 0, /* runBeforeUnloadConfirmPanel */ 120 0, /* didDraw */ 121 0 /* pageDidScroll */ 109 122 }; 110 123 -
trunk/WebKitTools/WebKitTestRunner/TestController.cpp
r70723 r70790 118 118 0, // mouseDidMoveOverElement 119 119 0, // didNotHandleKeyEvent 120 0, // toolbarsAreVisible 121 0, // setToolbarsAreVisible 122 0, // menuBarIsVisible 123 0, // setMenuBarIsVisible 124 0, // statusBarIsVisible 125 0, // setStatusBarIsVisible 126 0, // isResizable 127 0, // setIsResizable 120 128 getWindowFrameOtherPage, 121 129 setWindowFrameOtherPage, … … 203 211 0, // mouseDidMoveOverElement 204 212 0, // didNotHandleKeyEvent 213 0, // toolbarsAreVisible 214 0, // setToolbarsAreVisible 215 0, // menuBarIsVisible 216 0, // setMenuBarIsVisible 217 0, // statusBarIsVisible 218 0, // setStatusBarIsVisible 219 0, // isResizable 220 0, // setIsResizable 205 221 getWindowFrameMainPage, 206 222 setWindowFrameMainPage,
Note: See TracChangeset
for help on using the changeset viewer.