Source/web/ColorChooserPopupUIController.cpp - Issue 120513004: Don't expose DocumentWriter to embedding layer

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/web/ColorChooserPopupUIController.cpp

Issue 120513004: Don't expose DocumentWriter to embedding layer (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 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:

View side-by-side diff with in-line comments

Download patch

Index: Source/web/ColorChooserPopupUIController.cpp

diff --git a/Source/web/ColorChooserPopupUIController.cpp b/Source/web/ColorChooserPopupUIController.cpp

index 590e3e473f24c5ed6df0c525e207471cd0b52cf9..8a70f1d8a0e36825e75b019eb41220f26025a17b 100644

--- a/Source/web/ColorChooserPopupUIController.cpp

+++ b/Source/web/ColorChooserPopupUIController.cpp

@@ -80,7 +80,7 @@ IntSize ColorChooserPopupUIController::contentSize()

return IntSize(0, 0);

}

-void ColorChooserPopupUIController::writeDocument(DocumentWriter& writer)

+void ColorChooserPopupUIController::writeDocument(SharedBuffer* data)

{

Vector<ColorSuggestion> suggestions = m_client->suggestions();

Vector<String> suggestionValues;

@@ -88,18 +88,18 @@ void ColorChooserPopupUIController::writeDocument(DocumentWriter& writer)

suggestionValues.append(suggestions[i].color.serialized());

IntRect anchorRectInScreen = m_chromeClient->rootViewToScreen(m_client->elementRectRelativeToRootView());

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

- writer.addData(pickerCommonCss, sizeof(pickerCommonCss));

- writer.addData(colorSuggestionPickerCss, sizeof(colorSuggestionPickerCss));

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

+ data->append(pickerCommonCss, sizeof(pickerCommonCss));

+ data->append(colorSuggestionPickerCss, sizeof(colorSuggestionPickerCss));

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

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

- PagePopupClient::addProperty("values", suggestionValues, writer);

- PagePopupClient::addProperty("otherColorLabel", locale().queryString(WebLocalizedString::OtherColorLabel), writer);

- addProperty("anchorRectInScreen", anchorRectInScreen, writer);

- PagePopupClient::addString("};\n", writer);

- writer.addData(pickerCommonJs, sizeof(pickerCommonJs));

- writer.addData(colorSuggestionPickerJs, sizeof(colorSuggestionPickerJs));

- PagePopupClient::addString("</script></body>\n", writer);

+ "window.dialogArguments = {\n", data);

+ PagePopupClient::addProperty("values", suggestionValues, data);

+ PagePopupClient::addProperty("otherColorLabel", locale().queryString(WebLocalizedString::OtherColorLabel), data);

+ addProperty("anchorRectInScreen", anchorRectInScreen, data);

+ PagePopupClient::addString("};\n", data);

+ data->append(pickerCommonJs, sizeof(pickerCommonJs));

+ data->append(colorSuggestionPickerJs, sizeof(colorSuggestionPickerJs));

+ PagePopupClient::addString("</script></body>\n", data);

}

Locale& ColorChooserPopupUIController::locale()

« Source/core/loader/SubstituteData.h ('K') | « Source/web/ColorChooserPopupUIController.h ('k') | Source/web/DateTimeChooserImpl.h » ('j') | no next file with comments »