Title: [160300] trunk/Source/WebKit2
- Revision
- 160300
- Author
- wei...@apple.com
- Date
- 2013-12-08 21:44:17 -0800 (Sun, 08 Dec 2013)
Log Message
Remove WebContext::sharedProcessContext()
https://bugs.webkit.org/show_bug.cgi?id=125437
Reviewed by Dan Bernstein.
* UIProcess/API/ios/WKGeolocationProviderIOS.mm:
* UIProcess/WebContext.cpp:
* UIProcess/WebContext.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (160299 => 160300)
--- trunk/Source/WebKit2/ChangeLog 2013-12-09 05:13:49 UTC (rev 160299)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-09 05:44:17 UTC (rev 160300)
@@ -1,5 +1,16 @@
2013-12-08 Sam Weinig <s...@webkit.org>
+ Remove WebContext::sharedProcessContext()
+ https://bugs.webkit.org/show_bug.cgi?id=125437
+
+ Reviewed by Dan Bernstein.
+
+ * UIProcess/API/ios/WKGeolocationProviderIOS.mm:
+ * UIProcess/WebContext.cpp:
+ * UIProcess/WebContext.h:
+
+2013-12-08 Sam Weinig <s...@webkit.org>
+
Fix the iOS build.
* UIProcess/API/ios/PageClientImplIOS.h:
Modified: trunk/Source/WebKit2/UIProcess/API/ios/WKGeolocationProviderIOS.mm (160299 => 160300)
--- trunk/Source/WebKit2/UIProcess/API/ios/WKGeolocationProviderIOS.mm 2013-12-09 05:13:49 UTC (rev 160299)
+++ trunk/Source/WebKit2/UIProcess/API/ios/WKGeolocationProviderIOS.mm 2013-12-09 05:44:17 UTC (rev 160300)
@@ -139,7 +139,8 @@
-(id)init
{
ASSERT_NOT_REACHED();
- return [self initWithContext:(WebContext::sharedProcessContext())];
+ [self release];
+ return nil;
}
-(id)initWithContext:(WebContext*)context
Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (160299 => 160300)
--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-12-09 05:13:49 UTC (rev 160299)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2013-12-09 05:44:17 UTC (rev 160300)
@@ -123,14 +123,6 @@
return contexts();
}
-#if PLATFORM(IOS)
-WebContext* WebContext::sharedProcessContext()
-{
- static WKContextRef sharedContextRef = WKContextCreate();
- return toImpl(sharedContextRef);
-}
-#endif
-
WebContext::WebContext(const String& injectedBundlePath)
: m_processModel(ProcessModelSharedSecondaryProcess)
, m_webProcessCountLimit(UINT_MAX)
Modified: trunk/Source/WebKit2/UIProcess/WebContext.h (160299 => 160300)
--- trunk/Source/WebKit2/UIProcess/WebContext.h 2013-12-09 05:13:49 UTC (rev 160299)
+++ trunk/Source/WebKit2/UIProcess/WebContext.h 2013-12-09 05:44:17 UTC (rev 160300)
@@ -101,10 +101,6 @@
static PassRefPtr<WebContext> create(const String& injectedBundlePath);
virtual ~WebContext();
-#if PLATFORM(IOS)
- static WebContext *sharedProcessContext();
-#endif
-
static const Vector<WebContext*>& allContexts();
template <typename T>
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
