Attachment #140797 for bug #85921

View Details Raw Unified Return to Bug 85921

| Differences between



2012-05-08  Rob Flack  <flackr@chromium.org>

        [chromium] Only increase size of Combo Box Options when displayed on touch screen
        https://bugs.webkit.org/show_bug.cgi?id=85921

        Reviewed by NOBODY (OOPS!).

        Adds a flag to set whether the current device is a touch screen, independent of whether touch events are supported and use this for the combo box sizing.

        * page/Settings.cpp:
        (WebCore::Settings::Settings):
        * page/Settings.h:
        (WebCore::Settings::setDeviceTouchScreen):
        (WebCore::Settings::isDeviceTouchScreen):
        (Settings):
        * platform/chromium/PopupListBox.cpp:
        (WebCore::PopupListBox::getRowHeight):
        * platform/chromium/PopupListBox.h:
        (PopupContainerSettings):
        * platform/chromium/PopupMenuChromium.cpp:
        (WebCore::PopupMenuChromium::show):

2012-05-08  Rafael Weinstein  <rafaelw@chromium.org>

        HTMLElementStack::hasOnlyHTMLElementsInScope is no longer called



    , m_wantsBalancedSetDefersLoadingBehavior(false)
    , m_requestAnimationFrameEnabled(true)
    , m_loadsImagesAutomaticallyTimer(this, &Settings::loadsImagesAutomaticallyTimerFired)
    , m_incrementalRenderingSuppressionTimeoutInSeconds(defaultIncrementalRenderingSuppressionTimeoutInSeconds),
    , m_deviceTouchScreen(false)
{
    // A Frame may not have been created yet, so we initialize the AtomicString
    // hash before trying to use it.

Lines 561-566 namespace WebCore { Source/WebCore/page/Settings.h_sec1
- Source/WebCore/page/Settings.h +4 lines
561	void setRequestAnimationFrameEnabled(bool enabled) { m_requestAnimationFrameEnabled = enabled; }	561	void setRequestAnimationFrameEnabled(bool enabled) { m_requestAnimationFrameEnabled = enabled; }
562	bool requestAnimationFrameEnabled() const { return m_requestAnimationFrameEnabled; }	562	bool requestAnimationFrameEnabled() const { return m_requestAnimationFrameEnabled; }
563		563
		564	void setDeviceTouchScreen(bool enabled) { m_deviceTouchScreen = enabled; }
		565	bool isDeviceTouchScreen() const { return m_deviceTouchScreen; }
		566
564	#if USE(JSC)	567	#if USE(JSC)
565	static void setShouldRespectPriorityInCSSAttributeSetters(bool);	568	static void setShouldRespectPriorityInCSSAttributeSetters(bool);
566	static bool shouldRespectPriorityInCSSAttributeSetters();	569	static bool shouldRespectPriorityInCSSAttributeSetters();
Lines 730-735 namespace WebCore { Source/WebCore/page/Settings.h_sec2
730	void loadsImagesAutomaticallyTimerFired(Timer<Settings>*);	733	void loadsImagesAutomaticallyTimerFired(Timer<Settings>*);
731		734
732	double m_incrementalRenderingSuppressionTimeoutInSeconds;	735	double m_incrementalRenderingSuppressionTimeoutInSeconds;
		736	bool m_deviceTouchScreen : 1;
733		737
734	#if USE(AVFOUNDATION)	738	#if USE(AVFOUNDATION)
735	static bool gAVFoundationEnabled;	739	static bool gAVFoundationEnabled;

Lines 632-638 int PopupListBox::getRowHeight(int index Source/WebCore/platform/chromium/PopupListBox.cpp_sec1
- Source/WebCore/platform/chromium/PopupListBox.cpp -1 / +1 lines
632	{	632	{
633	int scale = m_settings.defaultDeviceScaleFactor;	633	int scale = m_settings.defaultDeviceScaleFactor;
634	int paddingForTouch = 0;	634	int paddingForTouch = 0;
635	if (RuntimeEnabledFeatures::touchEnabled())	635	if (m_settings.isDeviceTouchScreen)
636	paddingForTouch = PopupMenuChromium::optionPaddingForTouch();	636	paddingForTouch = PopupMenuChromium::optionPaddingForTouch();
637	if (index < 0 \|\| m_popupClient->itemStyle(index).isDisplayNone())	637	if (index < 0 \|\| m_popupClient->itemStyle(index).isDisplayNone())
638	return PopupMenuChromium::minimumRowHeight() * scale;	638	return PopupMenuChromium::minimumRowHeight() * scale;

Lines 81-86 struct PopupContainerSettings { Source/WebCore/platform/chromium/PopupListBox.h_sec1
- Source/WebCore/platform/chromium/PopupListBox.h +1 lines
81	bool restrictWidthOfListBox;	81	bool restrictWidthOfListBox;
82		82
83	int defaultDeviceScaleFactor;	83	int defaultDeviceScaleFactor;
		84	bool isDeviceTouchScreen;
84	};	85	};
85		86
86	// A container for the data for each menu item (e.g. represented by <option>	87	// A container for the data for each menu item (e.g. represented by <option>

Lines 74-79 void PopupMenuChromium::show(const IntRe Source/WebCore/platform/chromium/PopupMenuChromium.cpp_sec1
- Source/WebCore/platform/chromium/PopupMenuChromium.cpp +2 lines
74	v->frame()->page()->settings()->defaultDeviceScaleFactor();	74	v->frame()->page()->settings()->defaultDeviceScaleFactor();
75	if (!popupSettings.defaultDeviceScaleFactor)	75	if (!popupSettings.defaultDeviceScaleFactor)
76	popupSettings.defaultDeviceScaleFactor = 1;	76	popupSettings.defaultDeviceScaleFactor = 1;
		77	popupSettings.isDeviceTouchScreen =
		78	v->frame()->page()->settings()->isDeviceTouchScreen();
77	p.popup = PopupContainer::create(client(), PopupContainer::Select, popupSettings);	79	p.popup = PopupContainer::create(client(), PopupContainer::Select, popupSettings);
78	}	80	}
79	p.popup->showInRect(r, v, index);	81	p.popup->showInRect(r, v, index);



2012-05-08  Rob Flack  <flackr@chromium.org>

        [chromium] Only increase size of Combo Box Options when displayed on touch screen.
        https://bugs.webkit.org/show_bug.cgi?id=85921

        Reviewed by NOBODY (OOPS!).

        Adds a flag to set whether the current device is a touch screen, independent of whether touch events are supported and use this for the combo box sizing.

        * public/WebSettings.h:
        * src/WebSettingsImpl.cpp:
        (WebKit::WebSettingsImpl::setDeviceTouchScreen):
        (WebKit):
        * src/WebSettingsImpl.h:
        (WebSettingsImpl):
        * src/WebViewImpl.cpp:
        (WebKit::WebViewImpl::applyAutofillSuggestions):
        * tests/PopupMenuTest.cpp:
        (WebKit::SelectPopupMenuTest::SetUp):
        (WebKit::SelectPopupMenuTest::TearDown):
        (SelectPopupMenuTest):

2012-05-08  W. James MacLean  <wjmaclean@chromium.org>

        [chromium] Create LinkHighlightLayerChromium class to provide link-highlight preview animations for GraphicsLayerChromium.

Lines 64-69 public: Source/WebKit/chromium/public/WebSettings.h_sec1
- Source/WebKit/chromium/public/WebSettings.h +1 lines
64	virtual void setMinimumLogicalFontSize(int) = 0;	64	virtual void setMinimumLogicalFontSize(int) = 0;
65	virtual void setDefaultDeviceScaleFactor(int) = 0;	65	virtual void setDefaultDeviceScaleFactor(int) = 0;
66	virtual void setDefaultTextEncodingName(const WebString&) = 0;	66	virtual void setDefaultTextEncodingName(const WebString&) = 0;
		67	virtual void setDeviceTouchScreen(bool) = 0;
67	virtual void setJavaScriptEnabled(bool) = 0;	68	virtual void setJavaScriptEnabled(bool) = 0;
68	virtual void setWebSecurityEnabled(bool) = 0;	69	virtual void setWebSecurityEnabled(bool) = 0;
69	virtual void setJavaScriptCanOpenWindowsAutomatically(bool) = 0;	70	virtual void setJavaScriptCanOpenWindowsAutomatically(bool) = 0;

Lines 114-119 void WebSettingsImpl::setDefaultDeviceSc Source/WebKit/chromium/src/WebSettingsImpl.cpp_sec1
- Source/WebKit/chromium/src/WebSettingsImpl.cpp +5 lines
114	m_settings->setDefaultDeviceScaleFactor(defaultDeviceScaleFactor);	114	m_settings->setDefaultDeviceScaleFactor(defaultDeviceScaleFactor);
115	}	115	}
116		116
		117	void WebSettingsImpl::setDeviceTouchScreen(bool deviceTouchScreen)
		118	{
		119	m_settings->setDeviceTouchScreen(deviceTouchScreen);
		120	}
		121
117	void WebSettingsImpl::setDefaultTextEncodingName(const WebString& encoding)	122	void WebSettingsImpl::setDefaultTextEncodingName(const WebString& encoding)
118	{	123	{
119	m_settings->setDefaultTextEncodingName((String)encoding);	124	m_settings->setDefaultTextEncodingName((String)encoding);

Lines 56-61 public: Source/WebKit/chromium/src/WebSettingsImpl.h_sec1
- Source/WebKit/chromium/src/WebSettingsImpl.h +1 lines
56	virtual void setMinimumLogicalFontSize(int);	56	virtual void setMinimumLogicalFontSize(int);
57	virtual void setDefaultDeviceScaleFactor(int);	57	virtual void setDefaultDeviceScaleFactor(int);
58	virtual void setDefaultTextEncodingName(const WebString&);	58	virtual void setDefaultTextEncodingName(const WebString&);
		59	virtual void setDeviceTouchScreen(bool);
59	virtual void setJavaScriptEnabled(bool);	60	virtual void setJavaScriptEnabled(bool);
60	virtual void setWebSecurityEnabled(bool);	61	virtual void setWebSecurityEnabled(bool);
61	virtual void setJavaScriptCanOpenWindowsAutomatically(bool);	62	virtual void setJavaScriptCanOpenWindowsAutomatically(bool);

Lines 2792-2797 void WebViewImpl::applyAutofillSuggestio Source/WebKit/chromium/src/WebViewImpl.cpp_sec1
- Source/WebKit/chromium/src/WebViewImpl.cpp +2 lines
2792	m_page->settings()->defaultDeviceScaleFactor();	2792	m_page->settings()->defaultDeviceScaleFactor();
2793	if (!popupSettings.defaultDeviceScaleFactor)	2793	if (!popupSettings.defaultDeviceScaleFactor)
2794	popupSettings.defaultDeviceScaleFactor = 1;	2794	popupSettings.defaultDeviceScaleFactor = 1;
		2795	popupSettings.isDeviceTouchScreen =
		2796	m_page->settings()->isDeviceTouchScreen();
2795	m_autofillPopup = PopupContainer::create(m_autofillPopupClient.get(),	2797	m_autofillPopup = PopupContainer::create(m_autofillPopupClient.get(),
2796	PopupContainer::Suggestion,	2798	PopupContainer::Suggestion,
2797	popupSettings);	2799	popupSettings);



protected:
    virtual void SetUp()
    {
        // When touch is enabled, padding is added to option elements
        // In these tests, we'll assume touch is disabled.
        m_touchWasEnabled = RuntimeEnabledFeatures::touchEnabled();
        RuntimeEnabledFeatures::setTouchEnabled(false);
        m_webView = static_cast<WebViewImpl*>(WebView::create(&m_webviewClient));
        // When a touch screen is present, padding is added to option elements.
        // In these tests, we'll assume no touch screen is attached.
        m_webView->page()->settings()->setDeviceTouchScreen(false);
        m_webView->initializeMainFrame(&m_webFrameClient);
        m_popupMenu = adoptRef(new PopupMenuChromium(&m_popupMenuClient));
    }

        m_popupMenu = 0;
        m_webView->close();
        webkit_support::UnregisterAllMockedURLs();
        RuntimeEnabledFeatures::setTouchEnabled(m_touchWasEnabled);
    }

    // Returns true if there currently is a select popup in the WebView.

    TestWebFrameClient m_webFrameClient;
    TestPopupMenuClient m_popupMenuClient;
    RefPtr<PopupMenu> m_popupMenu;
    bool m_touchWasEnabled;
    std::string baseURL;
};


Return to Bug 85921

Lines 266-272 Settings::Settings(Page* page) Source/WebCore/page/Settings.cpp_sec1
- Source/WebCore/page/Settings.cpp -1 / +2 lines
266	, m_wantsBalancedSetDefersLoadingBehavior(false)	266	, m_wantsBalancedSetDefersLoadingBehavior(false)
267	, m_requestAnimationFrameEnabled(true)	267	, m_requestAnimationFrameEnabled(true)
268	, m_loadsImagesAutomaticallyTimer(this, &Settings::loadsImagesAutomaticallyTimerFired)	268	, m_loadsImagesAutomaticallyTimer(this, &Settings::loadsImagesAutomaticallyTimerFired)
269	, m_incrementalRenderingSuppressionTimeoutInSeconds(defaultIncrementalRenderingSuppressionTimeoutInSeconds)	269	, m_incrementalRenderingSuppressionTimeoutInSeconds(defaultIncrementalRenderingSuppressionTimeoutInSeconds),
		270	, m_deviceTouchScreen(false)
270	{	271	{
271	// A Frame may not have been created yet, so we initialize the AtomicString	272	// A Frame may not have been created yet, so we initialize the AtomicString
272	// hash before trying to use it.	273	// hash before trying to use it.

Lines 182-192 public: Source/WebKit/chromium/tests/PopupMenuTest.cpp_sec1
- Source/WebKit/chromium/tests/PopupMenuTest.cpp -6 / +3 lines
182	protected:	182	protected:
183	virtual void SetUp()	183	virtual void SetUp()
184	{	184	{
185	// When touch is enabled, padding is added to option elements
186	// In these tests, we'll assume touch is disabled.
187	m_touchWasEnabled = RuntimeEnabledFeatures::touchEnabled();
188	RuntimeEnabledFeatures::setTouchEnabled(false);
189	m_webView = static_cast<WebViewImpl*>(WebView::create(&m_webviewClient));	185	m_webView = static_cast<WebViewImpl*>(WebView::create(&m_webviewClient));
		186	// When a touch screen is present, padding is added to option elements.
		187	// In these tests, we'll assume no touch screen is attached.
		188	m_webView->page()->settings()->setDeviceTouchScreen(false);
190	m_webView->initializeMainFrame(&m_webFrameClient);	189	m_webView->initializeMainFrame(&m_webFrameClient);
191	m_popupMenu = adoptRef(new PopupMenuChromium(&m_popupMenuClient));	190	m_popupMenu = adoptRef(new PopupMenuChromium(&m_popupMenuClient));
192	}	191	}
Lines 196-202 protected: Source/WebKit/chromium/tests/PopupMenuTest.cpp_sec2
196	m_popupMenu = 0;	195	m_popupMenu = 0;
197	m_webView->close();	196	m_webView->close();
198	webkit_support::UnregisterAllMockedURLs();	197	webkit_support::UnregisterAllMockedURLs();
199	RuntimeEnabledFeatures::setTouchEnabled(m_touchWasEnabled);
200	}	198	}
201		199
202	// Returns true if there currently is a select popup in the WebView.	200	// Returns true if there currently is a select popup in the WebView.
Lines 284-290 protected: Source/WebKit/chromium/tests/PopupMenuTest.cpp_sec3
284	TestWebFrameClient m_webFrameClient;	282	TestWebFrameClient m_webFrameClient;
285	TestPopupMenuClient m_popupMenuClient;	283	TestPopupMenuClient m_popupMenuClient;
286	RefPtr<PopupMenu> m_popupMenu;	284	RefPtr<PopupMenu> m_popupMenu;
287	bool m_touchWasEnabled;
288	std::string baseURL;	285	std::string baseURL;
289	};	286	};
290		287

Lines 1-3 Source/WebCore/ChangeLog_sec1
- Source/WebCore/ChangeLog +22 lines
		1	2012-05-08 Rob Flack <flackr@chromium.org>
		2
		3	[chromium] Only increase size of Combo Box Options when displayed on touch screen
		4	https://bugs.webkit.org/show_bug.cgi?id=85921
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Adds a flag to set whether the current device is a touch screen, independent of whether touch events are supported and use this for the combo box sizing.
		9
		10	* page/Settings.cpp:
		11	(WebCore::Settings::Settings):
		12	* page/Settings.h:
		13	(WebCore::Settings::setDeviceTouchScreen):
		14	(WebCore::Settings::isDeviceTouchScreen):
		15	(Settings):
		16	* platform/chromium/PopupListBox.cpp:
		17	(WebCore::PopupListBox::getRowHeight):
		18	* platform/chromium/PopupListBox.h:
		19	(PopupContainerSettings):
		20	* platform/chromium/PopupMenuChromium.cpp:
		21	(WebCore::PopupMenuChromium::show):
		22
1	2012-05-08 Rafael Weinstein <rafaelw@chromium.org>	23	2012-05-08 Rafael Weinstein <rafaelw@chromium.org>
2		24
3	HTMLElementStack::hasOnlyHTMLElementsInScope is no longer called	25	HTMLElementStack::hasOnlyHTMLElementsInScope is no longer called

Lines 1-3 Source/WebKit/chromium/ChangeLog_sec1
- Source/WebKit/chromium/ChangeLog +22 lines
		1	2012-05-08 Rob Flack <flackr@chromium.org>
		2
		3	[chromium] Only increase size of Combo Box Options when displayed on touch screen.
		4	https://bugs.webkit.org/show_bug.cgi?id=85921
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Adds a flag to set whether the current device is a touch screen, independent of whether touch events are supported and use this for the combo box sizing.
		9
		10	* public/WebSettings.h:
		11	* src/WebSettingsImpl.cpp:
		12	(WebKit::WebSettingsImpl::setDeviceTouchScreen):
		13	(WebKit):
		14	* src/WebSettingsImpl.h:
		15	(WebSettingsImpl):
		16	* src/WebViewImpl.cpp:
		17	(WebKit::WebViewImpl::applyAutofillSuggestions):
		18	* tests/PopupMenuTest.cpp:
		19	(WebKit::SelectPopupMenuTest::SetUp):
		20	(WebKit::SelectPopupMenuTest::TearDown):
		21	(SelectPopupMenuTest):
		22
1	2012-05-08 W. James MacLean <wjmaclean@chromium.org>	23	2012-05-08 W. James MacLean <wjmaclean@chromium.org>
2		24
3	[chromium] Create LinkHighlightLayerChromium class to provide link-highlight preview animations for GraphicsLayerChromium.	25	[chromium] Create LinkHighlightLayerChromium class to provide link-highlight preview animations for GraphicsLayerChromium.