Diff
Modified: trunk/ChangeLog (144571 => 144572)
--- trunk/ChangeLog 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/ChangeLog 2013-03-03 11:47:47 UTC (rev 144572)
@@ -1,3 +1,14 @@
+2013-03-03 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r144567.
+ http://trac.webkit.org/changeset/144567
+ https://bugs.webkit.org/show_bug.cgi?id=111266
+
+ Does not compile on apple-win (Requested by abarth on
+ #webkit).
+
+ * Source/autotools/symbols.filter:
+
2013-03-03 Ruslan Abdikeev <[email protected]>
<link rel="apple-touch-icon"> tag is not honored on CNN.com, workflowy.com etc
Modified: trunk/LayoutTests/ChangeLog (144571 => 144572)
--- trunk/LayoutTests/ChangeLog 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/LayoutTests/ChangeLog 2013-03-03 11:47:47 UTC (rev 144572)
@@ -1,3 +1,19 @@
+2013-03-03 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r144567.
+ http://trac.webkit.org/changeset/144567
+ https://bugs.webkit.org/show_bug.cgi?id=111266
+
+ Does not compile on apple-win (Requested by abarth on
+ #webkit).
+
+ * fast/dom/icon-url-change.html:
+ * fast/dom/icon-url-list-apple-touch-expected.txt: Removed.
+ * fast/dom/icon-url-list-apple-touch.html: Removed.
+ * fast/dom/icon-url-list.html:
+ * fast/dom/icon-url-property.html:
+ * platform/chromium-android/fast/dom/icon-url-list-apple-touch-expected.txt: Removed.
+
2013-03-03 Ruslan Abdikeev <[email protected]>
<link rel="apple-touch-icon"> tag is not honored on CNN.com, workflowy.com etc
Modified: trunk/LayoutTests/fast/dom/icon-url-change.html (144571 => 144572)
--- trunk/LayoutTests/fast/dom/icon-url-change.html 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/LayoutTests/fast/dom/icon-url-change.html 2013-03-03 11:47:47 UTC (rev 144572)
@@ -45,7 +45,7 @@
// check that the URL list in the document is as we expect
var expectedURLs = "http://test.com/oldfavicon.ico";
- var iconURLs = window.internals.shortcutIconURLs(document);
+ var iconURLs = window.internals.iconURLs(document);
if (expectedURLs == iconURLs[0])
testPassed('URL list matches expected');
else
Deleted: trunk/LayoutTests/fast/dom/icon-url-list-apple-touch-expected.txt (144571 => 144572)
--- trunk/LayoutTests/fast/dom/icon-url-list-apple-touch-expected.txt 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/LayoutTests/fast/dom/icon-url-list-apple-touch-expected.txt 2013-03-03 11:47:47 UTC (rev 144572)
@@ -1,3 +0,0 @@
-Tests that all favicons and touch icons (if ENABLE(TOUCH_ICON_LOADING)) are in document.iconURLs()
-http://test.com/oldfavicon.ico
-
Deleted: trunk/LayoutTests/fast/dom/icon-url-list-apple-touch.html (144571 => 144572)
--- trunk/LayoutTests/fast/dom/icon-url-list-apple-touch.html 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/LayoutTests/fast/dom/icon-url-list-apple-touch.html 2013-03-03 11:47:47 UTC (rev 144572)
@@ -1,28 +0,0 @@
-<html>
-<head>
-<title>Original Title</title>
-<link rel="shortcut icon" type="image/x-icon" href=""
-<link rel="apple-touch-icon" type="image/png" href=""
-<link rel="apple-touch-icon-precomposed" type="image/png" href=""
-<script src=""
-<script>
-function runTests() {
- if (window.testRunner)
- testRunner.dumpAsText();
-
- debug('Tests that all favicons and touch icons (if ENABLE(TOUCH_ICON_LOADING)) are in document.iconURLs()');
-
- // Fetch the actual list of icon URLs.
- var actualURLs = window.internals.allIconURLs(document);
-
- // Print out the URL list in the document to match it against the expected list.
- // Note that the expected order is reverse to ensure that icons seen later
- // take precedence as required by the spec.
- for (var i = 0; i < actualURLs.length; i++)
- debug(actualURLs[i]);
-}
-</script>
-</head>
-<body _onload_='runTests();'>
-</body>
-</html>
Modified: trunk/LayoutTests/fast/dom/icon-url-list.html (144571 => 144572)
--- trunk/LayoutTests/fast/dom/icon-url-list.html 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/LayoutTests/fast/dom/icon-url-list.html 2013-03-03 11:47:47 UTC (rev 144572)
@@ -48,7 +48,7 @@
var expectedURL0 = "http://test.com/barfavicon.ico";
var expectedURL1 = "http://test.com/foofavicon.ico";
var expectedURL2 = "http://test.com/newfavicon.ico";
- var iconURLs = window.internals.shortcutIconURLs(document);
+ var iconURLs = window.internals.iconURLs(document);
if (expectedURL0 == iconURLs[0] && expectedURL1 == iconURLs[1] && expectedURL2 == iconURLs[2])
testPassed('URL list matches expected');
else
Modified: trunk/LayoutTests/fast/dom/icon-url-property.html (144571 => 144572)
--- trunk/LayoutTests/fast/dom/icon-url-property.html 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/LayoutTests/fast/dom/icon-url-property.html 2013-03-03 11:47:47 UTC (rev 144572)
@@ -43,7 +43,7 @@
// check that the URL list in the document is as we expect
var expectedURLs = "http://test.com/newfavicon.ico";
- var iconURLs = window.internals.shortcutIconURLs(document);
+ var iconURLs = window.internals.iconURLs(document);
if (expectedURLs == iconURLs[0])
debugOutput('PASS - URL list matches expected');
else
Deleted: trunk/LayoutTests/platform/chromium-android/fast/dom/icon-url-list-apple-touch-expected.txt (144571 => 144572)
--- trunk/LayoutTests/platform/chromium-android/fast/dom/icon-url-list-apple-touch-expected.txt 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/LayoutTests/platform/chromium-android/fast/dom/icon-url-list-apple-touch-expected.txt 2013-03-03 11:47:47 UTC (rev 144572)
@@ -1,5 +0,0 @@
-Tests that all favicons and touch icons (if ENABLE(TOUCH_ICON_LOADING)) are in document.iconURLs()
-http://test.com/i/touch-precomposed.png
-http://test.com/i/touch.png
-http://test.com/oldfavicon.ico
-
Modified: trunk/Source/WebCore/ChangeLog (144571 => 144572)
--- trunk/Source/WebCore/ChangeLog 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/Source/WebCore/ChangeLog 2013-03-03 11:47:47 UTC (rev 144572)
@@ -1,3 +1,27 @@
+2013-03-03 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r144567.
+ http://trac.webkit.org/changeset/144567
+ https://bugs.webkit.org/show_bug.cgi?id=111266
+
+ Does not compile on apple-win (Requested by abarth on
+ #webkit).
+
+ * WebCore.exp.in:
+ * dom/Document.cpp:
+ (WebCore::Document::iconURLs):
+ * dom/Document.h:
+ (Document):
+ * loader/icon/IconController.cpp:
+ (WebCore::IconController::iconURL):
+ (WebCore::IconController::urlsForTypes):
+ * loader/icon/IconController.h:
+ (IconController):
+ * testing/Internals.cpp:
+ (WebCore::Internals::iconURLs):
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
2013-03-03 Mike West <[email protected]>
CSP 1.1: Support CSP 1.1 directives on the unprefixed header.
Modified: trunk/Source/WebCore/WebCore.exp.in (144571 => 144572)
--- trunk/Source/WebCore/WebCore.exp.in 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/Source/WebCore/WebCore.exp.in 2013-03-03 11:47:47 UTC (rev 144572)
@@ -982,8 +982,7 @@
__ZN7WebCore8Document4headEv
__ZN7WebCore8FormData28removeGeneratedFilesIfNeededEv
__ZN7WebCore8FormData6decodeERN3WTF7DecoderE
-__ZN7WebCore8Document8iconURLsEi
-__ZN7WebCore8Document16shortcutIconURLsEv
+__ZN7WebCore8Document8iconURLsEv
__ZN7WebCore8FormData6createEPKvm
__ZN7WebCore8FormDataD1Ev
__ZN7WebCore8Gradient12addColorStopEfRKNS_5ColorE
Modified: trunk/Source/WebCore/dom/Document.cpp (144571 => 144572)
--- trunk/Source/WebCore/dom/Document.cpp 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/Source/WebCore/dom/Document.cpp 2013-03-03 11:47:47 UTC (rev 144572)
@@ -4499,19 +4499,14 @@
return m_xpathEvaluator->evaluate(_expression_, contextNode, resolver, type, result, ec);
}
-const Vector<IconURL>& Document::shortcutIconURLs()
+const Vector<IconURL>& Document::iconURLs()
{
- // Include any icons where type = link, rel = "shortcut icon".
- return iconURLs(Favicon);
-}
-
-const Vector<IconURL>& Document::iconURLs(int iconTypesMask)
-{
m_iconURLs.clear();
if (!head() || !(head()->children()))
return m_iconURLs;
+ // Include any icons where type = link, rel = "shortcut icon".
RefPtr<HTMLCollection> children = head()->children();
unsigned int length = children->length();
for (unsigned int i = 0; i < length; ++i) {
@@ -4519,7 +4514,7 @@
if (!child->hasTagName(linkTag))
continue;
HTMLLinkElement* linkElement = static_cast<HTMLLinkElement*>(child);
- if (!(linkElement->iconType() & iconTypesMask))
+ if (linkElement->iconType() != Favicon)
continue;
if (linkElement->href().isEmpty())
continue;
Modified: trunk/Source/WebCore/dom/Document.h (144571 => 144572)
--- trunk/Source/WebCore/dom/Document.h 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/Source/WebCore/dom/Document.h 2013-03-03 11:47:47 UTC (rev 144572)
@@ -943,8 +943,7 @@
bool hasNodesWithPlaceholderStyle() const { return m_hasNodesWithPlaceholderStyle; }
void setHasNodesWithPlaceholderStyle() { m_hasNodesWithPlaceholderStyle = true; }
- const Vector<IconURL>& shortcutIconURLs();
- const Vector<IconURL>& iconURLs(int iconTypesMask);
+ const Vector<IconURL>& iconURLs();
void addIconURL(const String& url, const String& mimeType, const String& size, IconType);
void setUseSecureKeyboardEntryWhenActive(bool);
Modified: trunk/Source/WebCore/loader/icon/IconController.cpp (144571 => 144572)
--- trunk/Source/WebCore/loader/icon/IconController.cpp 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/Source/WebCore/loader/icon/IconController.cpp 2013-03-03 11:47:47 UTC (rev 144572)
@@ -69,31 +69,33 @@
IconURL IconController::iconURL(IconType iconType) const
{
IconURL result;
- const Vector<IconURL>& iconURLs = m_frame->document()->iconURLs(iconType);
+ const Vector<IconURL>& iconURLs = m_frame->document()->iconURLs();
Vector<IconURL>::const_iterator iter(iconURLs.begin());
for (; iter != iconURLs.end(); ++iter) {
- if (result.m_iconURL.isEmpty() || !iter->m_mimeType.isEmpty())
- result = *iter;
+ if (iter->m_iconType == iconType) {
+ if (result.m_iconURL.isEmpty() || !iter->m_mimeType.isEmpty())
+ result = *iter;
+ }
}
return result;
}
-IconURLs IconController::urlsForTypes(int iconTypesMask)
+IconURLs IconController::urlsForTypes(int iconTypes)
{
IconURLs iconURLs;
if (m_frame->tree() && m_frame->tree()->parent())
return iconURLs;
- if (iconTypesMask & Favicon && !appendToIconURLs(Favicon, &iconURLs))
+ if (iconTypes & Favicon && !appendToIconURLs(Favicon, &iconURLs))
iconURLs.append(defaultURL(Favicon));
#if ENABLE(TOUCH_ICON_LOADING)
int missedIcons = 0;
- if (iconTypesMask & TouchPrecomposedIcon)
+ if (iconTypes & TouchPrecomposedIcon)
missedIcons += appendToIconURLs(TouchPrecomposedIcon, &iconURLs) ? 0:1;
- if (iconTypesMask & TouchIcon)
+ if (iconTypes & TouchIcon)
missedIcons += appendToIconURLs(TouchIcon, &iconURLs) ? 0:1;
// Only return the default touch icons when the both were required and neither was gotten.
@@ -104,8 +106,11 @@
#endif
// Finally, append all remaining icons of this type.
- const Vector<IconURL>& allIconURLs = m_frame->document()->iconURLs(iconTypesMask);
+ const Vector<IconURL>& allIconURLs = m_frame->document()->iconURLs();
for (Vector<IconURL>::const_iterator iter = allIconURLs.begin(); iter != allIconURLs.end(); ++iter) {
+ if (!(iter->m_iconType & iconTypes))
+ continue;
+
int i;
int iconCount = iconURLs.size();
for (i = 0; i < iconCount; ++i) {
Modified: trunk/Source/WebCore/loader/icon/IconController.h (144571 => 144572)
--- trunk/Source/WebCore/loader/icon/IconController.h 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/Source/WebCore/loader/icon/IconController.h 2013-03-03 11:47:47 UTC (rev 144572)
@@ -48,7 +48,7 @@
~IconController();
KURL url();
- IconURLs urlsForTypes(int iconTypesMask);
+ IconURLs urlsForTypes(int iconTypes);
IconURL iconURL(IconType) const;
void startLoader();
Modified: trunk/Source/WebCore/testing/Internals.cpp (144571 => 144572)
--- trunk/Source/WebCore/testing/Internals.cpp 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/Source/WebCore/testing/Internals.cpp 2013-03-03 11:47:47 UTC (rev 144572)
@@ -1766,9 +1766,9 @@
return PrintContext::pageNumberForElement(element, FloatSize(pageWidth, pageHeight));
}
-Vector<String> Internals::iconURLs(Document* document, int iconTypesMask) const
+Vector<String> Internals::iconURLs(Document* document) const
{
- Vector<IconURL> iconURLs = document->iconURLs(iconTypesMask);
+ Vector<IconURL> iconURLs = document->iconURLs();
Vector<String> array;
Vector<IconURL>::const_iterator iter(iconURLs.begin());
@@ -1778,16 +1778,6 @@
return array;
}
-Vector<String> Internals::shortcutIconURLs(Document* document) const
-{
- return iconURLs(document, Favicon);
-}
-
-Vector<String> Internals::allIconURLs(Document* document) const
-{
- return iconURLs(document, Favicon | TouchIcon | TouchPrecomposedIcon);
-}
-
int Internals::numberOfPages(float pageWidth, float pageHeight)
{
if (!frame())
Modified: trunk/Source/WebCore/testing/Internals.h (144571 => 144572)
--- trunk/Source/WebCore/testing/Internals.h 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/Source/WebCore/testing/Internals.h 2013-03-03 11:47:47 UTC (rev 144572)
@@ -251,8 +251,7 @@
String counterValue(Element*);
int pageNumber(Element*, float pageWidth = 800, float pageHeight = 600);
- Vector<String> shortcutIconURLs(Document*) const;
- Vector<String> allIconURLs(Document*) const;
+ Vector<String> iconURLs(Document*) const;
int numberOfPages(float pageWidthInPixels = 800, float pageHeightInPixels = 600);
String pageProperty(String, int, ExceptionCode& = ASSERT_NO_EXCEPTION) const;
@@ -299,7 +298,6 @@
explicit Internals(Document*);
Document* contextDocument() const;
Frame* frame() const;
- Vector<String> iconURLs(Document*, int iconTypesMask) const;
DocumentMarker* markerAt(Node*, const String& markerType, unsigned index, ExceptionCode&);
#if ENABLE(INSPECTOR)
Modified: trunk/Source/WebCore/testing/Internals.idl (144571 => 144572)
--- trunk/Source/WebCore/testing/Internals.idl 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/Source/WebCore/testing/Internals.idl 2013-03-03 11:47:47 UTC (rev 144572)
@@ -217,8 +217,7 @@
DOMString counterValue(in Element element);
long pageNumber(in Element element, in [Optional] float pageWidth, in [Optional] float pageHeight);
- DOMString[] shortcutIconURLs(in Document document);
- DOMString[] allIconURLs(in Document document);
+ DOMString[] iconURLs(in Document document);
long numberOfPages(in [Optional] double pageWidthInPixels, in [Optional] double pageHeightInPixels);
DOMString pageProperty(in DOMString propertyName, in long pageNumber) raises (DOMException);
DOMString pageSizeAndMarginsInPixels(in long pageIndex, in long width, in long height, in long marginTop, in long marginRight, in long marginBottom, in long marginLeft) raises (DOMException);
Modified: trunk/Source/WebKit/ChangeLog (144571 => 144572)
--- trunk/Source/WebKit/ChangeLog 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/Source/WebKit/ChangeLog 2013-03-03 11:47:47 UTC (rev 144572)
@@ -1,3 +1,14 @@
+2013-03-03 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r144567.
+ http://trac.webkit.org/changeset/144567
+ https://bugs.webkit.org/show_bug.cgi?id=111266
+
+ Does not compile on apple-win (Requested by abarth on
+ #webkit).
+
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
+
2013-02-26 Roger Fong <[email protected]>
Unreviewed AppleWin build fix.
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (144571 => 144572)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2013-03-03 11:47:47 UTC (rev 144572)
@@ -325,8 +325,7 @@
?setAllowsRoundingHacks@TextRun@WebCore@@SAX_N@Z
?registerURLSchemeAsBypassingContentSecurityPolicy@SchemeRegistry@WebCore@@SAXABVString@WTF@@@Z
?removeURLSchemeRegisteredAsBypassingContentSecurityPolicy@SchemeRegistry@WebCore@@SAXABVString@WTF@@@Z
- ?shortcutIconURLs@Document@WebCore@@QAEABV?$Vector@UIconURL@WebCore@@$0A@@WTF@@XZ
- ?iconURLs@Document@WebCore@@QAEABV?$Vector@UIconURL@WebCore@@$0A@@WTF@@H@Z
+ ?iconURLs@Document@WebCore@@QAEABV?$Vector@UIconURL@WebCore@@$0A@@WTF@@XZ
?numberOfPages@PrintContext@WebCore@@SAHPAVFrame@2@ABVFloatSize@2@@Z
?pageProperty@PrintContext@WebCore@@SA?AVString@WTF@@PAVFrame@2@PBDH@Z
?pageSizeAndMarginsInPixels@PrintContext@WebCore@@SA?AVString@WTF@@PAVFrame@2@HHHHHHH@Z
Modified: trunk/Source/WebKit/chromium/ChangeLog (144571 => 144572)
--- trunk/Source/WebKit/chromium/ChangeLog 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/Source/WebKit/chromium/ChangeLog 2013-03-03 11:47:47 UTC (rev 144572)
@@ -1,3 +1,18 @@
+2013-03-03 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r144567.
+ http://trac.webkit.org/changeset/144567
+ https://bugs.webkit.org/show_bug.cgi?id=111266
+
+ Does not compile on apple-win (Requested by abarth on
+ #webkit).
+
+ * public/WebFrame.h:
+ * src/WebFrameImpl.cpp:
+ (WebKit::WebFrameImpl::iconURLs):
+ * src/WebFrameImpl.h:
+ (WebFrameImpl):
+
2013-03-03 Mike West <[email protected]>
CSP 1.1: Support CSP 1.1 directives on the unprefixed header.
Modified: trunk/Source/WebKit/chromium/public/WebFrame.h (144571 => 144572)
--- trunk/Source/WebKit/chromium/public/WebFrame.h 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/Source/WebKit/chromium/public/WebFrame.h 2013-03-03 11:47:47 UTC (rev 144572)
@@ -130,10 +130,10 @@
virtual long long identifier() const = 0;
// The urls of the given combination types of favicon (if any) specified by
- // the document loaded in this frame. The iconTypesMask is a bit-mask of
+ // the document loaded in this frame. The iconTypes is a bit-mask of
// WebIconURL::Type values, used to select from the available set of icon
// URLs
- virtual WebVector<WebIconURL> iconURLs(int iconTypesMask) const = 0;
+ virtual WebVector<WebIconURL> iconURLs(int iconTypes) const = 0;
// Geometry -----------------------------------------------------------
Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp (144571 => 144572)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.cpp 2013-03-03 11:47:47 UTC (rev 144572)
@@ -574,12 +574,12 @@
return m_identifier;
}
-WebVector<WebIconURL> WebFrameImpl::iconURLs(int iconTypesMask) const
+WebVector<WebIconURL> WebFrameImpl::iconURLs(int iconTypes) const
{
// The URL to the icon may be in the header. As such, only
// ask the loader for the icon if it's finished loading.
if (frame()->loader()->state() == FrameStateComplete)
- return frame()->loader()->icon()->urlsForTypes(iconTypesMask);
+ return frame()->loader()->icon()->urlsForTypes(iconTypes);
return WebVector<WebIconURL>();
}
Modified: trunk/Source/WebKit/chromium/src/WebFrameImpl.h (144571 => 144572)
--- trunk/Source/WebKit/chromium/src/WebFrameImpl.h 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/Source/WebKit/chromium/src/WebFrameImpl.h 2013-03-03 11:47:47 UTC (rev 144572)
@@ -78,7 +78,7 @@
virtual WebString assignedName() const;
virtual void setName(const WebString&);
virtual long long identifier() const;
- virtual WebVector<WebIconURL> iconURLs(int iconTypesMask) const;
+ virtual WebVector<WebIconURL> iconURLs(int iconTypes) const;
virtual WebSize scrollOffset() const;
virtual void setScrollOffset(const WebSize&);
virtual WebSize minimumScrollOffset() const;
Modified: trunk/Source/WebKit/win/ChangeLog (144571 => 144572)
--- trunk/Source/WebKit/win/ChangeLog 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/Source/WebKit/win/ChangeLog 2013-03-03 11:47:47 UTC (rev 144572)
@@ -1,3 +1,14 @@
+2013-03-03 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r144567.
+ http://trac.webkit.org/changeset/144567
+ https://bugs.webkit.org/show_bug.cgi?id=111266
+
+ Does not compile on apple-win (Requested by abarth on
+ #webkit).
+
+ * WebKit.vcproj/WebKitExports.def.in:
+
2013-03-03 Ryosuke Niwa <[email protected]>
That was a wrong fix. Revert r144569.
Modified: trunk/Source/WebKit/win/WebKit.vcproj/WebKitExports.def.in (144571 => 144572)
--- trunk/Source/WebKit/win/WebKit.vcproj/WebKitExports.def.in 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/Source/WebKit/win/WebKit.vcproj/WebKitExports.def.in 2013-03-03 11:47:47 UTC (rev 144572)
@@ -327,8 +327,7 @@
?setAllowsRoundingHacks@TextRun@WebCore@@SAX_N@Z
?registerURLSchemeAsBypassingContentSecurityPolicy@SchemeRegistry@WebCore@@SAXABVString@WTF@@@Z
?removeURLSchemeRegisteredAsBypassingContentSecurityPolicy@SchemeRegistry@WebCore@@SAXABVString@WTF@@@Z
- ?shortcutIconURLs@Document@WebCore@@QAEABV?$Vector@UIconURL@WebCore@@$0A@@WTF@@XZ
- ?iconURLs@Document@WebCore@@QAEABV?$Vector@UIconURL@WebCore@@$0A@@WTF@@H@Z
+ ?iconURLs@Document@WebCore@@QAEABV?$Vector@UIconURL@WebCore@@$0A@@WTF@@XZ
?numberOfPages@PrintContext@WebCore@@SAHPAVFrame@2@ABVFloatSize@2@@Z
?pageProperty@PrintContext@WebCore@@SA?AVString@WTF@@PAVFrame@2@PBDH@Z
?pageSizeAndMarginsInPixels@PrintContext@WebCore@@SA?AVString@WTF@@PAVFrame@2@HHHHHHH@Z
Modified: trunk/Source/autotools/symbols.filter (144571 => 144572)
--- trunk/Source/autotools/symbols.filter 2013-03-03 11:06:19 UTC (rev 144571)
+++ trunk/Source/autotools/symbols.filter 2013-03-03 11:47:47 UTC (rev 144572)
@@ -42,8 +42,7 @@
_ZN7WebCore5Range6createEN3WTF10PassRefPtrINS_8DocumentEEENS2_INS_4NodeEEEiS6_i;
_ZN7WebCore5RangeD1Ev;
_ZN7WebCore8Document36updateLayoutIgnorePendingStylesheetsEv;
-_ZN7WebCore8Document8iconURLsEi;
-_ZN7WebCore8Document16shortcutIconURLsEv;
+_ZN7WebCore8Document8iconURLsEv;
_ZN7WebCore8Settings19minDOMTimerIntervalEv;
_ZN7WebCore8Settings22setMinDOMTimerIntervalEd;
_ZN7WebCore9HTMLNames8inputTagE;
