Title: [152500] branches/safari-537-branch/Source
- Revision
- 152500
- Author
- [email protected]
- Date
- 2013-07-09 11:00:54 -0700 (Tue, 09 Jul 2013)
Log Message
Merged r152348. <rdar://problem/13936550>
Modified Paths
Diff
Modified: branches/safari-537-branch/Source/WebCore/ChangeLog (152499 => 152500)
--- branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-09 17:56:49 UTC (rev 152499)
+++ branches/safari-537-branch/Source/WebCore/ChangeLog 2013-07-09 18:00:54 UTC (rev 152500)
@@ -1,5 +1,25 @@
2013-07-09 Lucas Forschler <[email protected]>
+ Merge r152348
+
+ 2013-07-03 Zalan Bujtas <[email protected]>
+
+ H&R Block 2010 Help window can not be reopened.
+ https://bugs.webkit.org/show_bug.cgi?id=118342
+
+ Reviewed by Antti Koivisto.
+
+ http://trac.webkit.org/changeset/118916 changed the window.focus() behaviour so that
+ only the opener can (re)focus() a particular window.
+ H&R Block app relies on the relaxed window.focus() rules.
+
+ * WebCore.exp.in:
+ * platform/RuntimeApplicationChecks.cpp:
+ (WebCore::applicationIsHRBlock):
+ * platform/RuntimeApplicationChecks.h:
+
+2013-07-09 Lucas Forschler <[email protected]>
+
Merge r152324
2013-07-02 Jer Noble <[email protected]>
Modified: branches/safari-537-branch/Source/WebCore/WebCore.exp.in (152499 => 152500)
--- branches/safari-537-branch/Source/WebCore/WebCore.exp.in 2013-07-09 17:56:49 UTC (rev 152499)
+++ branches/safari-537-branch/Source/WebCore/WebCore.exp.in 2013-07-09 18:00:54 UTC (rev 152500)
@@ -1844,6 +1844,7 @@
__ZN7WebCore20PlatformEventFactory24createPlatformMouseEventEP7NSEventP6NSView
__ZN7WebCore20PlatformEventFactory27createPlatformKeyboardEventEP7NSEvent
__ZN7WebCore20builtInPDFPluginNameEv
+__ZN7WebCore20applicationIsHRBlockEv
__ZN7WebCore21DeviceOrientationData6createEbdbdbdbb
__ZN7WebCore21applicationIsApertureEv
__ZN7WebCore21applicationIsVersionsEv
Modified: branches/safari-537-branch/Source/WebCore/platform/RuntimeApplicationChecks.cpp (152499 => 152500)
--- branches/safari-537-branch/Source/WebCore/platform/RuntimeApplicationChecks.cpp 2013-07-09 17:56:49 UTC (rev 152499)
+++ branches/safari-537-branch/Source/WebCore/platform/RuntimeApplicationChecks.cpp 2013-07-09 18:00:54 UTC (rev 152500)
@@ -108,6 +108,12 @@
return isVersions;
}
+bool applicationIsHRBlock()
+{
+ static bool isHRBlock = mainBundleIsEqualTo("com.hrblock.tax.2010");
+ return isHRBlock;
+}
+
bool applicationIsSolidStateNetworksDownloader()
{
static bool isSolidStateNetworksDownloader = mainBundleIsEqualTo("com.solidstatenetworks.awkhost");
Modified: branches/safari-537-branch/Source/WebCore/platform/RuntimeApplicationChecks.h (152499 => 152500)
--- branches/safari-537-branch/Source/WebCore/platform/RuntimeApplicationChecks.h 2013-07-09 17:56:49 UTC (rev 152499)
+++ branches/safari-537-branch/Source/WebCore/platform/RuntimeApplicationChecks.h 2013-07-09 18:00:54 UTC (rev 152500)
@@ -38,6 +38,7 @@
bool applicationIsSafari();
bool applicationIsSolidStateNetworksDownloader();
bool applicationIsVersions();
+bool applicationIsHRBlock();
} // namespace WebCore
Modified: branches/safari-537-branch/Source/WebKit/mac/ChangeLog (152499 => 152500)
--- branches/safari-537-branch/Source/WebKit/mac/ChangeLog 2013-07-09 17:56:49 UTC (rev 152499)
+++ branches/safari-537-branch/Source/WebKit/mac/ChangeLog 2013-07-09 18:00:54 UTC (rev 152500)
@@ -1,3 +1,22 @@
+2013-07-09 Lucas Forschler <[email protected]>
+
+ Merge r152348
+
+ 2013-07-03 Zalan Bujtas <[email protected]>
+
+ H&R Block 2010 Help window can not be reopened.
+ https://bugs.webkit.org/show_bug.cgi?id=118342
+
+ Reviewed by Antti Koivisto.
+
+ http://trac.webkit.org/changeset/118916 changed the window.focus() behaviour so that
+ only the opener can (re)focus() a particular window.
+ H&R Block app relies on the relaxed window.focus() rules.
+
+ * WebView/WebView.mm:
+ (shouldRestrictWindowFocus):
+ (-[WebView _preferencesChanged:]):
+
2013-07-08 Lucas Forschler <[email protected]>
Merge r152267
Modified: branches/safari-537-branch/Source/WebKit/mac/WebView/WebView.mm (152499 => 152500)
--- branches/safari-537-branch/Source/WebKit/mac/WebView/WebView.mm 2013-07-09 17:56:49 UTC (rev 152499)
+++ branches/safari-537-branch/Source/WebKit/mac/WebView/WebView.mm 2013-07-09 18:00:54 UTC (rev 152500)
@@ -622,6 +622,11 @@
return !applicationIsAdobeInstaller();
}
+static bool shouldRestrictWindowFocus()
+{
+ return !applicationIsHRBlock();
+}
+
- (void)_dispatchPendingLoadRequests
{
resourceLoadScheduler()->servePendingRequests();
@@ -1498,6 +1503,7 @@
settings->setWebGLEnabled([preferences webGLEnabled]);
settings->setAccelerated2dCanvasEnabled([preferences accelerated2dCanvasEnabled]);
settings->setLoadDeferringEnabled(shouldEnableLoadDeferring());
+ settings->setWindowFocusRestricted(shouldRestrictWindowFocus());
settings->setFrameFlatteningEnabled([preferences isFrameFlatteningEnabled]);
settings->setSpatialNavigationEnabled([preferences isSpatialNavigationEnabled]);
settings->setPaginateDuringLayoutEnabled([preferences paginateDuringLayoutEnabled]);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
