Changeset 159896 in webkit
- Timestamp:
- Nov 30, 2013 10:40:24 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r159895 r159896 1 2013-11-30 Sam Weinig <sam@webkit.org> 2 3 [CTTE] The WebPageProxy's WebPageGroup is never null so it should be stored in a Ref 4 https://bugs.webkit.org/show_bug.cgi?id=125038 5 6 Reviewed by Dan Bernstein. 7 8 * UIProcess/API/C/WKPage.cpp: 9 (WKPageGetPageGroup): 10 * UIProcess/API/C/mac/WKPagePrivateMac.cpp: 11 (WKPageIsURLKnownHSTSHost): 12 * UIProcess/API/Cocoa/WKBrowsingContextController.mm: 13 (-[WKBrowsingContextController browsingContextGroup]): 14 * UIProcess/API/mac/WKView.mm: 15 (-[WKView _preferencesDidChange]): 16 (-[WKView initWithFrame:contextRef:pageGroupRef:relatedToPage:]): 17 * UIProcess/WebContext.cpp: 18 (WebKit::WebContext::WebContext): 19 (WebKit::WebContext::createWebPage): 20 * UIProcess/WebContext.h: 21 * UIProcess/WebInspectorProxy.cpp: 22 (WebKit::WebInspectorPageGroups::inspectorLevel): 23 (WebKit::WebInspectorPageGroups::isInspectorPageGroup): 24 (WebKit::WebInspectorPageGroups::inspectorPageGroupLevel): 25 (WebKit::WebInspectorProxy::isInspectorPage): 26 * UIProcess/WebInspectorProxy.h: 27 * UIProcess/WebPageGroup.cpp: 28 (WebKit::WebPageGroup::createNonNull): 29 * UIProcess/WebPageGroup.h: 30 * UIProcess/WebPageProxy.cpp: 31 (WebKit::WebPageProxy::create): 32 (WebKit::WebPageProxy::WebPageProxy): 33 (WebKit::WebPageProxy::maybeInitializeSandboxExtensionHandle): 34 (WebKit::WebPageProxy::preferencesDidChange): 35 * UIProcess/WebPageProxy.h: 36 (WebKit::WebPageProxy::pageGroup): 37 * UIProcess/WebProcessProxy.cpp: 38 (WebKit::WebProcessProxy::createWebPage): 39 * UIProcess/WebProcessProxy.h: 40 * UIProcess/mac/WebInspectorProxyMac.mm: 41 (WebKit::WebInspectorProxy::createInspectorWindow): 42 (WebKit::WebInspectorProxy::platformCreateInspectorPage): 43 (WebKit::WebInspectorProxy::windowFrameDidChange): 44 * UIProcess/mac/WebProcessProxyMac.mm: 45 (WebKit::WebProcessProxy::pageIsProcessSuppressible): 46 1 47 2013-11-30 Dan Bernstein <mitz@apple.com> 2 48 -
trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp
r159891 r159896 61 61 WKPageGroupRef WKPageGetPageGroup(WKPageRef pageRef) 62 62 { 63 return toAPI( toImpl(pageRef)->pageGroup());63 return toAPI(&toImpl(pageRef)->pageGroup()); 64 64 } 65 65 -
trunk/Source/WebKit2/UIProcess/API/C/mac/WKPagePrivateMac.cpp
r153096 r159896 43 43 { 44 44 WebPageProxy* webPageProxy = toImpl(page); 45 bool privateBrowsingEnabled = webPageProxy->pageGroup() ->preferences()->privateBrowsingEnabled();45 bool privateBrowsingEnabled = webPageProxy->pageGroup().preferences()->privateBrowsingEnabled(); 46 46 47 47 return webPageProxy->process()->context()->isURLKnownHSTSHost(toImpl(url)->string(), privateBrowsingEnabled); -
trunk/Source/WebKit2/UIProcess/API/Cocoa/WKBrowsingContextController.mm
r159895 r159896 122 122 - (WKBrowsingContextGroup *)browsingContextGroup 123 123 { 124 WebPageGroup* pageGroup = _page->pageGroup(); 125 if (!pageGroup) 126 return nil; 127 return wrapper(*pageGroup); 124 return wrapper(_page->pageGroup()); 128 125 } 129 126 -
trunk/Source/WebKit2/UIProcess/API/mac/WKView.mm
r159889 r159896 2273 2273 - (void)_preferencesDidChange 2274 2274 { 2275 BOOL needsViewFrameInWindowCoordinates = _data->_page->pageGroup() ->preferences()->pluginsEnabled();2275 BOOL needsViewFrameInWindowCoordinates = _data->_page->pageGroup().preferences()->pluginsEnabled(); 2276 2276 2277 2277 if (!!needsViewFrameInWindowCoordinates == !!_data->_needsViewFrameInWindowCoordinates) … … 2923 2923 _data->_intrinsicContentSize = NSMakeSize(NSViewNoInstrinsicMetric, NSViewNoInstrinsicMetric); 2924 2924 2925 _data->_needsViewFrameInWindowCoordinates = _data->_page->pageGroup() ->preferences()->pluginsEnabled();2925 _data->_needsViewFrameInWindowCoordinates = _data->_page->pageGroup().preferences()->pluginsEnabled(); 2926 2926 _data->_frameOrigin = NSZeroPoint; 2927 2927 _data->_contentAnchor = WKContentAnchorTopLeft; -
trunk/Source/WebKit2/UIProcess/WebContext.cpp
r159889 r159896 137 137 , m_haveInitialEmptyProcess(false) 138 138 , m_processWithPageCache(0) 139 , m_defaultPageGroup(WebPageGroup::create ())139 , m_defaultPageGroup(WebPageGroup::createNonNull()) 140 140 , m_injectedBundlePath(injectedBundlePath) 141 141 , m_visitedLinkProvider(this) … … 757 757 } 758 758 759 if (!pageGroup) 760 pageGroup = m_defaultPageGroup.get(); 761 762 return process->createWebPage(pageClient, this, pageGroup); 759 return process->createWebPage(pageClient, pageGroup ? *pageGroup : m_defaultPageGroup.get()); 763 760 } 764 761 -
trunk/Source/WebKit2/UIProcess/WebContext.h
r159889 r159896 420 420 WebProcessProxy* m_processWithPageCache; 421 421 422 Ref Ptr<WebPageGroup> m_defaultPageGroup;422 Ref<WebPageGroup> m_defaultPageGroup; 423 423 424 424 RefPtr<API::Object> m_injectedBundleInitializationUserData; -
trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp
r159387 r159896 67 67 } 68 68 69 unsigned inspectorLevel(WebPageGroup *inspectedPageGroup)69 unsigned inspectorLevel(WebPageGroup& inspectedPageGroup) 70 70 { 71 71 return isInspectorPageGroup(inspectedPageGroup) ? inspectorPageGroupLevel(inspectedPageGroup) + 1 : 1; 72 72 } 73 73 74 bool isInspectorPageGroup(WebPageGroup *group)74 bool isInspectorPageGroup(WebPageGroup& group) 75 75 { 76 return m_pageGroupLevel.contains( group);77 } 78 79 unsigned inspectorPageGroupLevel(WebPageGroup *group)76 return m_pageGroupLevel.contains(&group); 77 } 78 79 unsigned inspectorPageGroupLevel(WebPageGroup& group) 80 80 { 81 81 ASSERT(isInspectorPageGroup(group)); 82 return m_pageGroupLevel.get( group);82 return m_pageGroupLevel.get(&group); 83 83 } 84 84 … … 357 357 } 358 358 359 bool WebInspectorProxy::isInspectorPage(WebPageProxy *page)360 { 361 return WebInspectorPageGroups::shared().isInspectorPageGroup(page ->pageGroup());359 bool WebInspectorProxy::isInspectorPage(WebPageProxy& page) 360 { 361 return WebInspectorPageGroups::shared().isInspectorPageGroup(page.pageGroup()); 362 362 } 363 363 -
trunk/Source/WebKit2/UIProcess/WebInspectorProxy.h
r159197 r159896 133 133 void togglePageProfiling(); 134 134 135 static bool isInspectorPage(WebPageProxy *);135 static bool isInspectorPage(WebPageProxy&); 136 136 137 137 // Implemented the platform WebInspectorProxy file -
trunk/Source/WebKit2/UIProcess/WebPageGroup.cpp
r159824 r159896 53 53 { 54 54 return adoptRef(new WebPageGroup(identifier, visibleToInjectedBundle, visibleToHistoryClient)); 55 } 56 57 PassRef<WebPageGroup> WebPageGroup::createNonNull(const String& identifier, bool visibleToInjectedBundle, bool visibleToHistoryClient) 58 { 59 return adoptRef(*new WebPageGroup(identifier, visibleToInjectedBundle, visibleToHistoryClient)); 55 60 } 56 61 -
trunk/Source/WebKit2/UIProcess/WebPageGroup.h
r159824 r159896 43 43 WebPageGroup(const String& identifier = String(), bool visibleToInjectedBundle = true, bool visibleToHistoryClient = true); 44 44 static PassRefPtr<WebPageGroup> create(const String& identifier = String(), bool visibleToInjectedBundle = true, bool visibleToHistoryClient = true); 45 static PassRef<WebPageGroup> createNonNull(const String& identifier = String(), bool visibleToInjectedBundle = true, bool visibleToHistoryClient = true); 45 46 static WebPageGroup* get(uint64_t pageGroupID); 46 47 -
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
r159891 r159896 223 223 #endif // !LOG_DISABLED 224 224 225 PassRefPtr<WebPageProxy> WebPageProxy::create(PageClient& pageClient, PassRefPtr<WebProcessProxy> process, WebPageGroup *pageGroup, uint64_t pageID)225 PassRefPtr<WebPageProxy> WebPageProxy::create(PageClient& pageClient, PassRefPtr<WebProcessProxy> process, WebPageGroup& pageGroup, uint64_t pageID) 226 226 { 227 227 return adoptRef(new WebPageProxy(pageClient, process, pageGroup, pageID)); 228 228 } 229 229 230 WebPageProxy::WebPageProxy(PageClient& pageClient, PassRefPtr<WebProcessProxy> process, WebPageGroup *pageGroup, uint64_t pageID)230 WebPageProxy::WebPageProxy(PageClient& pageClient, PassRefPtr<WebProcessProxy> process, WebPageGroup& pageGroup, uint64_t pageID) 231 231 : m_pageClient(pageClient) 232 232 , m_process(process) 233 233 , m_pageGroup(pageGroup) 234 , m_mainFrame( 0)234 , m_mainFrame(nullptr) 235 235 , m_userAgent(standardUserAgent()) 236 236 , m_geolocationPermissionRequestManager(*this) … … 594 594 #if ENABLE(INSPECTOR) 595 595 // Don't give the inspector full access to the file system. 596 if (WebInspectorProxy::isInspectorPage( this))596 if (WebInspectorProxy::isInspectorPage(*this)) 597 597 return false; 598 598 #endif … … 2018 2018 2019 2019 // Preferences need to be updated during synchronous printing to make "print backgrounds" preference work when toggled from a print dialog checkbox. 2020 m_process->send(Messages::WebPage::PreferencesDidChange(pageGroup() ->preferences()->store()), m_pageID, m_isPerformingDOMPrintOperation ? CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply : 0);2020 m_process->send(Messages::WebPage::PreferencesDidChange(pageGroup().preferences()->store()), m_pageID, m_isPerformingDOMPrintOperation ? CoreIPC::DispatchMessageEvenWhenWaitingForSyncReply : 0); 2021 2021 } 2022 2022 -
trunk/Source/WebKit2/UIProcess/WebPageProxy.h
r159891 r159896 323 323 public: 324 324 325 static PassRefPtr<WebPageProxy> create(PageClient&, PassRefPtr<WebProcessProxy>, WebPageGroup *, uint64_t pageID);325 static PassRefPtr<WebPageProxy> create(PageClient&, PassRefPtr<WebProcessProxy>, WebPageGroup&, uint64_t pageID); 326 326 virtual ~WebPageProxy(); 327 327 … … 701 701 PlatformProcessIdentifier processIdentifier() const; 702 702 703 WebPageGroup * pageGroup() const{ return m_pageGroup.get(); }703 WebPageGroup& pageGroup() { return m_pageGroup.get(); } 704 704 705 705 bool isValid() const; … … 848 848 849 849 private: 850 WebPageProxy(PageClient&, PassRefPtr<WebProcessProxy>, WebPageGroup *, uint64_t pageID);850 WebPageProxy(PageClient&, PassRefPtr<WebProcessProxy>, WebPageGroup&, uint64_t pageID); 851 851 void platformInitialize(); 852 852 void initializeCreationParameters(); … … 1155 1155 std::unique_ptr<DrawingAreaProxy> m_drawingArea; 1156 1156 RefPtr<WebProcessProxy> m_process; 1157 Ref Ptr<WebPageGroup> m_pageGroup;1157 Ref<WebPageGroup> m_pageGroup; 1158 1158 RefPtr<WebFrameProxy> m_mainFrame; 1159 1159 RefPtr<WebFrameProxy> m_focusedFrame; -
trunk/Source/WebKit2/UIProcess/WebProcessProxy.cpp
r159889 r159896 161 161 } 162 162 163 PassRefPtr<WebPageProxy> WebProcessProxy::createWebPage(PageClient& pageClient, Web Context*, WebPageGroup*pageGroup)163 PassRefPtr<WebPageProxy> WebProcessProxy::createWebPage(PageClient& pageClient, WebPageGroup& pageGroup) 164 164 { 165 165 uint64_t pageID = generatePageID(); -
trunk/Source/WebKit2/UIProcess/WebProcessProxy.h
r159889 r159896 78 78 79 79 static WebPageProxy* webPage(uint64_t pageID); 80 PassRefPtr<WebPageProxy> createWebPage(PageClient&, Web Context*, WebPageGroup*);80 PassRefPtr<WebPageProxy> createWebPage(PageClient&, WebPageGroup&); 81 81 void addExistingWebPage(WebPageProxy*, uint64_t pageID); 82 82 void removeWebPage(uint64_t pageID); -
trunk/Source/WebKit2/UIProcess/mac/WebInspectorProxyMac.mm
r157323 r159896 286 286 287 287 // Restore the saved window frame, if there was one. 288 NSString *savedWindowFrameString = page()->pageGroup() ->preferences()->inspectorWindowFrame();288 NSString *savedWindowFrameString = page()->pageGroup().preferences()->inspectorWindowFrame(); 289 289 NSRect savedWindowFrame = NSRectFromString(savedWindowFrameString); 290 290 if (!NSIsEmptyRect(savedWindowFrame)) … … 385 385 initialRect = NSMakeRect(0, 0, initialWindowWidth, initialWindowHeight); 386 386 387 NSString *windowFrameString = page()->pageGroup() ->preferences()->inspectorWindowFrame();387 NSString *windowFrameString = page()->pageGroup().preferences()->inspectorWindowFrame(); 388 388 NSRect windowFrame = NSRectFromString(windowFrameString); 389 389 if (!NSIsEmptyRect(windowFrame)) … … 608 608 609 609 NSString *frameString = NSStringFromRect([m_inspectorWindow frame]); 610 page()->pageGroup() ->preferences()->setInspectorWindowFrame(frameString);610 page()->pageGroup().preferences()->setInspectorWindowFrame(frameString); 611 611 } 612 612 -
trunk/Source/WebKit2/UIProcess/mac/WebProcessProxyMac.mm
r157894 r159896 62 62 bool WebProcessProxy::pageIsProcessSuppressible(WebPageProxy* page) 63 63 { 64 return !page->isViewVisible() && page->pageGroup() ->preferences()->pageVisibilityBasedProcessSuppressionEnabled();64 return !page->isViewVisible() && page->pageGroup().preferences()->pageVisibilityBasedProcessSuppressionEnabled(); 65 65 } 66 66
Note: See TracChangeset
for help on using the changeset viewer.