ewebkit-werror.patch

   1 --- efl-webkit/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp.orig        2014-02-14 12:38:19.000000000 +0100
   2 +++ efl-webkit/Source/JavaScriptCore/bytecode/UnlinkedCodeBlock.cpp     2014-03-19 20:23:11.401525259 +0100
   3 @@ -307,8 +307,8 @@
   4      dataLogF("UnlinkedCodeBlock %p expressionRangeInfo[%zu] {\n", this, size);
   5      for (size_t i = 0; i < size; i++) {
   6          ExpressionRangeInfo& info = expressionInfo[i];
   7 -        unsigned line;
   8 -        unsigned column;
   9 +        unsigned line = 0;
  10 +        unsigned column = 0;
  11          getLineAndColumn(info, line, column);
  12          dumpLineColumnEntry(i, instructions(), info.instructionOffset, line, column);
  13      }
  14 --- efl-webkit/Source/cmake/WebKitHelpers.cmake.orig    2013-12-27 11:25:36.000000000 +0100
  15 +++ efl-webkit/Source/cmake/WebKitHelpers.cmake 2015-10-09 21:45:01.022925646 +0200
  16 @@ -44,7 +44,7 @@
  17
  18          # Enable errors on warning
  19          if (OPTION_ENABLE_WERROR)
  20 -            set(OLD_COMPILE_FLAGS "-Werror -Wno-error=unused-parameter ${OLD_COMPILE_FLAGS}")
  21 +            set(OLD_COMPILE_FLAGS "-Werror -Wno-error=unused-parameter -Wno-error=uninitialized ${OLD_COMPILE_FLAGS}")
  22          endif ()
  23
  24          set_target_properties(${_target} PROPERTIES
  25 --- efl-webkit/Source/WTF/wtf/SaturatedArithmetic.h.orig        2015-10-11 21:58:21.340594067 +0200
  26 +++ efl-webkit/Source/WTF/wtf/SaturatedArithmetic.h     2015-10-11 21:59:56.195516793 +0200
  27 @@ -43,7 +43,7 @@
  28
  29      // Can only overflow if the signed bit of the two values match. If the signed
  30      // bit of the result and one of the values differ it did overflow.
  31 -    if (!((ua ^ ub) >> 31) & (result ^ ua) >> 31)
  32 +    if (!((ua ^ ub) >> 31) && (result ^ ua) >> 31)
  33          result = std::numeric_limits<int>::max() + (ua >> 31);
  34
  35      return result;
  36 @@ -57,7 +57,7 @@
  37
  38      // Can only overflow if the signed bit of the two values do not match. If the
  39      // signed bit of the result and the first value differ it did overflow.
  40 -    if ((ua ^ ub) >> 31 & (result ^ ua) >> 31)
  41 +    if ((ua ^ ub) >> 31 && (result ^ ua) >> 31)
  42          result = std::numeric_limits<int>::max() + (ua >> 31);
  43
  44      return result;
  45 --- efl-webkit/Source/WebCore/platform/audio/MediaSessionManager.cpp.orig       2014-02-08 13:36:06.000000000 +0100
  46 +++ efl-webkit/Source/WebCore/platform/audio/MediaSessionManager.cpp    2015-10-12 18:06:33.023265872 +0200
  47 @@ -136,7 +136,7 @@
  48  {
  49      MediaSession::MediaType sessionType = session.mediaType();
  50      SessionRestrictions restrictions = m_restrictions[sessionType];
  51 -    if (!restrictions & ConcurrentPlaybackNotPermitted)
  52 +    if (!(restrictions & ConcurrentPlaybackNotPermitted))
  53          return;
  54
  55      for (auto* oneSession : m_sessions) {
  56 --- efl-webkit/Source/JavaScriptCore/API/OpaqueJSString.h~      2014-01-18 01:08:00.000000000 +0100
  57 +++ efl-webkit/Source/JavaScriptCore/API/OpaqueJSString.h       2017-03-12 17:16:58.206037221 +0100
  58 @@ -55,10 +55,10 @@
  59
  60      JS_EXPORT_PRIVATE ~OpaqueJSString();
  61
  62 -    bool is8Bit() { return this ? m_string.is8Bit() : false; }
  63 -    const LChar* characters8() { return this ? m_string.characters8() : nullptr; }
  64 -    const UChar* characters16() { return this ? m_string.characters16() : nullptr; }
  65 -    unsigned length() { return this ? m_string.length() : 0; }
  66 +    bool is8Bit() { return m_string.is8Bit(); }
  67 +    const LChar* characters8() { return m_string.characters8(); }
  68 +    const UChar* characters16() { return m_string.characters16(); }
  69 +    unsigned length() { return m_string.length(); }
  70
  71      const UChar* characters();
  72
  73 --- efl-webkit/Source/JavaScriptCore/API/OpaqueJSString.cpp~    2014-01-29 00:06:49.000000000 +0100
  74 +++ efl-webkit/Source/JavaScriptCore/API/OpaqueJSString.cpp     2017-03-12 17:26:29.911307319 +0100
  75 @@ -55,16 +55,13 @@
  76
  77  String OpaqueJSString::string() const
  78  {
  79 -    if (!this)
  80 -        return String();
  81 -
  82      // Return a copy of the wrapped string, because the caller may make it an Identifier.
  83      return m_string.isolatedCopy();
  84  }
  85
  86  Identifier OpaqueJSString::identifier(VM* vm) const
  87  {
  88 -    if (!this || m_string.isNull())
  89 +    if (m_string.isNull())
  90          return Identifier();
  91
  92      if (m_string.isEmpty())
  93 @@ -78,9 +75,6 @@
  94
  95  const UChar* OpaqueJSString::characters()
  96  {
  97 -    if (!this)
  98 -        return nullptr;
  99 -
 100      // m_characters is put in a local here to avoid an extra atomic load.
 101      UChar* characters = m_characters;
 102      if (characters)
 103 --- efl-webkit/Source/JavaScriptCore/interpreter/CallFrame.h~   2014-02-02 05:21:06.000000000 +0100
 104 +++ efl-webkit/Source/JavaScriptCore/interpreter/CallFrame.h    2017-03-12 17:37:03.749066109 +0100
 105 @@ -273,7 +273,7 @@
 106
 107          bool isVMEntrySentinel() const
 108          {
 109 -            return !!this && codeBlock() == vmEntrySentinelCodeBlock();
 110 +            return codeBlock() == vmEntrySentinelCodeBlock();
 111          }
 112
 113          CallFrame* vmEntrySentinelCallerFrame() const
 114 diff -ur efl-webkit/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp efl-webkit-werror/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp
 115 --- efl-webkit/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp  2014-02-14 12:38:19.000000000 +0100
 116 +++ efl-webkit-werror/Source/JavaScriptCore/dfg/DFGSpeculativeJIT.cpp   2017-03-12 17:56:05.790064068 +0100
 117 @@ -373,6 +373,7 @@
 118          if (node->hasConstant()) {
 119              if (valueOfJSConstant(node).isCell())
 120                  fillAction = SetTrustedJSConstant;
 121 +            else
 122                  fillAction = SetJSConstant;
 123          } else if (info.spillFormat() == DataFormatInt32) {
 124              ASSERT(registerFormat == DataFormatJSInt32);
 125 diff -ur efl-webkit/Source/JavaScriptCore/parser/SourceProvider.h efl-webkit-werror/Source/JavaScriptCore/parser/SourceProvider.h
 126 --- efl-webkit/Source/JavaScriptCore/parser/SourceProvider.h    2014-01-18 01:08:00.000000000 +0100
 127 +++ efl-webkit-werror/Source/JavaScriptCore/parser/SourceProvider.h     2017-03-12 17:40:14.070962357 +0100
 128 @@ -54,9 +54,6 @@
 129          TextPosition startPosition() const { return m_startPosition; }
 130          intptr_t asID()
 131          {
 132 -            ASSERT(this);
 133 -            if (!this) // Be defensive in release mode.
 134 -                return nullID;
 135              if (!m_id)
 136                  getID();
 137              return m_id;
 138 diff -ur efl-webkit/Source/JavaScriptCore/runtime/Identifier.cpp efl-webkit-werror/Source/JavaScriptCore/runtime/Identifier.cpp
 139 --- efl-webkit/Source/JavaScriptCore/runtime/Identifier.cpp     2014-02-14 12:38:19.000000000 +0100
 140 +++ efl-webkit-werror/Source/JavaScriptCore/runtime/Identifier.cpp      2017-03-12 18:04:59.046962327 +0100
 141 @@ -143,8 +143,8 @@
 142          UChar c = (*r)[0];
 143          if (c <= maxSingleCharacterString)
 144              r = vm->smallStrings.singleCharacterStringRep(c);
 145 -            if (r->isIdentifier())
 146 -                return *r;
 147 +        if (r->isIdentifier())
 148 +            return *r;
 149      }
 150
 151      return **vm->identifierTable->add(r).iterator;
 152 diff -ur efl-webkit/Source/WebCore/dom/Node.h efl-webkit-werror/Source/WebCore/dom/Node.h
 153 --- efl-webkit/Source/WebCore/dom/Node.h        2014-02-14 12:38:20.000000000 +0100
 154 +++ efl-webkit-werror/Source/WebCore/dom/Node.h 2017-03-12 18:17:51.742599543 +0100
 155 @@ -381,7 +381,6 @@
 156      // A Document node returns itself.
 157      Document& document() const
 158      {
 159 -        ASSERT(this);
 160          ASSERT(documentInternal());
 161          return *documentInternal();
 162      }
 163 diff -ur efl-webkit/Source/WebCore/dom/TreeScope.cpp efl-webkit-werror/Source/WebCore/dom/TreeScope.cpp
 164 --- efl-webkit/Source/WebCore/dom/TreeScope.cpp 2014-02-15 13:21:43.000000000 +0100
 165 +++ efl-webkit-werror/Source/WebCore/dom/TreeScope.cpp  2017-03-12 18:29:11.456735808 +0100
 166 @@ -352,7 +352,6 @@
 167
 168  void TreeScope::adoptIfNeeded(Node* node)
 169  {
 170 -    ASSERT(this);
 171      ASSERT(node);
 172      ASSERT(!node->isDocumentNode());
 173      ASSERT(!node->m_deletionHasBegun);
 174 diff -ur efl-webkit/Source/WebCore/html/HTMLElement.cpp efl-webkit-werror/Source/WebCore/html/HTMLElement.cpp
 175 --- efl-webkit/Source/WebCore/html/HTMLElement.cpp      2014-02-09 02:25:01.000000000 +0100
 176 +++ efl-webkit-werror/Source/WebCore/html/HTMLElement.cpp       2017-03-12 18:40:22.864691363 +0100
 177 @@ -534,7 +534,7 @@
 178      else
 179          newChild = Text::create(document(), text);
 180
 181 -    if (!this || !parentNode())
 182 +    if (!parentNode())
 183          ec = HIERARCHY_REQUEST_ERR;
 184      if (ec)
 185          return;
 186 diff -ur efl-webkit/Source/WebCore/page/Frame.cpp efl-webkit-werror/Source/WebCore/page/Frame.cpp
 187 --- efl-webkit/Source/WebCore/page/Frame.cpp    2014-02-09 02:25:01.000000000 +0100
 188 +++ efl-webkit-werror/Source/WebCore/page/Frame.cpp     2017-03-12 19:01:07.994763664 +0100
 189 @@ -890,7 +890,6 @@
 190      bool useFixedLayout, ScrollbarMode horizontalScrollbarMode, bool horizontalLock,
 191      ScrollbarMode verticalScrollbarMode, bool verticalLock)
 192  {
 193 -    ASSERT(this);
 194      ASSERT(m_page);
 195
 196      bool isMainFrame = this->isMainFrame();
 197 diff -ur efl-webkit/Source/WebCore/page/FrameView.cpp efl-webkit-werror/Source/WebCore/page/FrameView.cpp
 198 --- efl-webkit/Source/WebCore/page/FrameView.cpp        2014-02-15 13:21:43.000000000 +0100
 199 +++ efl-webkit-werror/Source/WebCore/page/FrameView.cpp 2017-03-12 18:57:46.482762180 +0100
 200 @@ -1403,7 +1403,7 @@
 201      if (printing) {
 202          if (m_mediaTypeWhenNotPrinting.isNull())
 203              m_mediaTypeWhenNotPrinting = mediaType();
 204 -            setMediaType("print");
 205 +        setMediaType("print");
 206      } else {
 207          if (!m_mediaTypeWhenNotPrinting.isNull())
 208              setMediaType(m_mediaTypeWhenNotPrinting);
 209 diff -ur efl-webkit/Source/WebCore/rendering/RenderObject.cpp efl-webkit-werror/Source/WebCore/rendering/RenderObject.cpp
 210 --- efl-webkit/Source/WebCore/rendering/RenderObject.cpp        2014-02-14 12:38:20.000000000 +0100
 211 +++ efl-webkit-werror/Source/WebCore/rendering/RenderObject.cpp 2017-03-12 19:29:06.414875333 +0100
 212 @@ -1401,13 +1401,6 @@
 213
 214  void RenderObject::showRenderObject(int printedCharacters) const
 215  {
 216 -    // As this function is intended to be used when debugging, the
 217 -    // this pointer may be 0.
 218 -    if (!this) {
 219 -        fputs("(null)\n", stderr);
 220 -        return;
 221 -    }
 222 -
 223      printedCharacters += fprintf(stderr, "%s %p", renderName(), this);
 224
 225      if (node()) {
 226 @@ -1431,8 +1424,6 @@
 227          fputc(' ', stderr);
 228
 229      showRenderObject(printedCharacters);
 230 -    if (!this)
 231 -        return;
 232
 233      for (const RenderObject* child = firstChildSlow(); child; child = child->nextSibling())
 234          child->showRenderTreeAndMark(markedObject1, markedLabel1, markedObject2, markedLabel2, depth + 1);
 235 diff -ur efl-webkit/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp efl-webkit-werror/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp
 236 --- efl-webkit/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp        2014-02-08 13:36:07.000000000 +0100
 237 +++ efl-webkit-werror/Source/WebKit2/WebProcess/Plugins/Netscape/JSNPObject.cpp 2017-03-12 21:09:00.761725052 +0100
 238 @@ -89,7 +89,6 @@
 239  void JSNPObject::invalidate()
 240  {
 241      ASSERT(m_npObject);
 242 -    ASSERT_GC_OBJECT_INHERITS(this, info());
 243
 244      releaseNPObject(m_npObject);
 245      m_npObject = 0;
 246 @@ -106,7 +105,6 @@
 247
 248  JSValue JSNPObject::callMethod(ExecState* exec, NPIdentifier methodName)
 249  {
 250 -    ASSERT_GC_OBJECT_INHERITS(this, info());
 251      if (!m_npObject)
 252          return throwInvalidAccessError(exec);
 253
 254 @@ -146,7 +144,6 @@
 255
 256  JSC::JSValue JSNPObject::callObject(JSC::ExecState* exec)
 257  {
 258 -    ASSERT_GC_OBJECT_INHERITS(this, info());
 259      if (!m_npObject)
 260          return throwInvalidAccessError(exec);
 261
 262 @@ -186,7 +183,6 @@
 263
 264  JSValue JSNPObject::callConstructor(ExecState* exec)
 265  {
 266 -    ASSERT_GC_OBJECT_INHERITS(this, info());
 267      if (!m_npObject)
 268          return throwInvalidAccessError(exec);
 269
 270 @@ -340,7 +336,6 @@
 271
 272  bool JSNPObject::deleteProperty(ExecState* exec, NPIdentifier propertyName)
 273  {
 274 -    ASSERT_GC_OBJECT_INHERITS(this, info());
 275      if (!m_npObject) {
 276          throwInvalidAccessError(exec);
 277          return false;