Source/WebKit/chromium/src/DateTimeChooserImpl.cpp - Issue 12082066: Merge 140778

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: Source/WebKit/chromium/src/DateTimeChooserImpl.cpp

Issue 12082066: Merge 140778 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/

Patch Set: Created 7 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: Source/WebKit/chromium/src/DateTimeChooserImpl.cpp

===================================================================

--- Source/WebKit/chromium/src/DateTimeChooserImpl.cpp (revision 141208)

+++ Source/WebKit/chromium/src/DateTimeChooserImpl.cpp (working copy)

@@ -124,11 +124,10 @@

addString("<!DOCTYPE html><head><meta charset='UTF-8'><style>\n", writer);

writer.addData(WebCore::pickerCommonCss, sizeof(WebCore::pickerCommonCss));

+ writer.addData(WebCore::pickerCommonChromiumCss, sizeof(WebCore::pickerCommonChromiumCss));

writer.addData(WebCore::suggestionPickerCss, sizeof(WebCore::suggestionPickerCss));

writer.addData(WebCore::calendarPickerCss, sizeof(WebCore::calendarPickerCss));

- CString extraStyle = WebCore::RenderTheme::defaultTheme()->extraCalendarPickerStyleSheet();

- if (extraStyle.length())

- writer.addData(extraStyle.data(), extraStyle.length());

+ writer.addData(WebCore::calendarPickerChromiumCss, sizeof(WebCore::calendarPickerChromiumCss));

addString("</style></head><body><div id=main>Loading...</div><script>\n"

"window.dialogArguments = {\n", writer);

addProperty("anchorRectInScreen", anchorRectInScreen, writer);

« no previous file with comments | « Source/WebCore/rendering/RenderThemeChromiumMac.mm ('k') | no next file » | no next file with comments »