Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(746)

Unified Diff: Source/core/page/Chrome.cpp

Issue 27030014: Remove Backslash-as-JPY hack (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: TextCodec/Encoding added Created 7 years, 2 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
« no previous file with comments | « Source/core/html/HTMLOptionElement.cpp ('k') | Source/core/platform/graphics/Font.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/Chrome.cpp
diff --git a/Source/core/page/Chrome.cpp b/Source/core/page/Chrome.cpp
index 0256c7c42f4f57807b36e4a7cf408c720c83900e..5d5c9ad9f2979e52c436c581038012854f74de45 100644
--- a/Source/core/page/Chrome.cpp
+++ b/Source/core/page/Chrome.cpp
@@ -243,10 +243,9 @@ void Chrome::runJavaScriptAlert(Frame* frame, const String& message)
ASSERT(frame);
notifyPopupOpeningObservers();
- String displayMessage = frame->displayStringModifiedByEncoding(message);
- InspectorInstrumentationCookie cookie = InspectorInstrumentation::willRunJavaScriptDialog(m_page, displayMessage);
- m_client->runJavaScriptAlert(frame, displayMessage);
+ InspectorInstrumentationCookie cookie = InspectorInstrumentation::willRunJavaScriptDialog(m_page, message);
+ m_client->runJavaScriptAlert(frame, message);
InspectorInstrumentation::didRunJavaScriptDialog(cookie);
}
@@ -261,10 +260,9 @@ bool Chrome::runJavaScriptConfirm(Frame* frame, const String& message)
ASSERT(frame);
notifyPopupOpeningObservers();
- String displayMessage = frame->displayStringModifiedByEncoding(message);
- InspectorInstrumentationCookie cookie = InspectorInstrumentation::willRunJavaScriptDialog(m_page, displayMessage);
- bool ok = m_client->runJavaScriptConfirm(frame, displayMessage);
+ InspectorInstrumentationCookie cookie = InspectorInstrumentation::willRunJavaScriptDialog(m_page, message);
+ bool ok = m_client->runJavaScriptConfirm(frame, message);
InspectorInstrumentation::didRunJavaScriptDialog(cookie);
return ok;
}
@@ -280,22 +278,18 @@ bool Chrome::runJavaScriptPrompt(Frame* frame, const String& prompt, const Strin
ASSERT(frame);
notifyPopupOpeningObservers();
- String displayPrompt = frame->displayStringModifiedByEncoding(prompt);
- InspectorInstrumentationCookie cookie = InspectorInstrumentation::willRunJavaScriptDialog(m_page, displayPrompt);
- bool ok = m_client->runJavaScriptPrompt(frame, displayPrompt, frame->displayStringModifiedByEncoding(defaultValue), result);
+ InspectorInstrumentationCookie cookie = InspectorInstrumentation::willRunJavaScriptDialog(m_page, prompt);
+ bool ok = m_client->runJavaScriptPrompt(frame, prompt, defaultValue, result);
InspectorInstrumentation::didRunJavaScriptDialog(cookie);
- if (ok)
- result = frame->displayStringModifiedByEncoding(result);
-
return ok;
}
void Chrome::setStatusbarText(Frame* frame, const String& status)
{
ASSERT(frame);
- m_client->setStatusbarText(frame->displayStringModifiedByEncoding(status));
+ m_client->setStatusbarText(status);
}
IntRect Chrome::windowResizerRect() const
« no previous file with comments | « Source/core/html/HTMLOptionElement.cpp ('k') | Source/core/platform/graphics/Font.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698