Title: [164553] trunk/Source
Revision
164553
Author
[email protected]
Date
2014-02-22 17:38:07 -0800 (Sat, 22 Feb 2014)

Log Message

Remove some unreachable code (-Wunreachable-code)
https://bugs.webkit.org/show_bug.cgi?id=129220

Patch by Joseph Pecoraro <[email protected]> on 2014-02-22
Reviewed by Eric Carlson.

Source/_javascript_Core:

* API/tests/testapi.c:
(EvilExceptionObject_convertToType):
* disassembler/udis86/udis86_decode.c:
(decode_operand):

Source/WebCore:

* html/parser/HTMLTreeBuilder.cpp:
(WebCore::HTMLTreeBuilder::processCharacterBuffer):
(WebCore::HTMLTreeBuilder::processEndTag):
The only tricky case. Here there was a break inside the
#if, but not the #else, and a break after the #endif.
Remove the break inside the #if, and always use the
break after the #endif.

* Modules/indexeddb/IDBTransaction.cpp:
(WebCore::IDBTransaction::modeToString):
* bindings/js/JSTrackCustom.cpp:
(WebCore::toJS):
* bindings/js/JSWebGLRenderingContextCustom.cpp:
(WebCore::functionForUniform):
* css/SelectorChecker.cpp:
(WebCore::SelectorChecker::checkOne):
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::parseAttribute):
* page/CaptionUserPreferencesMediaAF.cpp:
(WebCore::CaptionUserPreferencesMediaAF::captionDisplayMode):

Source/WebKit2:

* WebProcess/InjectedBundle/API/c/WKBundleAPICast.h:
(WebKit::toAPI):

Modified Paths

Diff

Modified: trunk/Source/_javascript_Core/API/tests/testapi.c (164552 => 164553)


--- trunk/Source/_javascript_Core/API/tests/testapi.c	2014-02-22 23:59:16 UTC (rev 164552)
+++ trunk/Source/_javascript_Core/API/tests/testapi.c	2014-02-23 01:38:07 UTC (rev 164553)
@@ -570,7 +570,6 @@
         break;
     default:
         return JSValueMakeNull(context);
-        break;
     }
     
     JSValueRef func = JSObjectGetProperty(context, object, funcName, exception);

Modified: trunk/Source/_javascript_Core/ChangeLog (164552 => 164553)


--- trunk/Source/_javascript_Core/ChangeLog	2014-02-22 23:59:16 UTC (rev 164552)
+++ trunk/Source/_javascript_Core/ChangeLog	2014-02-23 01:38:07 UTC (rev 164553)
@@ -1,3 +1,15 @@
+2014-02-22  Joseph Pecoraro  <[email protected]>
+
+        Remove some unreachable code (-Wunreachable-code)
+        https://bugs.webkit.org/show_bug.cgi?id=129220
+
+        Reviewed by Eric Carlson.
+
+        * API/tests/testapi.c:
+        (EvilExceptionObject_convertToType):
+        * disassembler/udis86/udis86_decode.c:
+        (decode_operand):
+
 2014-02-22  Filip Pizlo  <[email protected]>
 
         Unreviewed, ARMv7 build fix.

Modified: trunk/Source/_javascript_Core/disassembler/udis86/udis86_decode.c (164552 => 164553)


--- trunk/Source/_javascript_Core/disassembler/udis86/udis86_decode.c	2014-02-22 23:59:16 UTC (rev 164552)
+++ trunk/Source/_javascript_Core/disassembler/udis86/udis86_decode.c	2014-02-23 01:38:07 UTC (rev 164553)
@@ -652,7 +652,6 @@
     case OP_E:
       decode_modrm_rm(u, operand, T_GPR, size);
       break;
-      break;
     case OP_G:
       decode_modrm_reg(u, operand, T_GPR, size);
       break;

Modified: trunk/Source/WebCore/ChangeLog (164552 => 164553)


--- trunk/Source/WebCore/ChangeLog	2014-02-22 23:59:16 UTC (rev 164552)
+++ trunk/Source/WebCore/ChangeLog	2014-02-23 01:38:07 UTC (rev 164553)
@@ -1,3 +1,31 @@
+2014-02-22  Joseph Pecoraro  <[email protected]>
+
+        Remove some unreachable code (-Wunreachable-code)
+        https://bugs.webkit.org/show_bug.cgi?id=129220
+
+        Reviewed by Eric Carlson.
+
+        * html/parser/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::processCharacterBuffer):
+        (WebCore::HTMLTreeBuilder::processEndTag):
+        The only tricky case. Here there was a break inside the
+        #if, but not the #else, and a break after the #endif.
+        Remove the break inside the #if, and always use the
+        break after the #endif.
+
+        * Modules/indexeddb/IDBTransaction.cpp:
+        (WebCore::IDBTransaction::modeToString):
+        * bindings/js/JSTrackCustom.cpp:
+        (WebCore::toJS):
+        * bindings/js/JSWebGLRenderingContextCustom.cpp:
+        (WebCore::functionForUniform):
+        * css/SelectorChecker.cpp:
+        (WebCore::SelectorChecker::checkOne):
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::parseAttribute):
+        * page/CaptionUserPreferencesMediaAF.cpp:
+        (WebCore::CaptionUserPreferencesMediaAF::captionDisplayMode):
+
 2014-02-22  Dean Jackson  <[email protected]>
 
         Letterpress effect disabled for synthetic italic

Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (164552 => 164553)


--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp	2014-02-22 23:59:16 UTC (rev 164552)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp	2014-02-23 01:38:07 UTC (rev 164553)
@@ -348,15 +348,12 @@
     switch (mode) {
     case IndexedDB::TransactionMode::ReadOnly:
         return IDBTransaction::modeReadOnly();
-        break;
 
     case IndexedDB::TransactionMode::ReadWrite:
         return IDBTransaction::modeReadWrite();
-        break;
 
     case IndexedDB::TransactionMode::VersionChange:
         return IDBTransaction::modeVersionChange();
-        break;
     }
 
     ASSERT_NOT_REACHED();

Modified: trunk/Source/WebCore/bindings/js/JSTrackCustom.cpp (164552 => 164553)


--- trunk/Source/WebCore/bindings/js/JSTrackCustom.cpp	2014-02-22 23:59:16 UTC (rev 164552)
+++ trunk/Source/WebCore/bindings/js/JSTrackCustom.cpp	2014-02-23 01:38:07 UTC (rev 164553)
@@ -69,15 +69,12 @@
         
     case TrackBase::AudioTrack:
         return CREATE_DOM_WRAPPER(exec, globalObject, AudioTrack, track);
-        break;
 
     case TrackBase::VideoTrack:
         return CREATE_DOM_WRAPPER(exec, globalObject, VideoTrack, track);
-        break;
 
     case TrackBase::TextTrack:
         return CREATE_DOM_WRAPPER(exec, globalObject, TextTrack, track);
-        break;
     }
     
     return jsNull();

Modified: trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp (164552 => 164553)


--- trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp	2014-02-22 23:59:16 UTC (rev 164552)
+++ trunk/Source/WebCore/bindings/js/JSWebGLRenderingContextCustom.cpp	2014-02-23 01:38:07 UTC (rev 164553)
@@ -465,7 +465,6 @@
     case f_uniform3v:
     case f_uniform4v:
         return true;
-        break;
     default: break;
     }
     return false;

Modified: trunk/Source/WebCore/css/SelectorChecker.cpp (164552 => 164553)


--- trunk/Source/WebCore/css/SelectorChecker.cpp	2014-02-22 23:59:16 UTC (rev 164552)
+++ trunk/Source/WebCore/css/SelectorChecker.cpp	2014-02-23 01:38:07 UTC (rev 164553)
@@ -636,7 +636,6 @@
             return isEnabled(element);
         case CSSSelector::PseudoFullPageMedia:
             return element->document().isMediaDocument();
-            break;
         case CSSSelector::PseudoDefault:
             return isDefaultButtonForForm(element);
         case CSSSelector::PseudoDisabled:

Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (164552 => 164553)


--- trunk/Source/WebCore/html/HTMLMediaElement.cpp	2014-02-22 23:59:16 UTC (rev 164552)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp	2014-02-23 01:38:07 UTC (rev 164553)
@@ -2647,13 +2647,10 @@
     switch (m_preload) {
     case MediaPlayer::None:
         return ASCIILiteral("none");
-        break;
     case MediaPlayer::MetaData:
         return ASCIILiteral("metadata");
-        break;
     case MediaPlayer::Auto:
         return ASCIILiteral("auto");
-        break;
     }
 
     ASSERT_NOT_REACHED();

Modified: trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp (164552 => 164553)


--- trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp	2014-02-22 23:59:16 UTC (rev 164552)
+++ trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp	2014-02-23 01:38:07 UTC (rev 164553)
@@ -2297,8 +2297,6 @@
             processTemplateEndTag(token);
             return;
         }
-
-        break;
 #else
         ASSERT_NOT_REACHED();
 #endif
@@ -2552,7 +2550,6 @@
         // FIXME: parse error
         setInsertionMode(InsertionMode::InBody);
         goto ReprocessBuffer;
-        break;
     }
     case InsertionMode::Text: {
         ASSERT(insertionMode() == InsertionMode::Text);
@@ -2568,7 +2565,6 @@
             return;
         defaultForInHeadNoscript();
         goto ReprocessBuffer;
-        break;
     }
     case InsertionMode::InFrameset:
     case InsertionMode::AfterFrameset: {

Modified: trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp (164552 => 164553)


--- trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp	2014-02-22 23:59:16 UTC (rev 164552)
+++ trunk/Source/WebCore/page/CaptionUserPreferencesMediaAF.cpp	2014-02-23 01:38:07 UTC (rev 164553)
@@ -165,15 +165,12 @@
     switch (displayType) {
     case kMACaptionAppearanceDisplayTypeForcedOnly:
         return ForcedOnly;
-        break;
 
     case kMACaptionAppearanceDisplayTypeAutomatic:
         return Automatic;
-        break;
 
     case kMACaptionAppearanceDisplayTypeAlwaysOn:
         return AlwaysOn;
-        break;
     }
 
     ASSERT_NOT_REACHED();

Modified: trunk/Source/WebKit2/ChangeLog (164552 => 164553)


--- trunk/Source/WebKit2/ChangeLog	2014-02-22 23:59:16 UTC (rev 164552)
+++ trunk/Source/WebKit2/ChangeLog	2014-02-23 01:38:07 UTC (rev 164553)
@@ -1,3 +1,13 @@
+2014-02-22  Joseph Pecoraro  <[email protected]>
+
+        Remove some unreachable code (-Wunreachable-code)
+        https://bugs.webkit.org/show_bug.cgi?id=129220
+
+        Reviewed by Eric Carlson.
+
+        * WebProcess/InjectedBundle/API/c/WKBundleAPICast.h:
+        (WebKit::toAPI):
+
 2014-02-22  Dan Bernstein  <[email protected]>
 
         [Cocoa] WKUIDelegate.h is a project header

Modified: trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleAPICast.h (164552 => 164553)


--- trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleAPICast.h	2014-02-22 23:59:16 UTC (rev 164552)
+++ trunk/Source/WebKit2/WebProcess/InjectedBundle/API/c/WKBundleAPICast.h	2014-02-23 01:38:07 UTC (rev 164553)
@@ -77,13 +77,10 @@
     switch (action) {
     case WebCore::EditorInsertActionTyped:
         return kWKInsertActionTyped;
-        break;
     case WebCore::EditorInsertActionPasted:
         return kWKInsertActionPasted;
-        break;
     case WebCore::EditorInsertActionDropped:
         return kWKInsertActionDropped;
-        break;
     }
     ASSERT_NOT_REACHED();
     return kWKInsertActionTyped;
@@ -94,10 +91,8 @@
     switch (affinity) {
     case WebCore::UPSTREAM:
         return kWKAffinityUpstream;
-        break;
     case WebCore::DOWNSTREAM:
         return kWKAffinityDownstream;
-        break;
     }
     ASSERT_NOT_REACHED();
     return kWKAffinityUpstream;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to