src/WebPage.cpp in capybara-webkit-0.2.0 vs src/WebPage.cpp in capybara-webkit-0.3.0

@@ -3,14 +3,19 @@
 #include <QResource>
 #include <iostream>
 
 WebPage::WebPage(QObject *parent) : QWebPage(parent) {
   QResource javascript(":/capybara.js");
-  char * javascriptString =  new char[javascript.size() + 1];
-  strcpy(javascriptString, (const char *)javascript.data());
-  javascriptString[javascript.size()] = 0;
-  m_capybaraJavascript = javascriptString;
+  if (javascript.isCompressed()) {
+    QByteArray uncompressedBytes(qUncompress(javascript.data(), javascript.size()));
+    m_capybaraJavascript = QString(uncompressedBytes);
+  } else {
+    char * javascriptString =  new char[javascript.size() + 1];
+    strcpy(javascriptString, (const char *)javascript.data());
+    javascriptString[javascript.size()] = 0;
+    m_capybaraJavascript = javascriptString;
+  }
   m_loading = false;
   connect(this, SIGNAL(loadStarted()), this, SLOT(loadStarted()));
   connect(this, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool)));
   connect(this, SIGNAL(frameCreated(QWebFrame *)),
           this, SLOT(frameCreated(QWebFrame *)));
@@ -80,8 +85,8 @@
 bool WebPage::isLoading() const {
   return m_loading;
 }
 
 QString WebPage::failureString() {
-  return QString("Unable to load URL: ") + currentFrame()->url().toString();
+  return QString("Unable to load URL: ") + currentFrame()->requestedUrl().toString();
 }