Title: [162680] trunk/Source/WebKit/mac
- Revision
- 162680
- Author
- commit-qu...@webkit.org
- Date
- 2014-01-23 19:08:56 -0800 (Thu, 23 Jan 2014)
Log Message
Remote Inspector uses the Page pointer before the page is created on iOS
https://bugs.webkit.org/show_bug.cgi?id=127534
Patch by Benjamin Poulain <bpoul...@apple.com> on 2014-01-23
Reviewed by Joseph Pecoraro.
* WebView/WebView.mm:
(-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (162679 => 162680)
--- trunk/Source/WebKit/mac/ChangeLog 2014-01-24 02:55:15 UTC (rev 162679)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-01-24 03:08:56 UTC (rev 162680)
@@ -1,3 +1,13 @@
+2014-01-23 Benjamin Poulain <bpoul...@apple.com>
+
+ Remote Inspector uses the Page pointer before the page is created on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=127534
+
+ Reviewed by Joseph Pecoraro.
+
+ * WebView/WebView.mm:
+ (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
+
2014-01-23 Jon Honeycutt <jhoneyc...@apple.com>
Assertion failure in WebCore::PseudoElement::didRecalcStyle()
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (162679 => 162680)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2014-01-24 02:55:15 UTC (rev 162679)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2014-01-24 03:08:56 UTC (rev 162680)
@@ -1139,17 +1139,6 @@
_private->mainFrameDocumentReady = NO;
_private->drawsBackground = YES;
_private->backgroundColor = CGColorRetain(cachedCGColor(Color::white, ColorSpaceDeviceRGB));
-
-#if ENABLE(REMOTE_INSPECTOR)
- // Production installs always disallow debugging simple HTML documents.
- // Internal installs allow debugging simple HTML documents (TextFields) if the Internal Setting is enabled.
- if (!isInternalInstall())
- _private->page->setRemoteInspectionAllowed(false);
- else {
- static BOOL textFieldInspectionEnabled = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitTextFieldRemoteInspectionEnabledPreferenceKey];
- _private->page->setRemoteInspectionAllowed(textFieldInspectionEnabled);
- }
-#endif
WebFrameView *frameView = nil;
frameView = [[WebFrameView alloc] initWithFrame: CGRectMake(0,0,frame.size.width,frame.size.height)];
@@ -1196,6 +1185,17 @@
_private->page->setGroupName(groupName);
+#if ENABLE(REMOTE_INSPECTOR)
+ // Production installs always disallow debugging simple HTML documents.
+ // Internal installs allow debugging simple HTML documents (TextFields) if the Internal Setting is enabled.
+ if (!isInternalInstall())
+ _private->page->setRemoteInspectionAllowed(false);
+ else {
+ static BOOL textFieldInspectionEnabled = [[NSUserDefaults standardUserDefaults] boolForKey:WebKitTextFieldRemoteInspectionEnabledPreferenceKey];
+ _private->page->setRemoteInspectionAllowed(textFieldInspectionEnabled);
+ }
+#endif
+
[WebFrame _createMainFrameWithSimpleHTMLDocumentWithPage:_private->page frameView:frameView style:style];
[self _addToAllWebViewsSet];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
