Diff
Modified: trunk/Source/WebCore/ChangeLog (163274 => 163275)
--- trunk/Source/WebCore/ChangeLog 2014-02-03 00:22:37 UTC (rev 163274)
+++ trunk/Source/WebCore/ChangeLog 2014-02-03 00:38:36 UTC (rev 163275)
@@ -1,3 +1,15 @@
+2014-02-02 Darin Adler <[email protected]>
+
+ Still more characters -> deprecatedCharacters (EWS keeps finding more)
+ https://bugs.webkit.org/show_bug.cgi?id=128076
+
+ Reviewed by Andreas Kling.
+
+ * platform/graphics/harfbuzz/HarfBuzzShaper.cpp:
+ (WebCore::HarfBuzzShaper::setFontFeatures):
+ (WebCore::HarfBuzzShaper::shapeHarfBuzzRuns):
+ Use deprecatedCharacters.
+
2014-02-02 Zalan Bujtas <[email protected]>
Subpixel rendering: Enable subpixel positioning/sizing/hairline border painting.
Modified: trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp (163274 => 163275)
--- trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp 2014-02-03 00:22:37 UTC (rev 163274)
+++ trunk/Source/WebCore/platform/graphics/harfbuzz/HarfBuzzShaper.cpp 2014-02-03 00:38:36 UTC (rev 163275)
@@ -371,7 +371,7 @@
unsigned numFeatures = settings->size();
for (unsigned i = 0; i < numFeatures; ++i) {
hb_feature_t feature;
- const UChar* tag = settings->at(i).tag().characters();
+ const UChar* tag = settings->at(i).tag().string().deprecatedCharacters();
feature.tag = HB_TAG(tag[0], tag[1], tag[2], tag[3]);
feature.value = settings->at(i).value();
feature.start = 0;
@@ -496,7 +496,7 @@
if (m_font->isSmallCaps() && u_islower(m_normalizedBuffer[currentRun->startIndex()])) {
String upperText = String(m_normalizedBuffer.get() + currentRun->startIndex(), currentRun->numCharacters()).upper();
currentFontData = m_font->glyphDataForCharacter(upperText[0], false, SmallCapsVariant).fontData;
- hb_buffer_add_utf16(harfBuzzBuffer.get(), reinterpret_cast<const uint16_t*>(upperText.characters()), currentRun->numCharacters(), 0, currentRun->numCharacters());
+ hb_buffer_add_utf16(harfBuzzBuffer.get(), reinterpret_cast<const uint16_t*>(upperText.deprecatedCharacters()), currentRun->numCharacters(), 0, currentRun->numCharacters());
} else
hb_buffer_add_utf16(harfBuzzBuffer.get(), reinterpret_cast<const uint16_t*>(m_normalizedBuffer.get() + currentRun->startIndex()), currentRun->numCharacters(), 0, currentRun->numCharacters());
Modified: trunk/Source/WebKit/win/AccessibleTextImpl.cpp (163274 => 163275)
--- trunk/Source/WebKit/win/AccessibleTextImpl.cpp 2014-02-03 00:22:37 UTC (rev 163274)
+++ trunk/Source/WebKit/win/AccessibleTextImpl.cpp 2014-02-03 00:38:36 UTC (rev 163275)
@@ -192,7 +192,7 @@
endOffset = convertSpecialOffset(endOffset);
WTF::String substringText = m_object->stringValue().substring(startOffset, endOffset - startOffset);
- *text = SysAllocStringLen(substringText.characters(), substringText.length());
+ *text = SysAllocStringLen(substringText.deprecatedCharacters(), substringText.length());
if (substringText.length() && !*text)
return E_OUTOFMEMORY;
@@ -256,7 +256,7 @@
return S_FALSE;
WTF::String substringText = m_object->text().substring(*startOffset, *endOffset - *startOffset);
- *text = SysAllocStringLen(substringText.characters(), substringText.length());
+ *text = SysAllocStringLen(substringText.deprecatedCharacters(), substringText.length());
if (substringText.length() && !*text)
return E_OUTOFMEMORY;
@@ -324,7 +324,7 @@
return S_FALSE;
WTF::String substringText = m_object->text().substring(*startOffset, *endOffset - *startOffset);
- *text = SysAllocStringLen(substringText.characters(), substringText.length());
+ *text = SysAllocStringLen(substringText.deprecatedCharacters(), substringText.length());
if (substringText.length() && !*text)
return E_OUTOFMEMORY;
@@ -384,7 +384,7 @@
return S_FALSE;
WTF::String substringText = m_object->text().substring(*startOffset, *endOffset - *startOffset);
- *text = SysAllocStringLen(substringText.characters(), substringText.length());
+ *text = SysAllocStringLen(substringText.deprecatedCharacters(), substringText.length());
if (substringText.length() && !*text)
return E_OUTOFMEMORY;
@@ -674,7 +674,7 @@
HRESULT AccessibleText::get_attributes(BSTR* attributes)
{
WTF::String text("text-model:a1");
- *attributes = SysAllocStringLen(text.characters(), text.length());
+ *attributes = SysAllocStringLen(text.deprecatedCharacters(), text.length());
return S_OK;
}
Modified: trunk/Source/WebKit/win/ChangeLog (163274 => 163275)
--- trunk/Source/WebKit/win/ChangeLog 2014-02-03 00:22:37 UTC (rev 163274)
+++ trunk/Source/WebKit/win/ChangeLog 2014-02-03 00:38:36 UTC (rev 163275)
@@ -1,3 +1,54 @@
+2014-02-02 Darin Adler <[email protected]>
+
+ Still more characters -> deprecatedCharacters (EWS keeps finding more)
+ https://bugs.webkit.org/show_bug.cgi?id=128076
+
+ Reviewed by Andreas Kling.
+
+ * AccessibleTextImpl.cpp:
+ (AccessibleText::get_text):
+ (AccessibleText::get_textBeforeOffset):
+ (AccessibleText::get_textAfterOffset):
+ (AccessibleText::get_textAtOffset):
+ (AccessibleText::get_attributes):
+ * DOMCSSClasses.cpp:
+ (DOMCSSStyleDeclaration::getPropertyValue):
+ * DOMCoreClasses.cpp:
+ (DOMNode::nodeValue):
+ (DOMElement::getAttribute):
+ (DOMElement::font):
+ * DOMHTMLClasses.cpp:
+ (DOMHTMLElement::innerText):
+ (DOMHTMLFormElement::action):
+ (DOMHTMLFormElement::method):
+ (DOMHTMLInputElement::value):
+ (DOMHTMLTextAreaElement::value):
+ * MarshallingHelpers.cpp:
+ (MarshallingHelpers::PathStringToFileCFURLRef):
+ * WebDataSource.cpp:
+ (WebDataSource::unreachableURL):
+ * WebDownload.cpp:
+ (WebDownload::bundlePathForTargetPath):
+ * WebDownloadCFNet.cpp:
+ (WebDownload::didFinish):
+ * WebElementPropertyBag.cpp:
+ (convertStringToVariant):
+ * WebFrame.cpp:
+ (WebFrame::searchForLabelsBeforeElement):
+ (WebFrame::matchLabelsAgainstElement):
+ * WebHistory.cpp:
+ (WebHistory::addVisitedLinksToPageGroup):
+ * WebKitGraphics.cpp:
+ (CenterTruncateStringToWidth):
+ (RightTruncateStringToWidth):
+ * WebView.cpp:
+ (WebView::applicationNameForUserAgent):
+ (WebView::customUserAgent):
+ (WebView::groupName):
+ (WebView::selectedText):
+ (WebView::onIMERequestReconvertString):
+ Use deprecatedCharacters.
+
2014-01-30 Andrei Bucur <[email protected]>
Remove the ACCELERATED_COMPOSITING flag
Modified: trunk/Source/WebKit/win/DOMCSSClasses.cpp (163274 => 163275)
--- trunk/Source/WebKit/win/DOMCSSClasses.cpp 2014-02-03 00:22:37 UTC (rev 163274)
+++ trunk/Source/WebKit/win/DOMCSSClasses.cpp 2014-02-03 00:38:36 UTC (rev 163275)
@@ -102,7 +102,7 @@
{
WTF::String propertyNameString(propertyName);
WTF::String value = m_style->getPropertyValue(propertyNameString);
- *result = SysAllocStringLen(value.characters(), value.length());
+ *result = SysAllocStringLen(value.deprecatedCharacters(), value.length());
if (value.length() && !*result)
return E_OUTOFMEMORY;
return S_OK;
Modified: trunk/Source/WebKit/win/DOMCoreClasses.cpp (163274 => 163275)
--- trunk/Source/WebKit/win/DOMCoreClasses.cpp 2014-02-03 00:22:37 UTC (rev 163274)
+++ trunk/Source/WebKit/win/DOMCoreClasses.cpp 2014-02-03 00:38:36 UTC (rev 163275)
@@ -122,7 +122,7 @@
if (!m_node)
return E_FAIL;
WTF::String nodeValueStr = m_node->nodeValue();
- *result = SysAllocStringLen(nodeValueStr.characters(), nodeValueStr.length());
+ *result = SysAllocStringLen(nodeValueStr.deprecatedCharacters(), nodeValueStr.length());
if (nodeValueStr.length() && !*result)
return E_OUTOFMEMORY;
return S_OK;
@@ -1033,7 +1033,7 @@
return E_FAIL;
WTF::String nameString(name, SysStringLen(name));
WTF::String& attrValueString = (WTF::String&) m_element->getAttribute(nameString);
- *result = SysAllocStringLen(attrValueString.characters(), attrValueString.length());
+ *result = SysAllocStringLen(attrValueString.deprecatedCharacters(), attrValueString.length());
if (attrValueString.length() && !*result)
return E_OUTOFMEMORY;
return S_OK;
@@ -1257,7 +1257,7 @@
FontDescription fontDescription = renderer->style().font().fontDescription();
AtomicString family = fontDescription.firstFamily();
- webFontDescription->family = family.characters();
+ webFontDescription->family = family.string().deprecatedCharacters();
webFontDescription->familyLength = family.length();
webFontDescription->size = fontDescription.computedSize();
webFontDescription->bold = fontDescription.weight() >= WebCore::FontWeight600;
Modified: trunk/Source/WebKit/win/DOMHTMLClasses.cpp (163274 => 163275)
--- trunk/Source/WebKit/win/DOMHTMLClasses.cpp 2014-02-03 00:22:37 UTC (rev 163274)
+++ trunk/Source/WebKit/win/DOMHTMLClasses.cpp 2014-02-03 00:38:36 UTC (rev 163275)
@@ -483,7 +483,7 @@
{
ASSERT(m_element && m_element->isHTMLElement());
WTF::String innerTextString = toHTMLElement(m_element)->innerText();
- *result = BString(innerTextString.characters(), innerTextString.length()).release();
+ *result = BString(innerTextString.deprecatedCharacters(), innerTextString.length()).release();
return S_OK;
}
@@ -561,7 +561,7 @@
{
ASSERT(m_element && isHTMLFormElement(m_element));
WTF::String actionString = toHTMLFormElement(m_element)->action();
- *result = BString(actionString.characters(), actionString.length()).release();
+ *result = BString(actionString.deprecatedCharacters(), actionString.length()).release();
return S_OK;
}
@@ -591,7 +591,7 @@
{
ASSERT(m_element && isHTMLFormElement(m_element));
WTF::String methodString = toHTMLFormElement(m_element)->method();
- *result = BString(methodString.characters(), methodString.length()).release();
+ *result = BString(methodString.deprecatedCharacters(), methodString.length()).release();
return S_OK;
}
@@ -1210,7 +1210,7 @@
ASSERT(m_element && isHTMLInputElement(m_element));
HTMLInputElement* inputElement = toHTMLInputElement(m_element);
WTF::String valueString = inputElement->value();
- *result = BString(valueString.characters(), valueString.length()).release();
+ *result = BString(valueString.deprecatedCharacters(), valueString.length()).release();
if (valueString.length() && !*result)
return E_OUTOFMEMORY;
return S_OK;
@@ -1547,7 +1547,7 @@
ASSERT(m_element && isHTMLTextAreaElement(m_element));
HTMLTextAreaElement* textareaElement = toHTMLTextAreaElement(m_element);
WTF::String valueString = textareaElement->value();
- *result = BString(valueString.characters(), valueString.length()).release();
+ *result = BString(valueString.deprecatedCharacters(), valueString.length()).release();
if (valueString.length() && !*result)
return E_OUTOFMEMORY;
return S_OK;
Modified: trunk/Source/WebKit/win/MarshallingHelpers.cpp (163274 => 163275)
--- trunk/Source/WebKit/win/MarshallingHelpers.cpp 2014-02-03 00:22:37 UTC (rev 163274)
+++ trunk/Source/WebKit/win/MarshallingHelpers.cpp 2014-02-03 00:38:36 UTC (rev 163275)
@@ -51,7 +51,7 @@
CFURLRef MarshallingHelpers::PathStringToFileCFURLRef(const String& string)
{
- CFStringRef cfPath = CFStringCreateWithCharactersNoCopy(0, (const UniChar*)string.characters(), string.length(), kCFAllocatorNull);
+ CFStringRef cfPath = CFStringCreateWithCharactersNoCopy(0, (const UniChar*)string.deprecatedCharacters(), string.length(), kCFAllocatorNull);
CFURLRef pathURL = CFURLCreateWithFileSystemPath(0, cfPath, kCFURLWindowsPathStyle, false);
CFRelease(cfPath);
return pathURL;
Modified: trunk/Source/WebKit/win/WebDataSource.cpp (163274 => 163275)
--- trunk/Source/WebKit/win/WebDataSource.cpp 2014-02-03 00:22:37 UTC (rev 163274)
+++ trunk/Source/WebKit/win/WebDataSource.cpp 2014-02-03 00:38:36 UTC (rev 163275)
@@ -255,7 +255,7 @@
/* [retval][out] */ BSTR* url)
{
URL unreachableURL = m_loader->unreachableURL();
- BString urlString((LPOLESTR)unreachableURL.string().characters(), unreachableURL.string().length());
+ BString urlString((LPOLESTR)unreachableURL.string().deprecatedCharacters(), unreachableURL.string().length());
*url = ""
return S_OK;
Modified: trunk/Source/WebKit/win/WebDownload.cpp (163274 => 163275)
--- trunk/Source/WebKit/win/WebDownload.cpp 2014-02-03 00:22:37 UTC (rev 163274)
+++ trunk/Source/WebKit/win/WebDownload.cpp 2014-02-03 00:38:36 UTC (rev 163275)
@@ -149,7 +149,7 @@
bundle.truncate(1);
bundle.append(DownloadBundle::fileExtension());
- *bundlePath = SysAllocStringLen(bundle.characters(), bundle.length());
+ *bundlePath = SysAllocStringLen(bundle.deprecatedCharacters(), bundle.length());
if (!*bundlePath)
return E_FAIL;
return S_OK;
Modified: trunk/Source/WebKit/win/WebDownloadCFNet.cpp (163274 => 163275)
--- trunk/Source/WebKit/win/WebDownloadCFNet.cpp 2014-02-03 00:22:37 UTC (rev 163274)
+++ trunk/Source/WebKit/win/WebDownloadCFNet.cpp 2014-02-03 00:38:36 UTC (rev 163275)
@@ -483,7 +483,7 @@
bool reportBundlePathAsFinalPath = true;
- BString destinationBSTR(m_destination.characters(), m_destination.length());
+ BString destinationBSTR(m_destination.deprecatedCharacters(), m_destination.length());
if (FAILED(m_delegate->decideDestinationWithSuggestedFilename(this, destinationBSTR)))
LOG_ERROR("delegate->decideDestinationWithSuggestedFilename() failed");
Modified: trunk/Source/WebKit/win/WebElementPropertyBag.cpp (163274 => 163275)
--- trunk/Source/WebKit/win/WebElementPropertyBag.cpp 2014-02-03 00:22:37 UTC (rev 163274)
+++ trunk/Source/WebKit/win/WebElementPropertyBag.cpp 2014-02-03 00:38:36 UTC (rev 163275)
@@ -102,7 +102,7 @@
static HRESULT convertStringToVariant(VARIANT* pVar, const String& string)
{
V_VT(pVar) = VT_BSTR;
- V_BSTR(pVar) = SysAllocStringLen(string.characters(), string.length());
+ V_BSTR(pVar) = SysAllocStringLen(string.deprecatedCharacters(), string.length());
if (string.length() && !V_BSTR(pVar))
return E_OUTOFMEMORY;
Modified: trunk/Source/WebKit/win/WebFrame.cpp (163274 => 163275)
--- trunk/Source/WebKit/win/WebFrame.cpp 2014-02-03 00:22:37 UTC (rev 163274)
+++ trunk/Source/WebKit/win/WebFrame.cpp 2014-02-03 00:38:36 UTC (rev 163275)
@@ -1383,7 +1383,7 @@
bool resultIsInCellAbove;
String label = coreFrame->searchForLabelsBeforeElement(labelStrings, coreElement, &resultDistance, &resultIsInCellAbove);
- *result = SysAllocStringLen(label.characters(), label.length());
+ *result = SysAllocStringLen(label.deprecatedCharacters(), label.length());
if (label.length() && !*result)
return E_OUTOFMEMORY;
if (outResultDistance)
@@ -1421,7 +1421,7 @@
String label = coreFrame->matchLabelsAgainstElement(labelStrings, coreElement);
- *result = SysAllocStringLen(label.characters(), label.length());
+ *result = SysAllocStringLen(label.deprecatedCharacters(), label.length());
if (label.length() && !*result)
return E_OUTOFMEMORY;
return S_OK;
Modified: trunk/Source/WebKit/win/WebHistory.cpp (163274 => 163275)
--- trunk/Source/WebKit/win/WebHistory.cpp 2014-02-03 00:22:37 UTC (rev 163274)
+++ trunk/Source/WebKit/win/WebHistory.cpp 2014-02-03 00:38:36 UTC (rev 163275)
@@ -567,6 +567,6 @@
{
for (auto it = m_entriesByURL.begin(); it != m_entriesByURL.end(); ++it) {
const String& url = ""
- group.addVisitedLink(url.characters(), url.length());
+ group.addVisitedLink(url.deprecatedCharacters(), url.length());
}
}
Modified: trunk/Source/WebKit/win/WebKitGraphics.cpp (163274 => 163275)
--- trunk/Source/WebKit/win/WebKitGraphics.cpp 2014-02-03 00:22:37 UTC (rev 163274)
+++ trunk/Source/WebKit/win/WebKitGraphics.cpp 2014-02-03 00:38:36 UTC (rev 163275)
@@ -117,7 +117,7 @@
FontCachePurgePreventer fontCachePurgePreventer;
String result = StringTruncator::centerTruncate(String(text, length), width, makeFont(description), StringTruncator::EnableRoundingHacks);
- memcpy(buffer, result.characters(), result.length() * sizeof(UChar));
+ memcpy(buffer, result.deprecatedCharacters(), result.length() * sizeof(UChar));
buffer[result.length()] = '\0';
return result.length();
}
@@ -129,7 +129,7 @@
FontCachePurgePreventer fontCachePurgePreventer;
String result = StringTruncator::rightTruncate(String(text, length), width, makeFont(description), StringTruncator::EnableRoundingHacks);
- memcpy(buffer, result.characters(), result.length() * sizeof(UChar));
+ memcpy(buffer, result.deprecatedCharacters(), result.length() * sizeof(UChar));
buffer[result.length()] = '\0';
return result.length();
}
Modified: trunk/Source/WebKit/win/WebView.cpp (163274 => 163275)
--- trunk/Source/WebKit/win/WebView.cpp 2014-02-03 00:22:37 UTC (rev 163274)
+++ trunk/Source/WebKit/win/WebView.cpp 2014-02-03 00:38:36 UTC (rev 163275)
@@ -3173,7 +3173,7 @@
HRESULT STDMETHODCALLTYPE WebView::applicationNameForUserAgent(
/* [retval][out] */ BSTR* applicationName)
{
- *applicationName = SysAllocStringLen(m_applicationName.characters(), m_applicationName.length());
+ *applicationName = SysAllocStringLen(m_applicationName.deprecatedCharacters(), m_applicationName.length());
if (!*applicationName && m_applicationName.length())
return E_OUTOFMEMORY;
return S_OK;
@@ -3193,7 +3193,7 @@
*userAgentString = 0;
if (!m_userAgentOverridden)
return S_OK;
- *userAgentString = SysAllocStringLen(m_userAgentCustom.characters(), m_userAgentCustom.length());
+ *userAgentString = SysAllocStringLen(m_userAgentCustom.deprecatedCharacters(), m_userAgentCustom.length());
if (!*userAgentString && m_userAgentCustom.length())
return E_OUTOFMEMORY;
return S_OK;
@@ -3641,7 +3641,7 @@
if (!m_page)
return S_OK;
String groupNameString = m_page->groupName();
- *groupName = SysAllocStringLen(groupNameString.characters(), groupNameString.length());
+ *groupName = SysAllocStringLen(groupNameString.deprecatedCharacters(), groupNameString.length());
if (!*groupName && groupNameString.length())
return E_OUTOFMEMORY;
return S_OK;
@@ -3751,7 +3751,7 @@
return E_FAIL;
String frameSelectedText = focusedFrame->editor().selectedText();
- *text = SysAllocStringLen(frameSelectedText.characters(), frameSelectedText.length());
+ *text = SysAllocStringLen(frameSelectedText.deprecatedCharacters(), frameSelectedText.length());
if (!*text && frameSelectedText.length())
return E_OUTOFMEMORY;
return S_OK;
@@ -5823,7 +5823,7 @@
reconvertString->dwStrLen = text.length();
reconvertString->dwTargetStrLen = text.length();
reconvertString->dwStrOffset = sizeof(RECONVERTSTRING);
- memcpy(reconvertString + 1, text.characters(), text.length() * sizeof(UChar));
+ memcpy(reconvertString + 1, text.deprecatedCharacters(), text.length() * sizeof(UChar));
return totalSize;
}
