diff options
Diffstat (limited to 'Source/WebKit/mac/WebView/WebView.mm')
| -rw-r--r-- | Source/WebKit/mac/WebView/WebView.mm | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/Source/WebKit/mac/WebView/WebView.mm b/Source/WebKit/mac/WebView/WebView.mm index 809b286..82e4f2c 100644 --- a/Source/WebKit/mac/WebView/WebView.mm +++ b/Source/WebKit/mac/WebView/WebView.mm @@ -1496,6 +1496,7 @@ static bool fastDocumentTeardownEnabled() settings->setShowDebugBorders([preferences showDebugBorders]); settings->setShowRepaintCounter([preferences showRepaintCounter]); settings->setPluginAllowedRunTime([preferences pluginAllowedRunTime]); + settings->setWebAudioEnabled([preferences webAudioEnabled]); settings->setWebGLEnabled([preferences webGLEnabled]); settings->setAccelerated2dCanvasEnabled([preferences accelerated2dCanvasEnabled]); settings->setLoadDeferringEnabled(shouldEnableLoadDeferring()); @@ -1604,14 +1605,23 @@ static inline IMP getMethod(id o, SEL s) cache->didParseSourceFunc = getMethod(delegate, @selector(webView:didParseSource:baseLineNumber:fromURL:sourceId:forWebFrame:)); if (cache->didParseSourceFunc) cache->didParseSourceExpectsBaseLineNumber = YES; - else + else { + cache->didParseSourceExpectsBaseLineNumber = NO; cache->didParseSourceFunc = getMethod(delegate, @selector(webView:didParseSource:fromURL:sourceId:forWebFrame:)); + } cache->failedToParseSourceFunc = getMethod(delegate, @selector(webView:failedToParseSource:baseLineNumber:fromURL:withError:forWebFrame:)); cache->didEnterCallFrameFunc = getMethod(delegate, @selector(webView:didEnterCallFrame:sourceId:line:forWebFrame:)); cache->willExecuteStatementFunc = getMethod(delegate, @selector(webView:willExecuteStatement:sourceId:line:forWebFrame:)); cache->willLeaveCallFrameFunc = getMethod(delegate, @selector(webView:willLeaveCallFrame:sourceId:line:forWebFrame:)); - cache->exceptionWasRaisedFunc = getMethod(delegate, @selector(webView:exceptionWasRaised:sourceId:line:forWebFrame:)); + + cache->exceptionWasRaisedFunc = getMethod(delegate, @selector(webView:exceptionWasRaised:hasHandler:sourceId:line:forWebFrame:)); + if (cache->exceptionWasRaisedFunc) + cache->exceptionWasRaisedExpectsHasHandlerFlag = YES; + else { + cache->exceptionWasRaisedExpectsHasHandlerFlag = NO; + cache->exceptionWasRaisedFunc = getMethod(delegate, @selector(webView:exceptionWasRaised:sourceId:line:forWebFrame:)); + } } - (void)_cacheHistoryDelegateImplementations @@ -5947,7 +5957,7 @@ static inline uint64_t roundUpToPowerOf2(uint64_t num) { Frame* frame = [self _mainCoreFrame]; if (frame && frame->view()) - return frame->view()->syncCompositingStateRecursive(); + return frame->view()->syncCompositingStateIncludingSubframes(); return YES; } |