Issue 1557 - Update to the recent libadblockplus to reduce additional updates in the logic later.

src/shared/ContentType.cpp

Index: src/shared/ContentType.cpp
diff --git a/src/shared/ContentType.cpp b/src/shared/ContentType.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..d712206762f45cf4b218f43136091dc155a422f3
--- /dev/null
+++ b/src/shared/ContentType.cpp
@@ -0,0 +1,36 @@
+#include "ContentType.h"
+
+// Based on impl from libadblockplus

[Eric, 2015/01/13 17:29:36]

Again, why not just use the existing implementation?

You yourself just argued in this very review (regarding debug-only functions)
that there's no increase in DLL file size for functions that are present in a
library but never referenced. Why is that true for debug-only functions but not
true for all the stuff in libadblockplus that we don't need?

[sergei, 2015/01/28 13:44:45]

I've tried it and the size is indeed suspiciously the same (in Release). BTW, in
Debug with libadblockplus the size of the DLL is about 13MB and without is
2.5MB. However I'm not confident that the linker is enough smart to remove all
not used stuff from libadblockplus. Also pay attention that libadblockplus
references v8 projects, even if they don't hurt right now, nobody can guarantee
that it won't hurt in the future after updating of v8. So, I would like to avoid
any linking with v8 for the addon DLL.

[Oleksandr, 2015/01/29 15:36:30]

While I personally agree that it would be best to have all the ContentType stuff
in a separate file in libadblockplus - that is not the case now and who knows if
it ever will be. Including FilterEngine.h directly now doesn't introduce any
problems that we know of and it results in less code duplication and better
readability, IMO. So I think at this stage it is best to just use the existing
implementation as Eric suggests.

+
+using AdblockPlus::FilterEngine;
+
+namespace
+{
+  typedef std::map<FilterEngine::ContentType, std::string> ContentTypeMap;
+  ContentTypeMap CreateContentTypeMap()
+  {
+    ContentTypeMap contentTypes;
+    contentTypes[FilterEngine::CONTENT_TYPE_OTHER] = "OTHER";
+    contentTypes[FilterEngine::CONTENT_TYPE_SCRIPT] = "SCRIPT";
+    contentTypes[FilterEngine::CONTENT_TYPE_IMAGE] = "IMAGE";
+    contentTypes[FilterEngine::CONTENT_TYPE_STYLESHEET] = "STYLESHEET";
+    contentTypes[FilterEngine::CONTENT_TYPE_OBJECT] = "OBJECT";
+    contentTypes[FilterEngine::CONTENT_TYPE_SUBDOCUMENT] = "SUBDOCUMENT";
+    contentTypes[FilterEngine::CONTENT_TYPE_DOCUMENT] = "DOCUMENT";
+    contentTypes[FilterEngine::CONTENT_TYPE_XMLHTTPREQUEST] = "XMLHTTPREQUEST";
+    contentTypes[FilterEngine::CONTENT_TYPE_OBJECT_SUBREQUEST] = "OBJECT_SUBREQUEST";
+    contentTypes[FilterEngine::CONTENT_TYPE_FONT] = "FONT";
+    contentTypes[FilterEngine::CONTENT_TYPE_MEDIA] = "MEDIA";
+    contentTypes[FilterEngine::CONTENT_TYPE_ELEMHIDE] = "ELEMHIDE";
+    return contentTypes;
+  }
+  const ContentTypeMap g_contentTypes = CreateContentTypeMap();
+}
+
+std::string ContentTypeToString(AdblockPlus::FilterEngine::ContentType contentType)
+{
+  ContentTypeMap::const_iterator it = g_contentTypes.find(contentType);
+  if (it != g_contentTypes.end())
+    return it->second;
+  throw std::invalid_argument("Argument is not a valid ContentType");
+}