Diff
Modified: trunk/LayoutTests/ChangeLog (139054 => 139055)
--- trunk/LayoutTests/ChangeLog 2013-01-08 14:06:37 UTC (rev 139054)
+++ trunk/LayoutTests/ChangeLog 2013-01-08 14:12:11 UTC (rev 139055)
@@ -1,3 +1,12 @@
+2013-01-08 Keishi Hattori <[email protected]>
+
+ [Chromium] Don't confine page popups to root view on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=106315
+
+ Reviewed by Kent Tamura.
+
+ * platform/chromium/fast/forms/page-popup/page-popup-adjust-rect.html: Remove setting parameters confineToRootView and rootViewRectInScreen.
+
2013-01-08 Csaba Osztrogonác <[email protected]>
[Qt] Unreviewed gardening, skip a new failing test.
Modified: trunk/LayoutTests/platform/chromium/fast/forms/page-popup/page-popup-adjust-rect.html (139054 => 139055)
--- trunk/LayoutTests/platform/chromium/fast/forms/page-popup/page-popup-adjust-rect.html 2013-01-08 14:06:37 UTC (rev 139054)
+++ trunk/LayoutTests/platform/chromium/fast/forms/page-popup/page-popup-adjust-rect.html 2013-01-08 14:12:11 UTC (rev 139055)
@@ -27,7 +27,6 @@
}
function test() {
- popupWindow.global.params.confineToRootView = false;
popupWindow.screen = {
width: 80,
height: 60,
@@ -36,7 +35,6 @@
availWidth: 80,
availHeight: 60,
};
- popupWindow.global.params.rootViewRectInScreen = makeRect(0, 0, 80, 60);
debug("Move anchor element along the vertical axis.");
Modified: trunk/Source/WebCore/ChangeLog (139054 => 139055)
--- trunk/Source/WebCore/ChangeLog 2013-01-08 14:06:37 UTC (rev 139054)
+++ trunk/Source/WebCore/ChangeLog 2013-01-08 14:12:11 UTC (rev 139055)
@@ -1,3 +1,15 @@
+2013-01-08 Keishi Hattori <[email protected]>
+
+ [Chromium] Don't confine page popups to root view on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=106315
+
+ Reviewed by Kent Tamura.
+
+ No new tests.
+
+ * Resources/pagepopups/pickerCommon.js:
+ (adjustWindowRect): Remove code to confine to root view.
+
2012-12-12 Antonio Gomes <[email protected]>
Make RenderLayer::updateNeedsCompositedScrolling scrollbars agnostic
Modified: trunk/Source/WebCore/Resources/pagepopups/pickerCommon.js (139054 => 139055)
--- trunk/Source/WebCore/Resources/pagepopups/pickerCommon.js 2013-01-08 14:06:37 UTC (rev 139054)
+++ trunk/Source/WebCore/Resources/pagepopups/pickerCommon.js 2013-01-08 14:12:11 UTC (rev 139055)
@@ -115,10 +115,7 @@
return windowRect;
var anchorRect = new Rectangle(global.params.anchorRectInScreen);
- var rootViewRect = new Rectangle(global.params.rootViewRectInScreen);
var availRect = new Rectangle(window.screen.availLeft, window.screen.availTop, window.screen.availWidth, window.screen.availHeight);
- if (global.params.confineToRootView)
- availRect = Rectangle.intersection(availRect, rootViewRect) || new Rectangle(0, 0, 0, 0);
_adjustWindowRectVertically(windowRect, availRect, anchorRect, minHeight);
_adjustWindowRectHorizontally(windowRect, availRect, anchorRect, minWidth);
Modified: trunk/Source/WebKit/chromium/ChangeLog (139054 => 139055)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-01-08 14:06:37 UTC (rev 139054)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-01-08 14:12:11 UTC (rev 139055)
@@ -1,3 +1,18 @@
+2013-01-08 Keishi Hattori <[email protected]>
+
+ [Chromium] Don't confine page popups to root view on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=106315
+
+ Reviewed by Kent Tamura.
+
+ Page popups on Mac no longer get clipped to the web view so we can
+ remove the code to confine to root view.
+
+ * src/ColorChooserPopupUIController.cpp:
+ (WebKit::ColorChooserPopupUIController::writeDocument): Removing parameters confineToRootView and rootViewRectInScreen.
+ * src/DateTimeChooserImpl.cpp:
+ (WebKit::DateTimeChooserImpl::writeDocument): Ditto.
+
2012-12-20 Antonio Gomes <[email protected]>
Introduce a compositing trigger for scrollable frames
Modified: trunk/Source/WebKit/chromium/src/ColorChooserPopupUIController.cpp (139054 => 139055)
--- trunk/Source/WebKit/chromium/src/ColorChooserPopupUIController.cpp 2013-01-08 14:06:37 UTC (rev 139054)
+++ trunk/Source/WebKit/chromium/src/ColorChooserPopupUIController.cpp 2013-01-08 14:12:11 UTC (rev 139055)
@@ -91,9 +91,6 @@
for (unsigned i = 0; i < suggestions.size(); i++)
suggestionValues.append(suggestions[i].serialized());
IntRect anchorRectInScreen = m_chromeClient->rootViewToScreen(m_client->elementRectRelativeToRootView());
- FrameView* view = static_cast<WebViewImpl*>(m_chromeClient->webView())->page()->mainFrame()->view();
- IntRect rootViewVisibleContentRect = view->visibleContentRect(true /* include scrollbars */);
- IntRect rootViewRectInScreen = m_chromeClient->rootViewToScreen(rootViewVisibleContentRect);
PagePopupClient::addString("<!DOCTYPE html><head><meta charset='UTF-8'><style>\n", writer);
writer.addData(pickerCommonCss, sizeof(pickerCommonCss));
@@ -103,12 +100,6 @@
PagePopupClient::addProperty("values", suggestionValues, writer);
PagePopupClient::addProperty("otherColorLabel", Platform::current()->queryLocalizedString(WebLocalizedString::OtherColorLabel), writer);
addProperty("anchorRectInScreen", anchorRectInScreen, writer);
- addProperty("rootViewRectInScreen", rootViewRectInScreen, writer);
-#if OS(MAC_OS_X)
- addProperty("confineToRootView", true, writer);
-#else
- addProperty("confineToRootView", false, writer);
-#endif
PagePopupClient::addString("};\n", writer);
writer.addData(pickerCommonJs, sizeof(pickerCommonJs));
writer.addData(colorSuggestionPickerJs, sizeof(colorSuggestionPickerJs));
Modified: trunk/Source/WebKit/chromium/src/DateTimeChooserImpl.cpp (139054 => 139055)
--- trunk/Source/WebKit/chromium/src/DateTimeChooserImpl.cpp 2013-01-08 14:06:37 UTC (rev 139054)
+++ trunk/Source/WebKit/chromium/src/DateTimeChooserImpl.cpp 2013-01-08 14:12:11 UTC (rev 139055)
@@ -105,10 +105,6 @@
String stepString = String::number(m_parameters.step);
String stepBaseString = String::number(m_parameters.stepBase, 11, WTF::TruncateTrailingZeros);
IntRect anchorRectInScreen = m_chromeClient->rootViewToScreen(m_parameters.anchorRectInRootView);
- FrameView* view = static_cast<WebViewImpl*>(m_chromeClient->webView())->page()->mainFrame()->view();
- IntRect rootViewVisibleContentRect = view->visibleContentRect(true /* include scrollbars */);
- IntRect rootViewRectInScreen = m_chromeClient->rootViewToScreen(rootViewVisibleContentRect);
- rootViewRectInScreen.move(-view->scrollX(), -view->scrollY());
String todayLabelString;
String otherDateLabelString;
if (m_parameters.type == WebCore::InputTypeNames::month()) {
@@ -132,12 +128,6 @@
addString("</style></head><body><div id=main>Loading...</div><script>\n"
"window.dialogArguments = {\n", writer);
addProperty("anchorRectInScreen", anchorRectInScreen, writer);
- addProperty("rootViewRectInScreen", rootViewRectInScreen, writer);
-#if OS(MAC_OS_X)
- addProperty("confineToRootView", true, writer);
-#else
- addProperty("confineToRootView", false, writer);
-#endif
addProperty("min", minDate.toString(), writer);
addProperty("max", maxDate.toString(), writer);
addProperty("step", stepString, writer);
