Title: [131277] trunk/Source/WebKit/win
- Revision
- 131277
- Author
- [email protected]
- Date
- 2012-10-14 15:11:02 -0700 (Sun, 14 Oct 2012)
Log Message
Fix the windows build.
* WebView.cpp:
(toStringVector):
Modified Paths
Diff
Modified: trunk/Source/WebKit/win/ChangeLog (131276 => 131277)
--- trunk/Source/WebKit/win/ChangeLog 2012-10-14 22:05:16 UTC (rev 131276)
+++ trunk/Source/WebKit/win/ChangeLog 2012-10-14 22:11:02 UTC (rev 131277)
@@ -1,3 +1,10 @@
+2012-10-14 Sam Weinig <[email protected]>
+
+ Fix the windows build.
+
+ * WebView.cpp:
+ (toStringVector):
+
2012-10-10 Brady Eidson <[email protected]>
Switch ResourceLoader::resourceData() from SharedBuffer to ResourceBuffer
Modified: trunk/Source/WebKit/win/WebView.cpp (131276 => 131277)
--- trunk/Source/WebKit/win/WebView.cpp 2012-10-14 22:05:16 UTC (rev 131276)
+++ trunk/Source/WebKit/win/WebView.cpp 2012-10-14 22:11:02 UTC (rev 131277)
@@ -6227,15 +6227,14 @@
#endif
}
-static PassOwnPtr<Vector<String> > toStringVector(unsigned patternsCount, BSTR* patterns)
+static Vector<String> toStringVector(unsigned patternsCount, BSTR* patterns)
{
- // Convert the patterns into a Vector.
- if (patternsCount == 0)
- return nullptr;
- OwnPtr<Vector<String> > patternsVector = adoptPtr(new Vector<String>);
+ Vector<String> patternsVector;
+ if (!patternsCount)
+ return patternsVector;
for (unsigned i = 0; i < patternsCount; ++i)
- patternsVector->append(toString(patterns[i]));
- return patternsVector.release();
+ patternsVector.append(toString(patterns[i]));
+ return patternsVector;
}
HRESULT WebView::addUserScriptToGroup(BSTR groupName, IWebScriptWorld* iWorld, BSTR source, BSTR url,
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
